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
This commit is contained in:
Arokha Sieyes
2018-04-25 14:39:49 -04:00
parent 1b86e18cdc
commit ab1351f00d
3 changed files with 16 additions and 1 deletions

View File

@@ -9,6 +9,7 @@
throw_range = 20 throw_range = 20
var/heal_brute = 0 var/heal_brute = 0
var/heal_burn = 0 var/heal_burn = 0
var/apply_sounds
/obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
if (!istype(M)) if (!istype(M))
@@ -65,6 +66,7 @@
icon_state = "brutepack" icon_state = "brutepack"
origin_tech = list(TECH_BIO = 1) origin_tech = list(TECH_BIO = 1)
no_variants = FALSE 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) /obj/item/stack/medical/bruise_pack/attack(mob/living/carbon/M as mob, mob/user as mob)
if(..()) if(..())
@@ -112,6 +114,7 @@
"<span class='notice'>You place a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>" ) "<span class='notice'>You place a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>" )
W.bandage() W.bandage()
W.disinfect() W.disinfect()
playsound(src, pick(apply_sounds), 25)
used++ used++
affecting.update_damages() affecting.update_damages()
if(used == amount) if(used == amount)
@@ -130,6 +133,7 @@
heal_burn = 1 heal_burn = 1
origin_tech = list(TECH_BIO = 1) origin_tech = list(TECH_BIO = 1)
no_variants = FALSE 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) /obj/item/stack/medical/ointment/attack(mob/living/carbon/M as mob, mob/user as mob)
if(..()) if(..())
@@ -159,6 +163,7 @@
"<span class='notice'>You salved wounds on [M]'s [affecting.name].</span>" ) "<span class='notice'>You salved wounds on [M]'s [affecting.name].</span>" )
use(1) use(1)
affecting.salve() affecting.salve()
playsound(src, pick(apply_sounds), 25)
/obj/item/stack/medical/advanced/bruise_pack /obj/item/stack/medical/advanced/bruise_pack
name = "advanced trauma kit" name = "advanced trauma kit"
@@ -167,6 +172,7 @@
icon_state = "traumakit" icon_state = "traumakit"
heal_brute = 3 heal_brute = 3
origin_tech = list(TECH_BIO = 1) 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) /obj/item/stack/medical/advanced/bruise_pack/attack(mob/living/carbon/M as mob, mob/user as mob)
if(..()) if(..())
@@ -212,6 +218,7 @@
W.bandage() W.bandage()
W.disinfect() W.disinfect()
W.heal_damage(heal_brute) W.heal_damage(heal_brute)
playsound(src, pick(apply_sounds), 25)
used++ used++
affecting.update_damages() affecting.update_damages()
if(used == amount) if(used == amount)
@@ -228,7 +235,7 @@
icon_state = "burnkit" icon_state = "burnkit"
heal_burn = 3 heal_burn = 3
origin_tech = list(TECH_BIO = 1) 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) /obj/item/stack/medical/advanced/ointment/attack(mob/living/carbon/M as mob, mob/user as mob)
if(..()) if(..())
@@ -258,6 +265,7 @@
affecting.heal_damage(0,heal_burn) affecting.heal_damage(0,heal_burn)
use(1) use(1)
affecting.salve() affecting.salve()
playsound(src, pick(apply_sounds), 25)
/obj/item/stack/medical/splint /obj/item/stack/medical/splint
name = "medical splints" name = "medical splints"

View File

@@ -56,6 +56,7 @@
user.visible_message("<span class='danger'>\The [user] has taped up \the [H]'s eyes!</span>") user.visible_message("<span class='danger'>\The [user] has taped up \the [H]'s eyes!</span>")
H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/blindfold/tape(H), slot_glasses) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/blindfold/tape(H), slot_glasses)
H.update_inv_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) else if(user.zone_sel.selecting == O_MOUTH || user.zone_sel.selecting == BP_HEAD)
if(!H.organs_by_name[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.equip_to_slot_or_del(new /obj/item/clothing/mask/muzzle/tape(H), slot_wear_mask)
H.update_inv_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") else if(user.zone_sel.selecting == "r_hand" || user.zone_sel.selecting == "l_hand")
can_place = 0 can_place = 0
@@ -109,6 +111,7 @@
return return
var/obj/item/weapon/handcuffs/cable/tape/T = new(user) var/obj/item/weapon/handcuffs/cable/tape/T = new(user)
playsound(src, 'sound/effects/tape.ogg',25)
if(!T.place_handcuffs(H, user)) if(!T.place_handcuffs(H, user))
user.unEquip(T) user.unEquip(T)
@@ -124,6 +127,7 @@
var/obj/item/weapon/ducttape/tape = new(get_turf(src)) var/obj/item/weapon/ducttape/tape = new(get_turf(src))
tape.attach(W) tape.attach(W)
user.put_in_hands(tape) user.put_in_hands(tape)
playsound(src, 'sound/effects/tape.ogg',25)
/obj/item/weapon/ducttape /obj/item/weapon/ducttape
name = "tape" name = "tape"
@@ -188,6 +192,7 @@
return // reduce papers around corners issue. return // reduce papers around corners issue.
user.drop_from_inventory(src) user.drop_from_inventory(src)
playsound(src, 'sound/effects/tape.ogg',25)
forceMove(source_turf) forceMove(source_turf)
if(params) if(params)

View File

@@ -55,6 +55,8 @@
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
to_chat(user, "<span class='notice'>You inject [M] with \the [src].</span>") to_chat(user, "<span class='notice'>You inject [M] with \the [src].</span>")
to_chat(M, "<span class='notice'>You feel a tiny prick!</span>") to_chat(M, "<span class='notice'>You feel a tiny prick!</span>")
playsound(src, 'sound/effects/hypospray.ogg',25)
if(M.reagents) if(M.reagents)
var/contained = reagentlist() var/contained = reagentlist()