From d4fa76868ed7c8ad0693fd0ce6e756350538131c Mon Sep 17 00:00:00 2001 From: ATH1909 <42606352+ATH1909@users.noreply.github.com> Date: Tue, 20 Dec 2022 12:54:53 -0500 Subject: [PATCH] pillow smothering now checks to see if the SMOTHEREE has a head, not the SMOTHERER (#72086) ## About The Pull Request see title ## Why It's Good For The Game this truly is a copy+paste moment ## Changelog :cl: ATHATH fix: Pillow smothering now checks to see if the SMOTHEREE has a head, not the SMOTHERER. /:cl: --- code/game/objects/items/pillow.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/pillow.dm b/code/game/objects/items/pillow.dm index d3c09d4d200..d81c802863b 100644 --- a/code/game/objects/items/pillow.dm +++ b/code/game/objects/items/pillow.dm @@ -49,7 +49,7 @@ . = ..() if(!istype(victim)) return - if(victim.wear_mask || !user.get_bodypart(BODY_ZONE_HEAD)) + if(victim.wear_mask || !victim.get_bodypart(BODY_ZONE_HEAD)) return if(HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(user, span_notice("You can't bring yourself to harm [victim]"))