Skip to content

Commit 8cc1625

Browse files
authored
Adds a triple beep sound to a variety of assembly receivers (ParadiseSS13#27315)
* added a beep beep to signaler receivers * new sound + attribution
1 parent 27fcd61 commit 8cc1625

File tree

9 files changed

+14
-7
lines changed

9 files changed

+14
-7
lines changed

code/modules/assembly/health.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
user_health = M.health
5353
if(user_health <= alarm_health) // Its a health detector, not a death detector
5454
pulse()
55-
audible_message("[bicon(src)] *beep* *beep*")
55+
audible_message("[bicon(src)] *beep* *beep* *beep*")
56+
playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10)
5657
toggle_scan()
5758

5859
/obj/item/assembly/health/pickup(mob/user)

code/modules/assembly/infrared.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@
126126
return FALSE
127127
cooldown = 2
128128
pulse(FALSE)
129-
audible_message("[bicon(src)] *beep* *beep*", hearing_distance = 3)
129+
audible_message("[bicon(src)] *beep* *beep* *beep*", hearing_distance = 3)
130+
playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -14)
130131
if(first)
131132
qdel(first)
132133
addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)

code/modules/assembly/proximity.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
return FALSE
5656
cooldown = 2
5757
pulse(FALSE)
58-
visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
58+
visible_message("[bicon(src)] *beep* *beep* *beep*", "*beep* *beep* *beep*")
59+
playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10)
5960
addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
6061

6162
/obj/item/assembly/prox_sensor/process()

code/modules/assembly/signaler.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ GLOBAL_LIST_EMPTY(remote_signalers)
6060

6161
/obj/item/assembly/signaler/proc/signal_callback()
6262
pulse(1)
63-
visible_message("[bicon(src)] *beep* *beep*")
63+
visible_message("[bicon(src)] *beep* *beep* *beep*")
64+
playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10)
6465

6566
// Activation pre-runner, handles cooldown and calls signal(), invoked from ui_act()
6667
/obj/item/assembly/signaler/activate()

code/modules/assembly/timer.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
cooldown = 2
4545
pulse(FALSE)
4646
if(loc)
47-
loc.visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
47+
loc.visible_message("[bicon(src)] *beep* *beep* *beep*", "*beep* *beep* *beep*")
48+
playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10)
4849
addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
4950

5051
/obj/item/assembly/timer/process()

code/modules/clothing/masks/misc_masks.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@
154154
return FALSE
155155

156156
/obj/item/clothing/mask/muzzle/safety/shock/proc/process_activation(obj/D, normal = 1, special = 1)
157-
visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
158157
var/mob/living/L = can_shock(loc)
159158
if(!L)
160159
return

code/modules/food_and_drinks/food/foods/pizza.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,8 @@
543543
open = TRUE
544544
opener = user
545545

546-
audible_message("<span class='warning'>[bicon(src)] *beep* *beep*</span>")
546+
audible_message("<span class='warning'>[bicon(src)] *beep* *beep* *beep*</span>")
547+
playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10)
547548
to_chat(user, "<span class='danger'>That's no pizza! That's a bomb!</span>")
548549
if(HAS_TRAIT(src, TRAIT_CMAGGED))
549550
atom_say("Pizza time!")

sound/Attributions.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ items/thermal_drill.ogg was sampled from Builders Drilling.wav under a Sampling
33
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/)
44

55
standard_stamp.ogg is adapted from tom_woysky's "Stamp.wav" https://freesound.org/people/tom_woysky/sounds/348316/
6+
7+
machines/triple_beep.ogg is taken from /tg/station. Source (https://github.com/tgstation/tgstation)

sound/machines/triple_beep.ogg

8.61 KB
Binary file not shown.

0 commit comments

Comments
 (0)