Commit Graph
65 Commits
Author SHA1 Message Date
Emmett GainesandCitadelStationBot f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
deathride58andGitHub 3f92e40503 Update sensory.dm 2017-12-06 13:18:45 -05:00
XDTMandCitadelStationBot 988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
deathride58andGitHub 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
deathride58andGitHub 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
LeoandCitadelStationBot 00f7be5c36 Merge pull request #33072 from AnturK/ibelievedinyoukornowlook
Fixes non-advanced diseases vaccines.
2017-11-27 08:25:55 -06:00
deathride58andGitHub 80d1d03b1d Update weight.dm 2017-11-26 21:32:24 -05:00
XDTMandCitadelStationBot 7a5af2f237 [Super-Ready for review]Reworks healing symptoms into conditional healing symptoms 2017-11-25 18:54:33 -06:00
XDTMandCitadelStationBot 783960a986 Divides species in subtypes, makes viruses able to infect certain subtypes 2017-11-22 15:36:43 -06:00
vuonojenmustaturskaandCitadelStationBot 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
Jordan BrownandCitadelStationBot f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
XDTMandCitadelStationBot 7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
LetterJayandGitHub 067b7fc6df Update genetics.dm 2017-10-08 22:39:42 -05:00
LetterJayandGitHub 271b332928 Update flesh_eating.dm 2017-10-08 22:39:19 -05:00
LetterJayandGitHub 3b00d7c3ea Update fever.dm 2017-10-08 22:39:02 -05:00
LetterJayandGitHub 3778b8bfc0 Update dizzy.dm 2017-10-08 22:38:53 -05:00
LetterJayandGitHub d1d671da47 Update choking.dm 2017-10-08 22:38:44 -05:00
LetterJayandGitHub e65943276d Update weight.dm 2017-10-08 22:38:28 -05:00
LetterJayandGitHub 0bf4fc091d Update voice_change.dm 2017-10-08 22:38:11 -05:00
LetterJayandGitHub 2333f5ee11 Update symptoms.dm 2017-10-08 22:38:01 -05:00
LetterJayandGitHub 73bbc4d4f9 Update shivering.dm 2017-10-08 22:37:45 -05:00
LetterJayandGitHub f239efcd45 Update oxygen.dm 2017-10-08 22:37:34 -05:00
LetterJayandGitHub 9ca3d0fd3d Update itching.dm 2017-10-08 22:37:23 -05:00
LetterJayandGitHub 53a3644f48 Update headache.dm 2017-10-08 22:37:14 -05:00
LetterJayandGitHub 631b98dad5 Update hallucigen.dm 2017-10-08 22:37:02 -05:00
XDTMandCitadelStationBot 6e24ca43be Fixes Start() of symptoms still working when neutered 2017-10-08 19:10:43 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBotandkevinz000 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
LetterJayandGitHub 12506ade24 Update cough.dm 2017-10-07 22:48:23 -05:00
RobustinandCitadelStationBot 98a34c2211 Virus Neuter Fix (#31392) 2017-10-07 18:01:57 -05:00
Jordan BrownandCitadelStationBot 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
kevinz000andCitadelStationBot d76eb00634 Update viral.dm 2017-10-01 13:11:05 -05:00
orangesandCitadelStationBot 41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
kevinz000 5f5065eb46 kek 2017-08-29 09:59:57 -07:00
CitadelStationBot 5eea016593 You can now click on symptoms in the Pandemic to see their description and stats 2017-08-19 18:52:55 -05:00
CitadelStationBot c17ca3001f Diseases will properly make new symptoms instead of sharing the same for everyone 2017-08-19 18:41:34 -05:00
LetterJayandGitHub 69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
CitadelStationBotandPoojawa 8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
kevinz000andGitHub bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
2017-07-31 23:41:22 -07:00
CitadelStationBot 79e6963aca Hallucinations 3.0 2017-07-30 19:58:28 -05:00
CitadelStationBot 5da5e58ee5 Fixes a lot of eye damage procs 2017-07-30 08:16:38 -05:00
CitadelStationBotandkevinz000 53dc265b94 Fixes virology timing in a better way (#2124) 2017-07-27 05:30:43 -07:00
CitadelStationBotandkevinz000 7ce6be92a0 Virology fixes (#2097) 2017-07-24 04:08:07 -07:00
LetterJayandGitHub 92e967d904 Update vomit.dm 2017-07-19 05:15:51 -05:00
LetterJayandGitHub a11a7f770d Update vision.dm 2017-07-19 05:15:34 -05:00
LetterJayandGitHub ad2efb18be Update sensory.dm 2017-07-19 05:14:41 -05:00