From cf9e01964c19d13c14e89f90b9f077c02fedd17b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 26 Feb 2021 15:06:29 +0100 Subject: [PATCH] [MIRROR] Supermatter Can Display EER to Ghosts. (#3667) * Supermatter Can Display EER to Ghosts. (#56991) I'm not sure that there's a way for ghosts to check out the EER of the spicy rock without someone logging in on the console. This lets ghosts know if an SM is going to spawn tesla/skeleton in advance. The part at the trait section (thanks to mothblocks) is changed to not cause runtimes when the supermatter is examined by ghosts. Co-authored-by: coiax * Supermatter Can Display EER to Ghosts. Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com> Co-authored-by: coiax --- code/modules/power/supermatter/supermatter.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 50d358c4b4c..859db607e2b 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -366,9 +366,14 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) /obj/machinery/power/supermatter_crystal/examine(mob/user) . = ..() - var/immune = HAS_TRAIT(user, TRAIT_SUPERMATTER_MADNESS_IMMUNE) || HAS_TRAIT(user.mind, TRAIT_SUPERMATTER_MADNESS_IMMUNE) + var/immune = HAS_TRAIT(user, TRAIT_SUPERMATTER_MADNESS_IMMUNE) || (user.mind && HAS_TRAIT(user.mind, TRAIT_SUPERMATTER_MADNESS_IMMUNE)) if(isliving(user) && !immune && (get_dist(user, src) < HALLUCINATION_RANGE(power))) . += "You get headaches just from looking at it." + if(isobserver(user)) + if(power > 5) + . += "The supermatter appears active at [power] MeV." + else + . += "The supermatter appears inactive or outputting minimal power." /obj/machinery/power/supermatter_crystal/proc/get_status() var/turf/T = get_turf(src)