Commit Graph

81 Commits

Author SHA1 Message Date
CitadelStationBot 1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
Poojawa fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -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 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 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
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
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
vuonojenmustaturska 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
Jordan Brown f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -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