e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
9506a78429
whoops replaced this var with a simpler check
2019-11-01 18:46:31 -07:00
bb197c2251
allows heal viruses not to hurt slimes
2019-10-30 01:34:03 -07:00
735755019e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-10-09 01:18:30 +02:00
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
3d22f4ec60
Porting a load of disease/symptoms code updates.
2019-10-05 07:14:25 +02:00
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
5d1cac62da
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-08-24 13:50:22 +02:00
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
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
382487fdc2
viruseseses-cures
2019-08-13 05:32:37 -04:00
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
94f5573e3a
Update nanites.dm
2019-07-19 17:45:44 -07:00
77360259ae
Merge pull request #8855 from Citadel-Station-13/kevinz000-patch-15
...
Fixes and buffs nano-boost symptom
2019-07-17 17:53:02 -04:00
4df4cbd721
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-07-15 17:23:01 +02:00
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
7bca0c6d88
Update nanites.dm
2019-07-08 23:48:22 -07:00
490ae9daf2
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-09 07:58:22 +02:00
a3ab5f6d23
Moving the snowflake mob var to the component and finalizing.
2019-07-04 02:03:51 +02:00
c58efa64c1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-07-03 02:36:23 +02:00
6b9becce71
Merge branch 'pr/14'
2019-06-14 21:29:04 +01:00
bed431defc
wrong indention.
2019-06-11 00:00:18 +02:00
3cbe9cf6b0
componentization part 1: "The flawed theorical code"
2019-06-10 22:37:38 +02:00
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
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
91f10442cf
Merge branch 'pr/12'
2019-05-26 02:05:48 +01:00
4fc31f6322
Merge branch 'master' into fuckatmos
2019-05-25 15:34:06 -04:00
f932fadfc6
Blood commit.
2019-05-22 18:46:46 +01:00
f95da1aae5
Heart Attacks will murder you now
...
Also sanity check for cursed heart overlay
2019-05-17 05:59:28 -05:00
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
2078485594
minor code cleanup + fixes plasma fixation
2019-04-11 18:20:55 -04:00
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
b6430559e9
datums
2018-09-11 02:49:41 -05:00
b99556c70f
Nanites port from /tg/station, original coder XDTM
2018-08-23 01:16:32 -07:00
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
1a56d8243e
Potentially fixes monkey fever runtiming on infection ( #38776 )
2018-07-01 05:42:07 -05:00
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
896eb8cacb
Merge pull request #7004 from Citadel-Station-13/upstream-merge-38257
...
[MIRROR] Fixes some advanced disease thresholds
2018-06-03 16:23:58 -05:00
6791d13e81
Fix some advanced disease thresholds ( #38257 )
2018-06-03 15:47:20 -05:00
67841c3f19
Fixes pocket items being deleted when monkeyizing ( #38220 )
2018-06-03 09:04:08 -05:00
6489ef5511
Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476
...
[MIRROR] Uppercases slot defines.
2018-05-21 11:23:02 -05:00
177139a1d3
Replace nauseous with nauseated ( #37927 )
2018-05-21 03:06:39 -05:00
ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
0d7a0c0418
Merge pull request #37679 from DaxDupont/death
...
Fixes rhumba beat as requested by naksu
2018-05-06 16:38:16 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
e5f9765d2a
datums/controller stuff
2018-04-23 00:02:42 -05:00
042fa8c5ff
Update choking.dm ( #37040 )
2018-04-10 16:03:22 -05:00
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
Ghommie