diff --git a/code/modules/sound/soundCache.dm b/code/modules/sound/soundCache.dm index 136f054c9c701..36ac83836c842 100644 --- a/code/modules/sound/soundCache.dm +++ b/code/modules/sound/soundCache.dm @@ -481,6 +481,7 @@ var/global/list/soundCache = list( "sound/items/Scissor.ogg" = 'sound/items/Scissor.ogg',\ "sound/items/Screwdriver.ogg" = 'sound/items/Screwdriver.ogg',\ "sound/items/Screwdriver2.ogg" = 'sound/items/Screwdriver2.ogg',\ + "sound/items/security_alert.ogg" = 'sound/items/security_alert.ogg',\ "sound/items/small_fire_hiss.ogg" = 'sound/items/small_fire_hiss.ogg',\ "sound/items/sticker.ogg" = 'sound/items/sticker.ogg',\ "sound/items/toys/figure-headlock.ogg" = 'sound/items/toys/figure-headlock.ogg',\ @@ -1058,9 +1059,6 @@ var/global/list/soundCache = list( "sound/musical_instruments/Fiddle_4.ogg" = 'sound/musical_instruments/Fiddle_4.ogg',\ "sound/musical_instruments/Fiddle_5.ogg" = 'sound/musical_instruments/Fiddle_5.ogg',\ "sound/musical_instruments/Gong_Rumbling.ogg" = 'sound/musical_instruments/Gong_Rumbling.ogg',\ - "sound/musical_instruments/Guitar_bonk1.ogg" = 'sound/musical_instruments/Guitar_bonk1.ogg',\ - "sound/musical_instruments/Guitar_bonk2.ogg" = 'sound/musical_instruments/Guitar_bonk2.ogg',\ - "sound/musical_instruments/Guitar_bonk3.ogg" = 'sound/musical_instruments/Guitar_bonk3.ogg',\ "sound/musical_instruments/guitar/guitar_1.ogg" = 'sound/musical_instruments/guitar/guitar_1.ogg',\ "sound/musical_instruments/guitar/guitar_10.ogg" = 'sound/musical_instruments/guitar/guitar_10.ogg',\ "sound/musical_instruments/guitar/guitar_11.ogg" = 'sound/musical_instruments/guitar/guitar_11.ogg',\ @@ -1073,6 +1071,9 @@ var/global/list/soundCache = list( "sound/musical_instruments/guitar/guitar_7.ogg" = 'sound/musical_instruments/guitar/guitar_7.ogg',\ "sound/musical_instruments/guitar/guitar_8.ogg" = 'sound/musical_instruments/guitar/guitar_8.ogg',\ "sound/musical_instruments/guitar/guitar_9.ogg" = 'sound/musical_instruments/guitar/guitar_9.ogg',\ + "sound/musical_instruments/Guitar_bonk1.ogg" = 'sound/musical_instruments/Guitar_bonk1.ogg',\ + "sound/musical_instruments/Guitar_bonk2.ogg" = 'sound/musical_instruments/Guitar_bonk2.ogg',\ + "sound/musical_instruments/Guitar_bonk3.ogg" = 'sound/musical_instruments/Guitar_bonk3.ogg',\ "sound/musical_instruments/Harmonica_1.ogg" = 'sound/musical_instruments/Harmonica_1.ogg',\ "sound/musical_instruments/Harmonica_2.ogg" = 'sound/musical_instruments/Harmonica_2.ogg',\ "sound/musical_instruments/Harmonica_3.ogg" = 'sound/musical_instruments/Harmonica_3.ogg',\ @@ -1307,6 +1308,11 @@ var/global/list/soundCache = list( "sound/radio_station/flockdrone/click.ogg" = 'sound/radio_station/flockdrone/click.ogg',\ "sound/radio_station/flockdrone/deny.ogg" = 'sound/radio_station/flockdrone/deny.ogg',\ "sound/radio_station/flockdrone/hover.ogg" = 'sound/radio_station/flockdrone/hover.ogg',\ + "sound/voice/animal/brullbar_cry.ogg" = 'sound/voice/animal/brullbar_cry.ogg',\ + "sound/voice/animal/brullbar_laugh.ogg" = 'sound/voice/animal/brullbar_laugh.ogg',\ + "sound/voice/animal/brullbar_maul.ogg" = 'sound/voice/animal/brullbar_maul.ogg',\ + "sound/voice/animal/brullbar_roar.ogg" = 'sound/voice/animal/brullbar_roar.ogg',\ + "sound/voice/animal/brullbar_scream.ogg" = 'sound/voice/animal/brullbar_scream.ogg',\ "sound/voice/animal/bugchitter.ogg" = 'sound/voice/animal/bugchitter.ogg',\ "sound/voice/animal/bull.ogg" = 'sound/voice/animal/bull.ogg',\ "sound/voice/animal/butterflyscream.ogg" = 'sound/voice/animal/butterflyscream.ogg',\ @@ -1340,11 +1346,6 @@ var/global/list/soundCache = list( "sound/voice/animal/squawk2.ogg" = 'sound/voice/animal/squawk2.ogg',\ "sound/voice/animal/squawk3.ogg" = 'sound/voice/animal/squawk3.ogg',\ "sound/voice/animal/turkey.ogg" = 'sound/voice/animal/turkey.ogg',\ - "sound/voice/animal/brullbar_cry.ogg" = 'sound/voice/animal/brullbar_cry.ogg',\ - "sound/voice/animal/brullbar_laugh.ogg" = 'sound/voice/animal/brullbar_laugh.ogg',\ - "sound/voice/animal/brullbar_maul.ogg" = 'sound/voice/animal/brullbar_maul.ogg',\ - "sound/voice/animal/brullbar_roar.ogg" = 'sound/voice/animal/brullbar_roar.ogg',\ - "sound/voice/animal/brullbar_scream.ogg" = 'sound/voice/animal/brullbar_scream.ogg',\ "sound/voice/animal/werewolf_attack1.ogg" = 'sound/voice/animal/werewolf_attack1.ogg',\ "sound/voice/animal/werewolf_attack2.ogg" = 'sound/voice/animal/werewolf_attack2.ogg',\ "sound/voice/animal/werewolf_attack3.ogg" = 'sound/voice/animal/werewolf_attack3.ogg',\ diff --git a/code/obj/item/device/pda2/modules.dm b/code/obj/item/device/pda2/modules.dm index 6560e2e9a575e..f510e3ae45387 100644 --- a/code/obj/item/device/pda2/modules.dm +++ b/code/obj/item/device/pda2/modules.dm @@ -292,15 +292,15 @@ if(..()) return if(href_list["toggle"]) - src.send_alert() + src.send_alert(usr) return - proc/send_alert() + proc/send_alert(mob/user) if (!src.host) - boutput(usr, "No PDA detected.") + boutput(user, "No PDA detected.") return if (ON_COOLDOWN(src, "send_alert", 5 MINUTES)) - boutput(usr, "[src] is still on cooldown mode!") + boutput(user, "[src] is still on cooldown mode!") return var/datum/signal/signal = get_free_signal() signal.source = src.host @@ -311,7 +311,13 @@ var/area/A = get_area(src.host) signal.data["message"] = "***SECURITY BACKUP REQUESTED*** Location: [A ? A.name : "nowhere"]!" src.host.post_signal(signal) - boutput(usr, "Alert sent.") + if(isliving(user)) + playsound(src, "sound/items/security_alert.ogg", 90, 1, 3) + var/map_text = null + map_text = make_chat_maptext(usr, "Emergency alert sent. Please assist this officer.", "font-family: 'Helvetica'; color: #8B0000; font-size: 7px;", alpha = 215) + for (var/mob/O in hearers(usr)) + O.show_message(assoc_maptext = map_text) + boutput(usr, "Alert sent.") /obj/ability_button/pda_security_alert name = "Send Security Alert" @@ -320,4 +326,4 @@ execute_ability() var/obj/item/device/pda_module/alert/J = the_item if (J.host) - J.send_alert() + J.send_alert(src.the_mob) diff --git a/sound/items/security_alert.ogg b/sound/items/security_alert.ogg new file mode 100644 index 0000000000000..22a8c234e20ed Binary files /dev/null and b/sound/items/security_alert.ogg differ