From 6c2210a60d8f3c513e7d50e26b5fa8e8736cba46 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri, 20 Sep 2024 17:16:29 -0400 Subject: [PATCH] modsuit magboots save you from singulo hammer (#26858) --- code/game/objects/items/weapons/twohanded.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 49f787392552..23322162e6c0 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -621,10 +621,8 @@ step_towards(X, pull) else if(ishuman(X)) var/mob/living/carbon/human/H = X - if(istype(H.shoes, /obj/item/clothing/shoes/magboots)) - var/obj/item/clothing/shoes/magboots/M = H.shoes - if(M.magpulse) - continue + if(HAS_TRAIT(H, TRAIT_MAGPULSE)) + continue H.Weaken(4 SECONDS) step_towards(H, pull) step_towards(H, pull)