From 91d3757944e5fc9d70bcc2ff74cbe2648e0ba51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Sat, 7 May 2016 17:02:03 +0200 Subject: [PATCH] Rebalanced, unsnowflaked --- code/game/objects/items/weapons/tape.dm | 2 +- code/modules/clothing/masks/miscellaneous.dm | 12 +++++++----- .../modules/mob/living/carbon/human/inventory.dm | 4 ---- sound/effects/papertear.ogg | Bin 9266 -> 0 bytes 4 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 sound/effects/papertear.ogg 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 8d0255f2f09a0521bd2808d6df30300697f38a42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9266 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 RwoAB>)B-)GugZJ`{Vy@$pHu(<