 paprka
|
890b3800e6
|
some clothing changes
|
2015-02-03 09:00:51 -08:00 |
|
 TheVekter
|
de0175bfee
|
Blargh removed commented code I'm fuckin' tired
|
2015-02-03 08:37:48 -06:00 |
|
|
TheVekter
|
9bf58de009
|
Added red button
|
2015-02-03 08:25:50 -06:00 |
|
|
paprka
|
e0f492c104
|
un-hardcodes loss per tick
|
2015-02-02 21:20:00 -08:00 |
|
 hornygranny
|
bbfad5b137
|
Merge pull request #7488 from paprka/memetiersprioite
fixes janicart
|
2015-02-02 19:37:28 -08:00 |
|
|
paprka
|
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 |
|
 dannno
|
d8823a8038
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into killyoselfmyman
|
2015-02-02 19:30:24 -05:00 |
|
|
dannno
|
c18f485b17
|
fix shit, make bible suicide sacrifice you to your deity
|
2015-02-02 15:13:17 -05:00 |
|
 Swag McYolosteinen
|
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 |
|
|
paprka
|
f4cd2cd4af
|
fixes ert access
|
2015-02-02 06:22:07 -08:00 |
|
|
paprka
|
18a90495b2
|
updates to ERT stuff
|
2015-02-02 03:33:37 -08:00 |
|
|
paprka
|
50e152f402
|
rods
|
2015-02-02 00:20:22 -08:00 |
|
|
paprka
|
a5dcd1abd8
|
improves ert spawning and centcomm
|
2015-02-01 21:16:11 -08:00 |
|
|
paprka
|
55bdca20da
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
|
2015-02-01 18:22:02 -08:00 |
|
 Cheridan
|
f8bb02d54a
|
Merge pull request #7422 from Steelpoint/ERTBalance2
ERT Balance Pass 2 | ERT Access and Foam
|
2015-02-01 20:16:04 -06:00 |
|
|
dannno
|
c48bf44a47
|
framework for a future "suicide hotline" job
|
2015-02-01 19:44:54 -05:00 |
|
 xxalpha
|
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 |
|
|
paprka
|
95e4cf1ffa
|
adds directional signs from bay
|
2015-02-01 06:13:21 -08:00 |
|
|
paprka
|
77dabb02fe
|
fixes janicart
|
2015-02-01 03:09:09 -08:00 |
|
|
paprka
|
d6dce069f4
|
finally actually fixes the blood decals
|
2015-02-01 00:29:37 -08:00 |
|
|
paprka
|
0b64a23310
|
fixes blood drips
|
2015-01-31 23:40:27 -08:00 |
|
|
paprka
|
ce65ad8c62
|
fixes some gauze inconsistencies
|
2015-01-31 23:27:23 -08:00 |
|
|
paprka
|
1ce5722eac
|
map conflicts and other changes
|
2015-01-31 23:14:12 -08:00 |
|
|
paprka
|
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 |
|
 Remie Richards
|
b1ff5dd6de
|
Merge pull request #7418 from paprka/kekwalk
Some catwalk fixes
|
2015-02-01 03:32:43 +00:00 |
|
|
paprka
|
35eea8841c
|
adds baton charge loss
|
2015-01-31 18:18:24 -08:00 |
|
|
Remie Richards
|
c09bd7707b
|
Merge pull request #7435 from dannno/dufflefix
fixes dufflebag max weight class
|
2015-01-31 19:49:37 +00:00 |
|
 Steelpoint
|
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 |
|
|
paprka
|
453a3db196
|
etc
|
2015-01-30 23:18:02 -08:00 |
|
 Incoming
|
c8e3b33687
|
(｡´>д<)っ彡☆
Y'all making me do actual refactoring in a silly pull
|
2015-01-29 18:59:25 -05:00 |
|
|
Incoming
|
b5ec328983
|
New contraband supply item: 50 butterflies
(◕‿◕✿)
|
2015-01-29 18:07:34 -05:00 |
|
|
dannno
|
d47f6334c3
|
fixes dufflebag max weight class
|
2015-01-29 16:05:33 -05:00 |
|
|
Swag McYolosteinen
|
3bb7213d14
|
Merge pull request #7346 from paprka/hoodshit
New hood/hardsuit helmet system
|
2015-01-29 18:57:25 +01:00 |
|
|
Swag McYolosteinen
|
697c79e99c
|
Merge pull request #7387 from Delimusca/foamfun
foam armblade toy
|
2015-01-29 18:28:58 +01:00 |
|
|
Steelpoint
|
18fe642fcc
|
ERTBalanceV2
|
2015-01-29 19:03:07 +08:00 |
|
|
Steelpoint
|
bb9be1ac98
|
HoSGun
|
2015-01-29 15:35:39 +08:00 |
|
|
paprka
|
9bece71e1d
|
adds a simple overlay system for belts
|
2015-01-28 20:27:44 -08:00 |
|
|
paprka
|
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 |
|
|
paprka
|
ac85775b02
|
catwalk fixes
|
2015-01-28 19:30:21 -08:00 |
|
 Delimusca
|
3e796d843b
|
fixed foam armblade name
|
2015-01-28 18:22:13 -07:00 |
|
|
Cheridan
|
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 |
|
|
Cheridan
|
1c81aa37a9
|
Merge pull request #7330 from Menshin/variables_clusterbangs
Ported the variable payload clusterbangs from sayustation
|
2015-01-28 09:25:50 -06:00 |
|
|
Steelpoint
|
6b17d4e8f8
|
UpdatedCoolingModule
|
2015-01-27 23:45:49 +08:00 |
|
|
Delimusca
|
a00714f140
|
added foam armblade
|
2015-01-26 18:06:42 -07:00 |
|
|
paprka
|
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 |
|
|
paprka
|
cc94e4eb9c
|
changelog and nerf
|
2015-01-26 03:58:23 -08:00 |
|
 Cheridan
|
284223102e
|
Reagent foam works
TODO: Make metal foam work
|
2015-01-26 00:17:15 -06:00 |
|
|
paprka
|
c43092efa9
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
|
2015-01-25 21:56:39 -08:00 |
|
|
paprka
|
d9f49a4eb5
|
colon and locate() for blood
|
2015-01-25 16:53:12 -08:00 |
|
|
Remie Richards
|
f7730eeaef
|
Merge pull request #7087 from paprka/readdjanikart
Improves janicart and adds secway
|
2015-01-26 00:31:30 +00:00 |
|