Skip to content

Commit

Permalink
Adds handling sounds for the satchel charges and detonator, courtesy …
Browse files Browse the repository at this point in the history
…of Thwomper.
  • Loading branch information
LynxSolstice committed Oct 17, 2024
1 parent 9e8df9d commit 6fbe65a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions code/game/objects/items/explosives/explosive.dm
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@
return
pressed = TRUE
flick("detonator_active", src)
playsound(src.loc, 'sound/handling/charge-detonator.ogg', 25, 1)
sleep(40)
pressed = FALSE
var/detonation_count = 0
Expand Down Expand Up @@ -347,7 +348,7 @@
to_chat(user, SPAN_NOTICE("This Charge is not linked to any detonator"))
return
icon_state = "satchel_primed"
playsound(src.loc, 'sound/machines/click.ogg', 25, 1)
playsound(src.loc, 'sound/handling/charge-primed.ogg', 25, 1)
var/mob/living/carbon/living_carbon = user
if(istype(living_carbon) && !living_carbon.throw_mode)
living_carbon.toggle_throw_mode(THROW_MODE_NORMAL)
Expand All @@ -358,7 +359,6 @@

/obj/item/explosive/satchel_charge/attackby(obj/item/weapon_thing, mob/user)
. = ..()
beep(TRUE)
if(armed)
to_chat(user, SPAN_WARNING("This charge is armed, its linking cannot be altered unless disarmed."))
return
Expand All @@ -375,6 +375,7 @@
detonator.linked_charges |= src
linked_detonator = detonator
to_chat(user, SPAN_NOTICE("[detonator] indicates a new charge has been linked."))
playsound(src.loc, 'sound/handling/charge-connection.ogg', 25, 1)
icon_state = "satchel_linked"

/obj/item/explosive/satchel_charge/proc/un_activate()
Expand Down
Binary file added sound/handling/charge-connection.ogg
Binary file not shown.
Binary file added sound/handling/charge-detonator.ogg
Binary file not shown.
Binary file added sound/handling/charge-primed.ogg
Binary file not shown.

0 comments on commit 6fbe65a

Please sign in to comment.