Adds a triple beep sound to a variety of assembly receivers (Paradise…

…SS13#27315) * added a beep beep to signaler receivers * new sound + attribution
Contrabang · Nov 29, 2024 · 8cc1625 · 8cc1625
1 parent 27fcd61
commit 8cc1625
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -543,7 +543,8 @@
 	open = TRUE
 	opener = user
 
-	audible_message("<span class='warning'>[bicon(src)] *beep* *beep*</span>")
+	audible_message("<span class='warning'>[bicon(src)] *beep* *beep* *beep*</span>")
+	playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10)
 	to_chat(user, "<span class='danger'>That's no pizza! That's a bomb!</span>")
 	if(HAS_TRAIT(src, TRAIT_CMAGGED))
 		atom_say("Pizza time!")

diff --git 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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)