From 5363c10afab2c67d98cb33337892d876cd34af35 Mon Sep 17 00:00:00 2001 From: Charlie <69320440+hal9000PR@users.noreply.github.com> Date: Mon, 3 Jan 2022 19:00:50 +0000 Subject: [PATCH] fixes grav & vortex anomalies throwing their own core at people (#17292) --- code/game/objects/effects/anomalies.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index eccfd28717a..bb4b35389e7 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -112,7 +112,7 @@ if(!M.mob_negates_gravity()) step_towards(M,src) for(var/obj/O in range(0, src)) - if(!O.anchored) + if(!O.anchored && O.loc != src) // so it cannot throw the anomaly core var/mob/living/target = locate() in view(4, src) if(target && !target.stat) O.throw_at(target, 5, 10) @@ -311,8 +311,8 @@ //Throwing stuff around! for(var/obj/O in range(2, src)) - if(O == src) - return //DON'T DELETE YOURSELF GOD DAMN + if(O == src || O.loc == src) + return //DON'T DELETE YOURSELF OR YOUR CORE GOD DAMN if(!O.anchored) var/mob/living/target = locate() in view(4, src) if(target && !target.stat)