ac60a828f9
Merge pull request #7536 from Iamgoofball/chemblob
...
fixes my shit
2015-02-05 18:04:54 +01:00
2393380711
grenades now add up the temperature of contained beakers when mixing
2015-02-04 18:59:18 -08:00
6299c546ab
fixes a runtime related to stacks
2015-02-04 18:05:45 -08:00
2b195c1f2d
Merge pull request #7512 from paprka/rodslel
...
Rods now change sprite depending on how much in the stack
2015-02-04 13:03:16 +01:00
2edcbc5a08
Merge pull request #7526 from TheVekter/redbutton
...
Adds red button toy to arcade machines
2015-02-04 12:17:24 +03:00
6648390bf5
Merge branch 'master' of https://github.com/tgstation/-tg-station into rodslel
...
Conflicts:
icons/obj/items.dmi
2015-02-03 22:24:00 -08:00
0645d46168
iv drip hotfixes
2015-02-03 18:34:32 -08:00
a480ffbc98
whole lotta bugfixes
2015-02-03 17:57:57 -08:00
5f884b6017
Merge pull request #7496 from dannno/killyoselfmyman
...
Adds proper suicide messages to like a lot of stuff
2015-02-03 16:43:09 -06:00
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
de0175bfee
Blargh removed commented code I'm fuckin' tired
2015-02-03 08:37:48 -06:00
9bf58de009
Added red button
2015-02-03 08:25:50 -06:00
6de33d4063
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
...
Conflicts:
_maps/map_files/generic/z2.dmm
2015-02-02 19:13:49 -08:00
d8823a8038
Merge branch 'master' of https://github.com/tgstation/-tg-station into killyoselfmyman
2015-02-02 19:30:24 -05:00
c18f485b17
fix shit, make bible suicide sacrifice you to your deity
2015-02-02 15:13:17 -05:00
9bddcb3df4
Merge pull request #7492 from xxalpha/spacesuit_storage
...
Repath all non jetpack tank types to tank/internals
2015-02-02 18:52:51 +01:00
f4cd2cd4af
fixes ert access
2015-02-02 06:22:07 -08:00
18a90495b2
updates to ERT stuff
2015-02-02 03:33:37 -08:00
50e152f402
rods
2015-02-02 00:20:22 -08:00
55bdca20da
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
2015-02-01 18:22:02 -08:00
f8bb02d54a
Merge pull request #7422 from Steelpoint/ERTBalance2
...
ERT Balance Pass 2 | ERT Access and Foam
2015-02-01 20:16:04 -06:00
c48bf44a47
framework for a future "suicide hotline" job
2015-02-01 19:44:54 -05:00
a9c181bbcc
Repath all non jetpack tank types to tank/internals
...
Repath all portable tanks to tank/internals, except jetpacks
Update ministation
2015-02-01 18:25:39 +00:00
ce65ad8c62
fixes some gauze inconsistencies
2015-01-31 23:27:23 -08:00
1ce5722eac
map conflicts and other changes
2015-01-31 23:14:12 -08:00
a661e58281
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-31 22:03:00 -08:00
453a3db196
etc
2015-01-30 23:18:02 -08:00
d47f6334c3
fixes dufflebag max weight class
2015-01-29 16:05:33 -05:00
3bb7213d14
Merge pull request #7346 from paprka/hoodshit
...
New hood/hardsuit helmet system
2015-01-29 18:57:25 +01:00
697c79e99c
Merge pull request #7387 from Delimusca/foamfun
...
foam armblade toy
2015-01-29 18:28:58 +01:00
18fe642fcc
ERTBalanceV2
2015-01-29 19:03:07 +08:00
3e796d843b
fixed foam armblade name
2015-01-28 18:22:13 -07:00
46f588b424
Merge pull request #7334 from Xhuis/portable_console_in_belt
...
Lets you store handheld crew monitors in medical belts
2015-01-28 09:41:04 -06:00
1c81aa37a9
Merge pull request #7330 from Menshin/variables_clusterbangs
...
Ported the variable payload clusterbangs from sayustation
2015-01-28 09:25:50 -06:00
a00714f140
added foam armblade
2015-01-26 18:06:42 -07:00
b830f77ea2
Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-01-26 15:37:33 -08:00
cc94e4eb9c
changelog and nerf
2015-01-26 03:58:23 -08:00
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
d9f49a4eb5
colon and locate() for blood
2015-01-25 16:53:12 -08:00
f7730eeaef
Merge pull request #7087 from paprka/readdjanikart
...
Improves janicart and adds secway
2015-01-26 00:31:30 +00:00
39a9283592
Merge pull request #7329 from Deantwo/PencodeAftermath
...
Pencode aftermath changes
2015-01-25 18:40:35 +01:00
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
87dc5bafdd
Fixes error
2015-01-24 17:00:56 -05:00
266acdaac5
Lets you store handheld monitors on medbelts
2015-01-24 16:48:27 -05:00
0e8156814f
Font Define'ers Renamed
...
- Renamed font define'ers.
- Removed font duplicate define'ers.
2015-01-24 17:32:17 +01:00
882b05f287
0-day fixes
2015-01-24 16:52:01 +01:00
50e927ea33
Merge pull request #7314 from paprka/holster
...
fixes holster weight class
2015-01-24 16:48:05 +01:00
8f10dea61a
Ported the variable payload clusterbangs from sayustation.
2015-01-24 16:36:30 +01:00
bfea67611e
Pencode Changes Cleanup
...
- Moved the "parsepencode" proc from **newscaster.dm** and **PDA.dm** to
**text.dm** as a global proc.
- Made the "parsepencode" proc accept only a single agrument if desired.
- Removed the font constants from **newscaster.dm**, **PDA.dm**,
**paper.dm**, **paperbin.dm**, and **photocopier.dm**.
- Replaced aforementioned constants with define'ers in **misc.dm**.
2015-01-24 16:07:13 +01:00
af15be9bee
Merge pull request #7287 from Deantwo/PencodePdaNotekeeper
...
PDA Notekeeper 2.2
2015-01-24 14:15:27 +01:00
Swag McYolosteinen
Iamgoofball
paprka
Razharas
Cheridan
TheVekter
dannno
xxalpha
Steelpoint
Delimusca
Remie Richards
Xhuis
Deantwo
Menshin