Commit Graph

121 Commits

Author SHA1 Message Date
Seris02 5499638c5e yes 2020-01-23 15:41:49 +08:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Putnam 9506a78429 whoops replaced this var with a simpler check 2019-11-01 18:46:31 -07:00
Putnam bb197c2251 allows heal viruses not to hurt slimes 2019-10-30 01:34:03 -07:00
kevinz000 dcb37bfd0e Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
Ghommie 3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Fermi dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. 2019-09-18 23:57:21 +01:00
Fermi c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
kevinz000 2cdfa9cf2f Merge pull request #9126 from Sishen1542/viro-cures
Adds more variety in virus cures, more consistent difficulty scaling.
2019-08-15 01:12:12 -07:00
deathride58 9010b9003a Merge pull request #8930 from Citadel-Station-13/kevinz000-patch-54
Fixes nanite viruses take two
2019-08-14 15:01:33 -04:00
Sishen 382487fdc2 viruseseses-cures 2019-08-13 05:32:37 -04:00
Thalpy 15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
kevinz000 94f5573e3a Update nanites.dm 2019-07-19 17:45:44 -07:00
kevinz000 7bca0c6d88 Update nanites.dm 2019-07-08 23:48:22 -07:00
Fermi 6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
kevinz000 ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Fermi f932fadfc6 Blood commit. 2019-05-22 18:46:46 +01:00
deathride58 905f32b193 further optimizes performance by making all of the meta gas properties use their own individual lists instead of being in a messy nested list 2019-04-14 16:40:37 -04:00
deathride58 2078485594 minor code cleanup + fixes plasma fixation 2019-04-11 18:20:55 -04:00
deathride58 8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
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 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
CitadelStationBot f9d5987993 [MIRROR] [s]Diseases lose scan invisibility if their stealth drops below the threshold (#7082)
* Merge pull request #38415 from XDTM/master_of_disguise

[s]Diseases lose scan invisibility if their stealth drops below the threshold

* [s]Diseases lose scan invisibility if their stealth drops below the threshold
2018-06-15 02:47:11 -07:00
Yenwodyah 6791d13e81 Fix some advanced disease thresholds (#38257) 2018-06-03 15:47:20 -05:00
Nich 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
Alomga 042fa8c5ff Update choking.dm (#37040) 2018-04-10 16:03:22 -05:00
deathride58 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 Brown 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
YPOQ 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
Alomga 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
CitadelStationBot 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
Poojawa 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
vuonojenmustaturska 5cfc5f3730 Merge pull request #36198 from Cruix/disease_fixes
Disease fixes
2018-03-07 16:04:14 -06:00
CitadelStationBot a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
CitadelStationBot 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
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