Commit Graph

99 Commits

Author SHA1 Message Date
deathride58
3f92e40503 Update sensory.dm 2017-12-06 13:18:45 -05:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
deathride58
b9731895fd Merge pull request #4076 from Citadel-Station-13/upstream-merge-32858
[MIRROR] Divides species in subtypes, makes viruses able to infect certain subtypes
2017-12-04 21:57:29 +00:00
deathride58
6ac2a8c9a0 Merge pull request #4133 from Citadel-Station-13/upstream-merge-32432
[MIRROR] [Super-Ready for review]Reworks healing symptoms into conditional healing symptoms
2017-11-30 04:43:51 +00:00
Leo
00f7be5c36 Merge pull request #33072 from AnturK/ibelievedinyoukornowlook
Fixes non-advanced diseases vaccines.
2017-11-27 08:25:55 -06:00
deathride58
80d1d03b1d Update weight.dm 2017-11-26 21:32:24 -05:00
XDTM
7a5af2f237 [Super-Ready for review]Reworks healing symptoms into conditional healing symptoms 2017-11-25 18:54:33 -06:00
XDTM
783960a986 Divides species in subtypes, makes viruses able to infect certain subtypes 2017-11-22 15:36:43 -06:00
deathride58
1dddcb5d83 Update beesease.dm 2017-11-20 22:28:29 -05:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
Poojawa
62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -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
CitadelStationBot
b044758315 [MIRROR] Fixes a parrot posession runtime (#3516)
* Fixes a parrot posession runtime (#31879)

* Fixes a parrot posession runtime
2017-10-20 01:41:28 -05:00
Jordan Brown
f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
MoreRobustThanYou
bc318af840 Diseases will now cure if species is changed (#31495)
* Diseases will now cure if species is changed

* Update _disease.dm

* Update _disease.dm

* Update species.dm
2017-10-10 12:41:42 -05:00
LetterJay
8596fa93e4 Update transformation.dm 2017-10-09 21:27:12 -05:00
LetterJay
fc1b2c4e75 Update rhumba_beat.dm 2017-10-09 21:26:46 -05:00
LetterJay
2d3b4225d9 Update retrovirus.dm 2017-10-09 21:26:33 -05:00
LetterJay
9304ae1a38 Update pierrot_throat.dm 2017-10-09 21:26:20 -05:00
LetterJay
3a5ac95c4e Update magnitis.dm 2017-10-09 21:26:09 -05:00
LetterJay
e5c2284213 Update gbs.dm 2017-10-09 21:25:59 -05:00
LetterJay
a93240f6a1 Update fluspanish.dm 2017-10-09 21:25:47 -05:00
LetterJay
b1b3673fe9 Update flu.dm 2017-10-09 21:25:35 -05:00
LetterJay
93a0f5fe8c Update fake_gbs.dm 2017-10-09 21:24:54 -05:00
LetterJay
43ced58616 Update cold9.dm 2017-10-09 21:24:45 -05:00
LetterJay
8cc5186cf4 Update cold.dm 2017-10-09 21:24:35 -05:00
LetterJay
05250b3ce9 Update brainrot.dm 2017-10-09 21:24:23 -05:00
LetterJay
c3d6ce6bc6 Update beesease.dm 2017-10-09 21:24:14 -05:00
XDTM
7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
LetterJay
067b7fc6df Update genetics.dm 2017-10-08 22:39:42 -05:00
LetterJay
271b332928 Update flesh_eating.dm 2017-10-08 22:39:19 -05:00
LetterJay
3b00d7c3ea Update fever.dm 2017-10-08 22:39:02 -05:00
LetterJay
3778b8bfc0 Update dizzy.dm 2017-10-08 22:38:53 -05:00
LetterJay
d1d671da47 Update choking.dm 2017-10-08 22:38:44 -05:00
LetterJay
e65943276d Update weight.dm 2017-10-08 22:38:28 -05:00
LetterJay
0bf4fc091d Update voice_change.dm 2017-10-08 22:38:11 -05:00
LetterJay
2333f5ee11 Update symptoms.dm 2017-10-08 22:38:01 -05:00
LetterJay
73bbc4d4f9 Update shivering.dm 2017-10-08 22:37:45 -05:00
LetterJay
f239efcd45 Update oxygen.dm 2017-10-08 22:37:34 -05:00
LetterJay
9ca3d0fd3d Update itching.dm 2017-10-08 22:37:23 -05:00
LetterJay
53a3644f48 Update headache.dm 2017-10-08 22:37:14 -05:00
LetterJay
631b98dad5 Update hallucigen.dm 2017-10-08 22:37:02 -05:00
XDTM
6e24ca43be Fixes Start() of symptoms still working when neutered 2017-10-08 19:10:43 -05:00
LetterJay
e9f481e4e4 Merge pull request #3215 from Citadel-Station-13/upstream-merge-31392
[MIRROR] Fix: Prevents PANDEMIC Neutering Lockout
2017-10-08 16:19:33 -04:00
LetterJay
a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-08 16:18:18 -04:00
CitadelStationBot
d1dcfb63f8 [MIRROR] Miscellaneous virus fixes (#3216)
* Miscellaneous virus fixes (#31391)

* Probably fixes neutering bugs

* Proper targeting for healing

* Fixes itching affecting roboparts

* Miscellaneous virus fixes
2017-10-07 23:04:26 -07:00
LetterJay
12506ade24 Update cough.dm 2017-10-07 22:48:23 -05:00
Robustin
98a34c2211 Virus Neuter Fix (#31392) 2017-10-07 18:01:57 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00