Commit Graph

15 Commits

Author SHA1 Message Date
Thalpy
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
deathride58
59577f8818 Merge pull request #8750 from Arturlang/Nanite_Brain_Damage_Fix
Fixes trauma healing nanites.
2019-07-08 18:07:04 -04:00
Arturlang
8160da6a6a Reviewer suggestions 2019-06-28 11:06:33 +03:00
Arturlang
c0c7597c76 Fixes trauma healing nanites. 2019-06-25 12:39:30 +03:00
Fermi
10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
Arturlang
8be06ddcd0 Fixes 2019-06-21 17:27:57 +03:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01: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
kevinz000
074a582fed Update utility.dm 2018-11-19 20:09:06 -08:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
4446251a6d nerfs nerve support because lets face it, it's just straight-up cancer 2018-08-28 08:11:09 -04:00
kevinz000
d5674d9692 Fix + Buff 2018-08-25 04:00:53 -07:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00