From 821b02d5d000a1eb5ef8a0d2bb1842dbce53009e Mon Sep 17 00:00:00 2001 From: Gaming Date: Sat, 23 Apr 2022 16:10:08 -0500 Subject: [PATCH 1/3] Using emergency security alert now triggers maptext + a sound --- code/obj/item/device/pda2/modules.dm | 5 +++++ sound/items/security_alert.ogg | Bin 0 -> 7599 bytes 2 files changed, 5 insertions(+) create mode 100644 sound/items/security_alert.ogg diff --git a/code/obj/item/device/pda2/modules.dm b/code/obj/item/device/pda2/modules.dm index 6560e2e9a575e..f64b80e0a3b6b 100644 --- a/code/obj/item/device/pda2/modules.dm +++ b/code/obj/item/device/pda2/modules.dm @@ -311,6 +311,11 @@ var/area/A = get_area(src.host) signal.data["message"] = "***SECURITY BACKUP REQUESTED*** Location: [A ? A.name : "nowhere"]!" src.host.post_signal(signal) + 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.", "color: #bbbbbb; font-size: 7px;", alpha = 180) + for (var/mob/O in hearers(usr)) + O.show_message(assoc_maptext = map_text) boutput(usr, "Alert sent.") /obj/ability_button/pda_security_alert diff --git a/sound/items/security_alert.ogg b/sound/items/security_alert.ogg new file mode 100644 index 0000000000000000000000000000000000000000..22a8c234e20ede8a3fe90d800931ff4cf0e268e2 GIT binary patch literal 7599 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 literal 0 HcmV?d00001 From 89e1963da46ec3dba1409db1cf2a2804e9d4e711 Mon Sep 17 00:00:00 2001 From: Gaming Date: Sat, 23 Apr 2022 20:31:33 -0500 Subject: [PATCH 2/3] Does sound stuff --- code/modules/sound/soundCache.dm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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',\ From 232ad1b53041536e196bc0a5e427ed8aa84f971e Mon Sep 17 00:00:00 2001 From: Gaming Date: Mon, 30 May 2022 23:43:22 -0500 Subject: [PATCH 3/3] Aloe suggestions + changes text --- code/obj/item/device/pda2/modules.dm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/code/obj/item/device/pda2/modules.dm b/code/obj/item/device/pda2/modules.dm index f64b80e0a3b6b..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,12 +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) - 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.", "color: #bbbbbb; font-size: 7px;", alpha = 180) - for (var/mob/O in hearers(usr)) - O.show_message(assoc_maptext = map_text) - 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" @@ -325,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)