cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12688 from MrStonedOne/patch-52

Browse Source 
Golem runes no longer trigger on ghosts orbiting something
This commit is contained in:
Razharas
2015-10-28 22:24:14 +03:00
parent 09cc16db70 77db6d2dd4
commit 0efc44c12c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenobiology/xenobiology.dm
+12 -4
View File
@@ -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)