Commit Graph

36 Commits

Author SHA1 Message Date
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Arturlang
b7ae88b6e3 Made it sound a bit nicer 2019-08-16 19:40:22 +03:00
Arturlang
2ca6464242 Update healing.dm 2019-08-16 15:32:08 +03:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
deathride58
edbcabdce4 Merge pull request #8836 from Citadel-Station-13/kevinz000-patch-55
nanite metabolic synthesis now drains you until you're starving
2019-07-17 17:55:27 -04:00
deathride58
80b1383362 Merge pull request #8865 from Citadel-Station-13/kevinz000-patch-53
adds an adminspawned nanite hub that draws from admin techweb datum instead
2019-07-17 17:50:46 -04:00
deathride58
51665f0d5f Merge pull request #8863 from Citadel-Station-13/kevinz000-patch-51
Makes aggressive replication not useless
2019-07-17 17:49:08 -04:00
deathride58
8f41a29697 Merge pull request #8867 from Citadel-Station-13/kevinz000-patch-56
Nerfs chain detonation (removes dev radius)
2019-07-17 17:47:36 -04:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
kevinz000
33250dfcbe buffs it a bit 2019-07-14 14:16:44 -07:00
kevinz000
0adb33474d Update buffing.dm 2019-07-14 03:24:59 -07:00
kevinz000
239d688fe4 Update weapon.dm 2019-07-10 22:47:29 -07:00
kevinz000
05a01fe028 Update nanite_program_hub.dm 2019-07-10 22:11:16 -07:00
kevinz000
84d6fbe249 Update weapon.dm 2019-07-10 22:00:28 -07:00
kevinz000
a9c41c0fc7 hm 2019-07-10 10:00:45 -07:00
kevinz000
c14a052eeb Update weapon.dm 2019-07-10 03:06:32 -07:00
kevinz000
fafac3fba6 Update utility.dm 2019-07-08 23:45:21 -07:00
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
kevinz000
f541357a2c Update utility.dm 2019-07-07 00:30:33 -07:00
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02: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
Ghommie
d5279c8373 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-17 09:51:22 +02: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
Ghommie
0513f3464a one 2019-06-05 19:20:25 +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