From e4d1788088906132b262160d7d7739778798b1e6 Mon Sep 17 00:00:00 2001 From: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Thu, 24 Jun 2021 20:02:32 +0100 Subject: [PATCH] Fixes singulo hammer sucking in ghosts (#16247) * fix * review --- code/game/objects/items/weapons/twohanded.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 8fbdaa0e702..d5c41c9772d 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -670,6 +670,8 @@ /obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder) for(var/atom/movable/X in orange(5, pull)) + if(X.move_resist == INFINITY) + continue if(X == wielder) continue if((X) && (!X.anchored) && (!ishuman(X)))