AnturK
|
3dc89ba058
|
Antag Panel / Check antagonists Refactor
|
2018-01-19 08:43:49 -06:00 |
|
deathride58
|
85aa297923
|
Merge branch 'master' into mapsyncs43293845982
|
2018-01-07 20:30:41 +00:00 |
|
ShizCalev
|
7956e3df27
|
Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp
|
2018-01-07 11:02:49 -06:00 |
|
deathride58
|
d26a9b23a4
|
datums folder
|
2018-01-03 23:29:47 -05:00 |
|
LetterJay
|
fc4e56201c
|
Merge pull request #4637 from Citadel-Station-13/upstream-merge-33986
[MIRROR] Makes some virology symptoms more worth using
|
2018-01-02 19:15:22 -06:00 |
|
LetterJay
|
36cbe323cd
|
Update vision.dm
|
2018-01-02 15:48:09 -06:00 |
|
LetterJay
|
2720b29908
|
Update sensory.dm
|
2018-01-02 15:47:56 -06:00 |
|
XDTM
|
84e0f7b7f3
|
Makes some virology symptoms more worth using
|
2018-01-02 15:15:17 -06:00 |
|
Tad Hardesty
|
0418ee4df6
|
Replace explicit z-level checks with defines
|
2017-12-29 13:41:10 -06:00 |
|
LetterJay
|
c7db4e8310
|
also syncs a bunch of shit
|
2017-12-29 04:12:43 -06:00 |
|
LetterJay
|
2e6b034493
|
save point - a lot of shit to fix
|
2017-12-27 07:03:40 -06:00 |
|
CitadelStationBot
|
9aa77b7df1
|
[MIRROR] Rebalances virus healing (#4543)
* Rebalances virus healing (#33815)
* Rebalances virus healing
* carbon
* Rebalances virus healing
|
2017-12-26 13:58:02 -08:00 |
|
LetterJay
|
290c1e0868
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916
|
2017-12-26 08:24:20 -06:00 |
|
LetterJay
|
ac5503d338
|
Merge branch 'master' into upstream-merge-33055
|
2017-12-25 04:10:34 -06:00 |
|
Jordan Brown
|
164db7ae9b
|
Prefixed all disability defines with DISABILITY_ to fix a name collision
|
2017-12-24 15:03:30 -06:00 |
|
Armhulen
|
d9f3c74607
|
pride and satisfaction
|
2017-12-24 15:03:07 -06:00 |
|
XDTM
|
3af0aa2489
|
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
|
2017-12-18 15:19:53 -06:00 |
|
Emmett Gaines
|
f875d4e176
|
Defines math, take 2
|
2017-12-17 10:02:43 -06:00 |
|
LetterJay
|
7af461539f
|
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
|
2017-12-16 13:08:50 -06:00 |
|
MoreRobustThanYou
|
2f8d49de91
|
[READY] Monkey mode overhaul
|
2017-12-15 18:35:52 -06:00 |
|
kevinz000
|
253c819bc1
|
TG Sync 12/15/17
s
s
|
2017-12-15 06:27:57 -08:00 |
|
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 |
|