shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR #47500, #47501, #47557, #47588.

Browse Source
This commit is contained in:
Ghommie
2019-11-12 19:00:45 +01:00
parent c5a7c28a1b
commit 4ef1d64356
8 changed files with 2873 additions and 2590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/power/supermatter/supermatter.dm
View File

@@ -651,7 +651,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
Consume(AM)
/obj/machinery/power/supermatter_crystal/intercept_zImpact(atom/movable/AM, levels)
. = ..()
Bumped(AM)
. |= FALL_STOP_INTERCEPTING | FALL_INTERCEPTED
/obj/machinery/power/supermatter_crystal/proc/Consume(atom/movable/AM)
if(isliving(AM))