From 8cc162589bb4d4fcd055f44dfec70a7c757e6af1 Mon Sep 17 00:00:00 2001 From: Toastical Date: Fri, 29 Nov 2024 03:49:20 +0200 Subject: [PATCH] Adds a triple beep sound to a variety of assembly receivers (#27315) * added a beep beep to signaler receivers * new sound + attribution --- code/modules/assembly/health.dm | 3 ++- code/modules/assembly/infrared.dm | 3 ++- code/modules/assembly/proximity.dm | 3 ++- code/modules/assembly/signaler.dm | 3 ++- code/modules/assembly/timer.dm | 3 ++- code/modules/clothing/masks/misc_masks.dm | 1 - code/modules/food_and_drinks/food/foods/pizza.dm | 3 ++- sound/Attributions.txt | 2 ++ sound/machines/triple_beep.ogg | Bin 0 -> 8820 bytes 9 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 sound/machines/triple_beep.ogg diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index 32e0ae23cbb..b85d0037687 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -52,7 +52,8 @@ user_health = M.health if(user_health <= alarm_health) // Its a health detector, not a death detector pulse() - audible_message("[bicon(src)] *beep* *beep*") + audible_message("[bicon(src)] *beep* *beep* *beep*") + playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10) toggle_scan() /obj/item/assembly/health/pickup(mob/user) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 365ef113f42..f11cccdefc3 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -126,7 +126,8 @@ return FALSE cooldown = 2 pulse(FALSE) - audible_message("[bicon(src)] *beep* *beep*", hearing_distance = 3) + audible_message("[bicon(src)] *beep* *beep* *beep*", hearing_distance = 3) + playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -14) if(first) qdel(first) addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 25caaed172c..a9fb8b088f3 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -55,7 +55,8 @@ return FALSE cooldown = 2 pulse(FALSE) - visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") + visible_message("[bicon(src)] *beep* *beep* *beep*", "*beep* *beep* *beep*") + playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10) addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) /obj/item/assembly/prox_sensor/process() diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 8f6bec48d75..7bc513cd2fc 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -60,7 +60,8 @@ GLOBAL_LIST_EMPTY(remote_signalers) /obj/item/assembly/signaler/proc/signal_callback() pulse(1) - visible_message("[bicon(src)] *beep* *beep*") + visible_message("[bicon(src)] *beep* *beep* *beep*") + playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10) // Activation pre-runner, handles cooldown and calls signal(), invoked from ui_act() /obj/item/assembly/signaler/activate() diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index aa38ddd7a99..de4e4ee85b5 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -44,7 +44,8 @@ cooldown = 2 pulse(FALSE) if(loc) - loc.visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") + loc.visible_message("[bicon(src)] *beep* *beep* *beep*", "*beep* *beep* *beep*") + playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10) addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) /obj/item/assembly/timer/process() diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm index df4684a5e5e..b2915e0090c 100644 --- a/code/modules/clothing/masks/misc_masks.dm +++ b/code/modules/clothing/masks/misc_masks.dm @@ -154,7 +154,6 @@ return FALSE /obj/item/clothing/mask/muzzle/safety/shock/proc/process_activation(obj/D, normal = 1, special = 1) - visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") var/mob/living/L = can_shock(loc) if(!L) return diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index 40c5b9bf769..09ce56ee91b 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -543,7 +543,8 @@ open = TRUE opener = user - audible_message("[bicon(src)] *beep* *beep*") + audible_message("[bicon(src)] *beep* *beep* *beep*") + playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10) to_chat(user, "That's no pizza! That's a bomb!") if(HAS_TRAIT(src, TRAIT_CMAGGED)) atom_say("Pizza time!") diff --git a/sound/Attributions.txt b/sound/Attributions.txt index d74d0ee9a91..3b80bc78d79 100644 --- a/sound/Attributions.txt +++ b/sound/Attributions.txt @@ -3,3 +3,5 @@ items/thermal_drill.ogg was sampled from Builders Drilling.wav under a Sampling creatures/dog_yelp.ogg is DogYelp.wav. It is under a CC-BY 3.0 license. It has been cropped, EQ'd, and compressed to .ogg. Source (https://freesound.org/people/TobiasKosmos/sounds/163280/) standard_stamp.ogg is adapted from tom_woysky's "Stamp.wav" https://freesound.org/people/tom_woysky/sounds/348316/ + +machines/triple_beep.ogg is taken from /tg/station. Source (https://github.com/tgstation/tgstation) diff --git a/sound/machines/triple_beep.ogg b/sound/machines/triple_beep.ogg new file mode 100644 index 0000000000000000000000000000000000000000..891345e3a093b4c0e0f9e6a840ef35d97e4c9d26 GIT binary patch literal 8820 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