nicbn
8aef4f3b57
Rename brown gas to nitryl ( #32271 )
2017-11-01 21:37:20 -05:00
LetterJay
6e4e0e4f2d
Merge pull request #3709 from Citadel-Station-13/upstream-merge-32118
...
[MIRROR] actually fixes not being able to stop wagging your tail this time
2017-10-31 03:03:58 -04:00
LetterJay
6963ad2aac
Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041
...
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
2017-10-30 22:11:33 -04:00
LetterJay
49dce5c9ea
Update emote.dm
2017-10-30 21:09:00 -05:00
LetterJay
ca1581bd11
Update emote.dm
2017-10-30 20:35:24 -05:00
kevinz000
93f39805e9
actually fixes not being able to stop wagging your tail this time
2017-10-30 15:24:38 -05:00
LetterJay
48cc684de0
Update golems.dm
2017-10-29 22:41:23 -05:00
Ashe Higgs
284b265a65
Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
2017-10-29 13:57:10 -05:00
KorPhaeron
edfc86c895
Halloween race fixes
2017-10-29 12:31:38 -05:00
LetterJay
077e2a1598
Merge pull request #3655 from Citadel-Station-13/upstream-merge-32112
...
[MIRROR] "Mummies" (cloth golems) for Halloween
2017-10-29 04:20:28 -04:00
LetterJay
3b91f4efcc
Merge branch 'master' into upstream-merge-32096
2017-10-29 01:49:22 -04:00
LetterJay
debaad2948
Update podpeople.dm
2017-10-29 00:47:47 -05:00
LetterJay
d4e794eef7
Update furrypeople.dm
2017-10-29 00:47:25 -05:00
LetterJay
180e730be9
Update species.dm
2017-10-29 00:46:15 -05:00
LetterJay
78da30ec8d
Update species.dm
2017-10-29 00:25:17 -05:00
LetterJay
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
LetterJay
c64446962d
Merge branch 'master' into upstream-merge-32096
2017-10-28 03:47:08 -04:00
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
LetterJay
5dbcbf5689
Update podpeople.dm
2017-10-28 00:23:30 -05:00
Jordan Brown
fde6a94202
Merge pull request #32112 from KorPhaeron/mummies
...
"Mummies" (cloth golems) for Halloween
2017-10-27 17:33:52 -05:00
as334
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
KorPhaeron
9f7a7bcc22
Vampire species for halloween
2017-10-26 11:55:40 -05:00
CitadelStationBot
7ee7942aa4
[MIRROR] [s] Fixes changling golem exploit ( #3600 )
...
* Merge pull request #32061 from ShizCalev/ling-golem-exploit-fix
Fixes changling golem exploit
* [s] Fixes changling golem exploit
2017-10-25 20:01:52 -05:00
CitadelStationBot
7ad3afa3c0
[MIRROR] Footprints no longer contain stupid amounts of blood ( #3602 )
...
* Footprints no longer contain stupid amounts of blood (#32056 )
* Footprints no longer contain stupid amounts of blood
2017-10-25 20:01:31 -05:00
JJRcop
b237b8286a
heart of darkness revives non-shadow as shadowpeople
2017-10-25 00:13:05 -05:00
LetterJay
f0a32458bb
Update human_defines.dm
2017-10-23 14:15:30 -05:00
Jordan Brown
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -05:00
LetterJay
878a52ab3f
Update furrypeople.dm
2017-10-22 23:43:10 -05:00
LetterJay
1bcb5f2c86
Update skeletons.dm
2017-10-22 10:48:29 -05:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
Poojawa
7b8e88ec7e
Medihound Fixes ( #3462 )
...
* fix borgs, tries new things
* TGUI experiment, Expanded resist
also cleans up some bad code we don't want to keep
* kinda important to have the right one
* I actually managed to compile tgui
* tgui fuckery
I hate UI building
* more tgui tweaks
and it finally compiles, again.
* Have I mentioned UIs are not my strong point?
Because they're really not
* updates to this shit thing.
Tgui button chem selection -> chem to inject needs to be fixed
* No.
* FUCKING, FINALLY
2017-10-21 06:15:50 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
KorPhaeron
e4f76a79a5
Allows species to be blocked from ever being roundstart, can now choose your Halloween species
2017-10-20 10:11:35 -05:00
LetterJay
655478e014
Merge pull request #3485 from Citadel-Station-13/upstream-merge-31774
...
[MIRROR] reorder carbon destroy to fix ghosting
2017-10-20 10:32:29 -04:00
LetterJay
9d967c4b09
Merge pull request #3502 from Citadel-Station-13/upstream-merge-31813
...
[MIRROR] Cleans up set and adjust procs for disgust and drugginess a bit
2017-10-19 09:21:23 -04:00
LetterJay
d07b44268c
Merge pull request #3487 from Citadel-Station-13/upstream-merge-31820
...
[MIRROR] Humans now use the generic fire sprite if they have 3 or less firestacks
2017-10-19 08:57:29 -04:00
oranges
8c750341dc
Merge pull request #31813 from Qustinnus/IMGONNACLAMPEM
...
Cleans up set and adjust procs for disgust and drugginess a bit
2017-10-19 03:55:17 -05:00
MoreRobustThanYou
dc74b9d488
Humans now use the generic sprite if they have 3 or less firestacks ( #31820 )
...
To show that they're still on fire, but not AS on fire as you would be with 4+ firestacks
2017-10-18 10:18:14 -05:00
Emmett Gaines
04d26d561a
Radiation makes you vomit blood and more balance changes ( #31753 )
2017-10-18 09:25:11 -05:00
Poojawa
1966b9b052
Update carbon.dm
2017-10-18 08:53:55 -05:00
Leo
636f39ce97
reorder carbon destroy to fix ghosting
2017-10-18 07:35:15 -05:00
LetterJay
250f55e072
Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630
...
[MIRROR] Datum rev & related upgrades to base datum antag
2017-10-18 07:42:54 -04:00
LetterJay
9036bc1d5d
Merge pull request #3474 from yourdoom9898/master
...
Removed "You feel very bloated!" chat message
2017-10-18 07:39:05 -04:00
AnturK
2ecb4c216c
Datum rev & related upgrades to base datum antag
2017-10-18 02:26:11 -05:00
yourdoom9898
920a51694d
Add files via upload
2017-10-17 21:18:05 -05:00
Leo
88486f97ca
Merge pull request #31795 from AnturK/random-runtimes
...
Random runtime fixes.
2017-10-17 09:20:55 -05:00
LetterJay
7526b3cb94
Update human_defines.dm
2017-10-17 07:46:05 -05:00
Mercenaryblue
06ea404a28
Prevent creampie overlays from stacking.
2017-10-17 03:48:45 -05:00
LetterJay
568ed91f28
Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599
...
[MIRROR] Moves projectile processing to a subsystem
2017-10-16 10:39:41 -04:00
