From a3fb959d988710378a54cabda87ad4bf299683b8 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Tue, 20 Mar 2018 19:02:29 -0400 Subject: [PATCH] POLARIS: Fixes #2573 (VS) - Slap cigarettes off people's faces --- code/modules/mob/living/carbon/human/emote.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 0a85e9a155c..09b7aadc70d 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -644,6 +644,10 @@ if(M) message = "slaps [M] across the face. Ouch!" playsound(loc, 'sound/effects/snap.ogg', 50, 1) + if(ishuman(M)) //Snowflakey! + var/mob/living/carbon/human/H = M + if(istype(H.wear_mask,/obj/item/clothing/mask/smokable)) + H.drop_from_inventory(H.wear_mask) else message = "slaps [T.himself]!" playsound(loc, 'sound/effects/snap.ogg', 50, 1)