From fa3693c00fdc8f8c4ca37eaa2a446abf1089fee8 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 24 Jan 2018 19:07:49 -0500 Subject: [PATCH] Merge pull request #34838 from ShizCalev/sm-godmode-fix Fixes poly's ghost SM spam --- code/modules/power/supermatter/supermatter.dm | 4 +++- code/modules/power/tesla/energy_ball.dm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index e4c4731340..485299a704 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -521,7 +521,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard) dust_mob(user, cause = "hand") /obj/machinery/power/supermatter_shard/proc/dust_mob(mob/living/nom, vis_msg, mob_msg, cause) - if(nom.incorporeal_move) + if(nom.incorporeal_move || nom.status_flags & GODMODE) return if(!vis_msg) vis_msg = "[nom] reaches out and touches [src], inducing a resonance... [nom.p_their()] body starts to glow and bursts into flames before flashing into ash" @@ -573,6 +573,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard) /obj/machinery/power/supermatter_shard/proc/Consume(atom/movable/AM) if(isliving(AM)) var/mob/living/user = AM + if(user.status_flags & GODMODE) + return message_admins("[src] has consumed [key_name_admin(user)] [ADMIN_JMP(src)].") investigate_log("has consumed [key_name(user)].", INVESTIGATE_SUPERMATTER) user.dust() diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index ae73afd25f..d8891e6cf6 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -146,7 +146,7 @@ /obj/singularity/energy_ball/proc/dust_mobs(atom/A) if(isliving(A)) var/mob/living/L = A - if(L.incorporeal_move) + if(L.incorporeal_move || L.status_flags & GODMODE) return if(!iscarbon(A)) return