From 77db6d2dd44c4446fb86070bc20c4f59096f8ba6 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Tue, 27 Oct 2015 07:45:03 -0700 Subject: [PATCH] Golem runes no longer trigger on ghosts orbiting something This can be annoying when you are orbiting someone and they walk over a golem rune. It also could be used to tell who ghosts are orbiting, also bad. --- code/modules/research/xenobiology/xenobiology.dm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 7c3efe3fc30..e83d9b84cc2 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -393,8 +393,12 @@ /obj/effect/golemrune/process() var/mob/dead/observer/ghost for(var/mob/dead/observer/O in src.loc) - if(!O.client) continue - if(O.mind && O.mind.current && O.mind.current.stat != DEAD) continue + if(!O.client) + continue + if(O.mind && O.mind.current && O.mind.current.stat != DEAD) + continue + if (O.orbiting) + continue ghost = O break if(ghost) @@ -405,8 +409,12 @@ /obj/effect/golemrune/attack_hand(mob/living/user) var/mob/dead/observer/ghost for(var/mob/dead/observer/O in src.loc) - if(!O.client) continue - if(O.mind && O.mind.current && O.mind.current.stat != DEAD) continue + if(!O.client) + continue + if(O.mind && O.mind.current && O.mind.current.stat != DEAD) + continue + if (O.orbiting) + continue ghost = O break if(!ghost)