From 79de060cb0bb34f5ba34bd93b00cb21511d99a45 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Wed, 17 Apr 2019 11:22:15 +0200 Subject: [PATCH 1/2] Fixes the tape gag still being there. Invinsible --- code/modules/clothing/masks/miscellaneous.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 113720caff1..9619e8045a1 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -99,12 +99,14 @@ ) /obj/item/clothing/mask/muzzle/tapegag/dropped(mob/user) - var/obj/item/trash/tapetrash/TT = new(drop_location(src)) + var/obj/item/trash/tapetrash/TT = new transfer_fingerprints_to(TT) user.transfer_fingerprints_to(TT) + user.put_in_active_hand(TT) playsound(src, 'sound/items/poster_ripped.ogg', 40, 1) ..() user.emote("scream") + qdel(src) /obj/item/clothing/mask/muzzle/safety name = "safety muzzle" From 9b0c5847b55d698968070226df6de0c93c188ba5 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Wed, 17 Apr 2019 11:29:52 +0200 Subject: [PATCH 2/2] no qdel needed --- code/modules/clothing/masks/miscellaneous.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 9619e8045a1..231a353e153 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -104,9 +104,8 @@ user.transfer_fingerprints_to(TT) user.put_in_active_hand(TT) playsound(src, 'sound/items/poster_ripped.ogg', 40, 1) - ..() user.emote("scream") - qdel(src) + ..() /obj/item/clothing/mask/muzzle/safety name = "safety muzzle"