shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,060 Commits 5 Branches 0 Tags
cae30f90ad8bbeaddcfe042f0f0d88bf6a28107d
Commit Graph
79 Commits
Author SHA1 Message Date
Poojawa b6430559e9 datums 2018-09-11 02:49:41 -05:00
kevinz000 b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Yenwodyahandletterjay 6791d13e81 Fix some advanced disease thresholds (#38257) 2018-06-03 15:47:20 -05:00
Nichandletterjay 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
Poojawa e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
AlomgaandCitadelStationBot 042fa8c5ff Update choking.dm (#37040) 2018-04-10 16:03:22 -05:00
deathride58andGitHub cd251d79b2 Merge pull request #6264 from Citadel-Station-13/upstream-merge-36645 
[MIRROR] Fixes mannitol not curing minor brain traumas
 2018-04-04 21:11:28 +00:00
Jordan BrownandCitadelStationBot 3c7d2c0ab9 Merge pull request #36932 from SailorDave/asphyxiation-fix 
Fixes asphyxiation disease activating early and ignoring transmission
 2018-04-03 23:46:28 -05:00
YPOQandCitadelStationBot 1ee5b349d7 Fixes mannitol not curing minor brain traumas (#36645) 
* Fixes mannitol not curing brain traumas

* Makes has_trauma_type random, adds type arg to cure_trauma_type

* Adds get_traumas_type proc

* Default to /datum/brain_trauma
 2018-04-03 22:03:20 -05:00
AlomgaandCitadelStationBot 6b48740f7e Tweaks stats of 4 virus symptoms (#36748) 
Makes Vitiligo, Revitiligo, Facial Hypertrichosis and Alopecia usefull instead of making your virus worse without contributing anything. Symptom that makes you pale shouldn't have worse stats that one that can kill.
 2018-03-28 19:21:05 -05:00
CitadelStationBotandPoojawa 3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004) 
* Replaced body zone magic strings with defines

* merge conflicts
 2018-03-19 21:18:57 -05:00
PoojawaandGitHub 6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
CitadelStationBotandPoojawa a2e6253f00 [MIRROR] Disease antagonist (#5815) 
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
 2018-03-05 15:20:59 -06:00
CitadelStationBotandPoojawa 567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674) 
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
 2018-02-23 17:42:57 -06:00
CitadelStationBotandPoojawa 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
PoojawaandGitHub 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
deathride58andGitHub 85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
ShizCalevandCitadelStationBot 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
LetterJayandGitHub 36cbe323cd Update vision.dm 2018-01-02 15:48:09 -06:00
LetterJayandGitHub 2720b29908 Update sensory.dm 2018-01-02 15:47:56 -06:00
XDTMandCitadelStationBot 84e0f7b7f3 Makes some virology symptoms more worth using 2018-01-02 15:15:17 -06:00
LetterJay 2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
CitadelStationBotandkevinz000 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
Jordan BrownandCitadelStationBot 164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
XDTMandCitadelStationBot 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -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 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
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