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
95e4cf1ffa
adds directional signs from bay
2015-02-01 06:13:21 -08:00
77dabb02fe
fixes janicart
2015-02-01 03:09:09 -08:00
d6dce069f4
finally actually fixes the blood decals
2015-02-01 00:29:37 -08:00
0b64a23310
fixes blood drips
2015-01-31 23:40:27 -08: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
b1ff5dd6de
Merge pull request #7418 from paprka/kekwalk
...
Some catwalk fixes
2015-02-01 03:32:43 +00:00
35eea8841c
adds baton charge loss
2015-01-31 18:18:24 -08:00
c09bd7707b
Merge pull request #7435 from dannno/dufflefix
...
fixes dufflebag max weight class
2015-01-31 19:49:37 +00:00
fd88ccc024
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
2015-01-31 18:03:38 +08:00
453a3db196
etc
2015-01-30 23:18:02 -08:00
c8e3b33687
(｡´>д<)っ彡☆
...
Y'all making me do actual refactoring in a silly pull
2015-01-29 18:59:25 -05:00
b5ec328983
New contraband supply item: 50 butterflies
...
(◕‿◕✿)
2015-01-29 18:07:34 -05: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
bb9be1ac98
HoSGun
2015-01-29 15:35:39 +08:00
9bece71e1d
adds a simple overlay system for belts
2015-01-28 20:27:44 -08:00
1e9d1cf278
Merge branch 'master' of https://github.com/tgstation/-tg-station into kekwalk
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-28 19:36:13 -08:00
ac85775b02
catwalk fixes
2015-01-28 19:30:21 -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
6b17d4e8f8
UpdatedCoolingModule
2015-01-27 23:45:49 +08: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
284223102e
Reagent foam works
...
TODO: Make metal foam work
2015-01-26 00:17:15 -06: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
aa3b7d9a75
Splits effect_system.dm into individual files.
2015-01-25 13:57:45 -06: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
d26e40a6ee
Merge pull request #7282 from Firecage/SkinningMonkeysXenos
...
Adds the ability to remove monkey/xeno skins and make costumes with them
2015-01-24 14:06:13 +01:00
be925ebd62
adds a check for the buffer upgrade
2015-01-24 01:49:07 -08:00
279c2709d4
Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-24 01:40:51 -08:00
Cheridan
dannno
xxalpha
paprka
Remie Richards
Steelpoint
Incoming
Swag McYolosteinen
Delimusca
Cheridan
Xhuis
Deantwo
Menshin