From ab1351f00dff678b11be51e666448e280b1d9ce4 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 25 Apr 2018 14:39:49 -0400 Subject: [PATCH] Ports the medical item sounds from Bay A port of https://github.com/Baystation12/Baystation12/pull/21268, which adds sounds to the healing item stacks, taperolls, and hyposprays --- code/game/objects/items/stacks/medical.dm | 10 +++++++++- code/game/objects/items/weapons/tape.dm | 5 +++++ code/modules/reagents/reagent_containers/hypospray.dm | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index b5ff773e8b..672a711a74 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -9,6 +9,7 @@ throw_range = 20 var/heal_brute = 0 var/heal_burn = 0 + var/apply_sounds /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) if (!istype(M)) @@ -65,6 +66,7 @@ icon_state = "brutepack" origin_tech = list(TECH_BIO = 1) no_variants = FALSE + apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg') /obj/item/stack/medical/bruise_pack/attack(mob/living/carbon/M as mob, mob/user as mob) if(..()) @@ -112,6 +114,7 @@ "You place a bandaid over \a [W.desc] on [M]'s [affecting.name]." ) W.bandage() W.disinfect() + playsound(src, pick(apply_sounds), 25) used++ affecting.update_damages() if(used == amount) @@ -130,6 +133,7 @@ heal_burn = 1 origin_tech = list(TECH_BIO = 1) no_variants = FALSE + apply_sounds = list('sound/effects/ointment.ogg') /obj/item/stack/medical/ointment/attack(mob/living/carbon/M as mob, mob/user as mob) if(..()) @@ -159,6 +163,7 @@ "You salved wounds on [M]'s [affecting.name]." ) use(1) affecting.salve() + playsound(src, pick(apply_sounds), 25) /obj/item/stack/medical/advanced/bruise_pack name = "advanced trauma kit" @@ -167,6 +172,7 @@ icon_state = "traumakit" heal_brute = 3 origin_tech = list(TECH_BIO = 1) + apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg','sound/effects/tape.ogg') /obj/item/stack/medical/advanced/bruise_pack/attack(mob/living/carbon/M as mob, mob/user as mob) if(..()) @@ -212,6 +218,7 @@ W.bandage() W.disinfect() W.heal_damage(heal_brute) + playsound(src, pick(apply_sounds), 25) used++ affecting.update_damages() if(used == amount) @@ -228,7 +235,7 @@ icon_state = "burnkit" heal_burn = 3 origin_tech = list(TECH_BIO = 1) - + apply_sounds = list('sound/effects/ointment.ogg') /obj/item/stack/medical/advanced/ointment/attack(mob/living/carbon/M as mob, mob/user as mob) if(..()) @@ -258,6 +265,7 @@ affecting.heal_damage(0,heal_burn) use(1) affecting.salve() + playsound(src, pick(apply_sounds), 25) /obj/item/stack/medical/splint name = "medical splints" diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 83e944f593..5a57515588 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -56,6 +56,7 @@ user.visible_message("\The [user] has taped up \the [H]'s eyes!") H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/blindfold/tape(H), slot_glasses) H.update_inv_glasses() + playsound(src, 'sound/effects/tape.ogg',25) else if(user.zone_sel.selecting == O_MOUTH || user.zone_sel.selecting == BP_HEAD) if(!H.organs_by_name[BP_HEAD]) @@ -94,6 +95,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/mask/muzzle/tape(H), slot_wear_mask) H.update_inv_wear_mask() + playsound(src, 'sound/effects/tape.ogg',25) else if(user.zone_sel.selecting == "r_hand" || user.zone_sel.selecting == "l_hand") can_place = 0 @@ -109,6 +111,7 @@ return var/obj/item/weapon/handcuffs/cable/tape/T = new(user) + playsound(src, 'sound/effects/tape.ogg',25) if(!T.place_handcuffs(H, user)) user.unEquip(T) @@ -124,6 +127,7 @@ var/obj/item/weapon/ducttape/tape = new(get_turf(src)) tape.attach(W) user.put_in_hands(tape) + playsound(src, 'sound/effects/tape.ogg',25) /obj/item/weapon/ducttape name = "tape" @@ -188,6 +192,7 @@ return // reduce papers around corners issue. user.drop_from_inventory(src) + playsound(src, 'sound/effects/tape.ogg',25) forceMove(source_turf) if(params) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index e38d07dcd2..ef0d4a2100 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -55,6 +55,8 @@ user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) to_chat(user, "You inject [M] with \the [src].") to_chat(M, "You feel a tiny prick!") + + playsound(src, 'sound/effects/hypospray.ogg',25) if(M.reagents) var/contained = reagentlist()