diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 276bec561a9..067bacaef4b 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -25,7 +25,7 @@ else to_chat(user, "You try to tape [M]'s mouth shut.") M.visible_message("[user] tries to tape [M]'s mouth closed!") - if(do_after(user, 30, target = M)) + if(do_after(user, 50, target = M)) if(M == user) to_chat(user, "You cover your own mouth with a piece of duct tape.") else diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 847c2b72aa4..831f785b917 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -31,7 +31,7 @@ icon_state = "tapegag" item_state = null w_class = 1 - resist_time = 200 + resist_time = 150 species_fit = list("Unathi", "Tajaran", "Vulpkanin") sprite_sheets = list( "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -39,16 +39,18 @@ "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) -/obj/item/clothing/mask/muzzle/tapegag/proc/tear_off(mob/living/carbon/human/user) //snowflaek, called in /mob/living/carbon/human/unEquip() in mob/living/carbon/human/inventory.dm +/obj/item/clothing/mask/muzzle/tapegag/dropped(mob/living/carbon/human/user) var/atom/movable/R = new /obj/item/trash/tapetrash if(user.species.bodyflags & HAS_FUR) R.desc += " Is that...fur?" var/turf/T = get_turf(src) R.loc = T transfer_fingerprints_to(R) - playsound(src,'sound/effects/papertear.ogg',40,1) - del(src) - + playsound(src,'sound/items/poster_ripped.ogg',40,1) + spawn(0) + qdel(src) + user.emote("scream") + user.update_inv_wear_mask() /obj/item/clothing/mask/surgical name = "sterile mask" diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index b366f74d306..f9d9ae27442 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -169,10 +169,6 @@ if(internals) internals.icon_state = "internal0" internal = null - if(istype(I, /obj/item/clothing/mask/muzzle/tapegag))//snowflakey tape gag. Literally no other place to put this. - var/obj/item/clothing/mask/muzzle/tapegag/H = I - H.tear_off(src) - emote("scream") sec_hud_set_ID() update_inv_wear_mask() else if(I == wear_id) diff --git a/sound/effects/papertear.ogg b/sound/effects/papertear.ogg deleted file mode 100644 index 8d0255f2f09..00000000000 Binary files a/sound/effects/papertear.ogg and /dev/null differ