diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index c2433ec28c6..4fc8bf4b1b8 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -73,10 +73,9 @@ datum/shuttle_controller last_call_loc = null if(recall_count == 2) - captain_announce("The emergency shuttle has been recalled.\n\nExcessive number of emergency shuttle calls detected. We will attempt to trace any further signals to their source. Results may be viewed on any communications console.") + priority_announce("The emergency shuttle has been recalled.\n\nExcessive number of emergency shuttle calls detected. We will attempt to trace any further signals to their source. Results may be viewed on any communications console.", null, 'sound/AI/shuttlerecalled.ogg') else - captain_announce("The emergency shuttle has been recalled.") - world << sound('sound/AI/shuttlerecalled.ogg') + priority_announce("The emergency shuttle has been recalled.", null, 'sound/AI/shuttlerecalled.ogg', "Priority") setdirection(-1) online = 1 @@ -133,8 +132,7 @@ datum/shuttle_controller incall(SHUTTLEAUTOCALLTIMER) //X minutes! If they want to recall, they have X-(X-5) minutes to do so log_game("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.") message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.", 1) - captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") - world << sound('sound/AI/shuttlecalled.ogg') + priority_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.", null, 'sound/AI/shuttlecalled.ogg', "Priority") proc/move_shuttles() var/datum/shuttle_manager/s @@ -166,14 +164,13 @@ datum/shuttle_controller location = DOCKED settimeleft(SHUTTLELEAVETIME) send2irc("Server", "The Emergency Shuttle has docked with the station.") - captain_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.") - world << sound('sound/AI/shuttledock.ogg') + priority_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") else if(timeleft <= 0) //Nothing happens if time's not up and the ship's docked or later if(location == DOCKED) move_shuttles() location = TRANSIT settimeleft(SHUTTLETRANSITTIME) - captain_announce("The Emergency Shuttle has left the station. Estimate [round(timeleft()/60,1)] minutes until the shuttle docks at Central Command.") + priority_announce("The Emergency Shuttle has left the station. Estimate [round(timeleft()/60,1)] minutes until the shuttle docks at Central Command.", null, null, "Priority") else if(location == TRANSIT) move_shuttles() //message_admins("Shuttles have attempted to move to Centcom") diff --git a/code/defines/procs/captain_announce.dm b/code/defines/procs/captain_announce.dm deleted file mode 100644 index 9b91705ea56..00000000000 --- a/code/defines/procs/captain_announce.dm +++ /dev/null @@ -1,5 +0,0 @@ -/proc/captain_announce(var/text) - world << "

Priority Announcement

" - world << "[html_encode(text)]" - world << "
" - diff --git a/code/defines/procs/command_alert.dm b/code/defines/procs/command_alert.dm deleted file mode 100644 index 9635e20eb97..00000000000 --- a/code/defines/procs/command_alert.dm +++ /dev/null @@ -1,16 +0,0 @@ -/proc/command_alert(var/text, var/title = "") - var/command - command += "

[command_name()] Update

" - - if (title && length(title) > 0) - command += "

[html_encode(title)]

" - - command += "
[html_encode(text)]
" - command += "
" - for(var/mob/M in player_list) - if(!istype(M,/mob/new_player)) - M << command - if(title == "") - news_network.SubmitArticle(text, "Centcom Official", "Central Command", null) - else - news_network.SubmitArticle(title + "

" + text, "Centcom Official", "Central Command", null) diff --git a/code/defines/procs/priority_announce.dm b/code/defines/procs/priority_announce.dm new file mode 100644 index 00000000000..3fa44fb82e9 --- /dev/null +++ b/code/defines/procs/priority_announce.dm @@ -0,0 +1,29 @@ +/proc/priority_announce(var/text, var/title = "", var/sound = 'sound/AI/attention.ogg', var/type) + if(!text) + return + + var/announcement + + if(type == "Priority") + announcement += "

Priority Announcement

" + + else if(type == "Captain") + news_network.SubmitArticle(text, "Captain's Announcement", "Station Announcements", null) + announcement += "

Captain Announces

" + + else + if (title && length(title) > 0) + announcement += "

[html_encode(title)]

" + if(title == "") + news_network.SubmitArticle(text, "Central Command Update", "Station Announcements", null) + else + news_network.SubmitArticle(title + "

" + text, "Central Command", "Station Announcements", null) + announcement += "

[command_name()] Update

" + + announcement += "
[html_encode(text)]
" + announcement += "
" + + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << announcement + M << sound(sound) \ No newline at end of file diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 77f303e371b..1b72fbc1935 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -156,10 +156,7 @@ var/list/blob_nodes = list() return if (1) - command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - for(var/mob/M in player_list) - if(!istype(M,/mob/new_player)) - M << sound('sound/AI/outbreak5.ogg') + priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg') return return diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index d11ab6834ae..a89d7681a21 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -32,10 +32,7 @@ eventNumbersToPickFrom += 3 switch(pick(eventNumbersToPickFrom)) if(1) - command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert") - for(var/mob/M in player_list) - if(!istype(M,/mob/new_player)) - M << sound('sound/AI/meteors.ogg') + priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/AI/meteors.ogg') spawn(100) meteor_wave() spawn_meteors() @@ -74,9 +71,7 @@ */ /proc/power_failure() - command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure") - for(var/mob/M in player_list) - M << sound('sound/AI/poweroff.ogg') + priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/AI/poweroff.ogg') for(var/obj/machinery/power/smes/S in world) if(istype(get_area(S), /area/turret_protected) || S.z != 1) continue @@ -123,9 +118,7 @@ /proc/power_restore() - command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal") - for(var/mob/M in player_list) - M << sound('sound/AI/poweron.ogg') + priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/AI/poweron.ogg') for(var/obj/machinery/power/apc/C in world) if(C.cell && C.z == 1) C.cell.charge = C.cell.maxcharge @@ -146,9 +139,7 @@ /proc/power_restore_quick() - command_alert("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal") - for(var/mob/M in player_list) - M << sound('sound/AI/poweron.ogg') + priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/AI/poweron.ogg') for(var/obj/machinery/power/smes/S in world) if(S.z != 1) continue diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 720f0058217..6b61e9e11bc 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -203,10 +203,7 @@ comm.messagetitle.Add("Cent. Com. Status Summary") comm.messagetext.Add(intercepttext) - command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.") - for(var/mob/M in player_list) - if(!istype(M,/mob/new_player)) - M << sound('sound/AI/intercept.ogg') + priority_announce("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.", 'sound/AI/intercept.ogg') if(security_level < SEC_LEVEL_BLUE) set_security_level(SEC_LEVEL_BLUE) diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index f0a078f313c..d37f3880e6e 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -184,7 +184,7 @@ if (alert(usr, "Are you sure you wish to initiate the takeover? The station hostile runtime detection software is bound to alert everyone. You have hacked [ticker.mode:apcs] APCs.", "Takeover:", "Yes", "No") != "Yes") return - command_alert("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert") + priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", 'sound/AI/aimalf.ogg') set_security_level("delta") for(var/obj/item/weapon/pinpointer/point in world) @@ -196,9 +196,6 @@ ticker.mode:malf_mode_declared = 1 for(var/datum/mind/AI_mind in ticker.mode:malf_ai) AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/takeover - for(var/mob/M in player_list) - if(!istype(M,/mob/new_player)) - M << sound('sound/AI/aimalf.ogg') /datum/game_mode/malfunction/proc/ai_win() diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 6099980a45a..0bd24d7fb1b 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -11,6 +11,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 circuit = /obj/item/weapon/circuitboard/communications var/prints_intercept = 1 var/authenticated = 0 + var/auth_id = "Unknown" //Who is currently logged in? var/list/messagetitle = list() var/list/messagetext = list() var/currmsg = 0 @@ -18,6 +19,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 var/state = STATE_DEFAULT var/aistate = STATE_DEFAULT var/message_cooldown = 0 + var/ai_message_cooldown = 0 var/centcom_message_cooldown = 0 var/tmp_alertlevel = 0 var/const/STATE_DEFAULT = 1 @@ -69,8 +71,12 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if (I && istype(I)) if(src.check_access(I)) authenticated = 1 - if((20 in I.access) || src.emagged) + auth_id = "[I.registered_name] ([I.assignment])" + if((20 in I.access)) + authenticated = 2 + if(src.emagged) authenticated = 2 + auth_id = "Unknown" if("logout") authenticated = 0 @@ -105,17 +111,8 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 usr << "You need to swipe your ID." if("announce") - if(src.authenticated==2) - if(message_cooldown) return - var/input = stripped_input(usr, "Please choose a message to announce to the station crew.", "What?") - if(!input || !(usr in view(1,src))) - return - captain_announce(input)//This should really tell who is, IE HoP, CE, HoS, RD, Captain - log_say("[key_name(usr)] has made a captain announcement: [input]") - message_admins("[key_name_admin(usr)] has made a captain announcement.", 1) - message_cooldown = 1 - spawn(600)//One minute cooldown - message_cooldown = 0 + if(src.authenticated==2 && !message_cooldown) + make_announcement(usr) if("callshuttle") src.state = STATE_DEFAULT @@ -273,7 +270,9 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 src.aistate = STATE_MESSAGELIST if("ai-status") src.aistate = STATE_STATUSDISPLAY - + if("ai-announce") + if(!ai_message_cooldown) + make_announcement(usr, 1) if("ai-securitylevel") src.tmp_alertlevel = text2num( href_list["newalertlevel"] ) if(!tmp_alertlevel) tmp_alertlevel = 0 @@ -359,6 +358,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 dat += "
Latest emergency signal trace attempt successful.
Last signal origin: [format_text(emergency_shuttle.last_call_loc.name)].
" else dat += "
Latest emergency signal trace attempt failed.
" + dat += "Logged in as: [auth_id]" dat += "
\[ Log Out \]
" dat += "
General Functions" dat += "
\[ Message List \]" @@ -371,7 +371,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 dat += "
\[ Set Status Display \]" if (src.authenticated==2) dat += "

Captain Functions" - dat += "
\[ Make a Priority Announcement \]" + dat += "
\[ Make a Captain's Announcement \]" dat += "
\[ Change Alert Level \]" dat += "
\[ Emergency Maintenance Access \]" if(src.emagged == 0) @@ -487,11 +487,17 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 dat += "
Latest emergency signal trace attempt successful.
Last signal origin: [format_text(emergency_shuttle.last_call_loc.name)].
" else dat += "
Latest emergency signal trace attempt failed.
" - + if(authenticated) + dat += "Current login: [auth_id]" + else + dat += "Current login: None" + dat += "

General Functions" dat += "
\[ Message List \]" if(emergency_shuttle.location==0 && !emergency_shuttle.online) dat += "
\[ Call Emergency Shuttle \]" dat += "
\[ Set Status Display \]" + dat += "

Special Functions" + dat += "
\[ Make a Priority Announcement \]" dat += "
\[ Change Alert Level \]" dat += "
\[ Emergency Maintenance Access \]" if(STATE_CALLSHUTTLE) @@ -547,6 +553,22 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 dat += "

\[ [(src.aistate != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" return dat +/obj/machinery/computer/communications/proc/make_announcement(var/mob/living/user, var/is_silicon) + var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?") + if(!input || !user.canUseTopic(src)) + return + if(is_silicon) + priority_announce(input, null, null, "Priority") + ai_message_cooldown = 1 + spawn(600)//One minute cooldown + ai_message_cooldown = 0 + else + priority_announce(input, null, 'sound/misc/announce.ogg', "Captain") + message_cooldown = 1 + spawn(600)//One minute cooldown + message_cooldown = 0 + log_say("[key_name(user)] has made a priority announcement: [input]") + message_admins("[key_name_admin(user)] has made a priority announcement.", 1) /proc/call_shuttle_proc(var/mob/user, var/call_reason) if ((!( ticker ) || emergency_shuttle.location)) @@ -573,14 +595,13 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 var/emergency_reason = "\nNature of emergency:\n\n[call_reason]" if (seclevel2num(get_security_level()) == SEC_LEVEL_RED) // There is a serious threat we gotta move no time to give them five minutes. emergency_shuttle.incall(0.6, signal_origin) - captain_announce("The emergency shuttle has been called. Red Alert state confirmed: Dispatching priority shuttle. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.[emergency_reason]") + priority_announce("The emergency shuttle has been called. Red Alert state confirmed: Dispatching priority shuttle. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.[emergency_reason]", null, 'sound/AI/shuttlecalled.ogg', "Priority") else emergency_shuttle.incall(1, signal_origin) - captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.[emergency_reason]") + priority_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.[emergency_reason]", null, 'sound/AI/shuttlecalled.ogg', "Priority") log_game("[key_name(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle.", 1) - world << sound('sound/AI/shuttlecalled.ogg') return diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index d43833b955f..73bf7b1eb11 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -36,11 +36,11 @@ if (src.auth_need - src.authorized.len > 0) message_admins("[key_name(user.client)](?) has authorized early shuttle launch in ([x],[y],[z] - JMP)",0,1) log_game("[user.ckey]([user]) has authorized early shuttle launch in ([x],[y],[z])") - world << text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + priority_announce("[src.auth_need - src.authorized.len] more authorization(s) needed until shuttle is launched early", null, null, "Priority") else message_admins("[key_name(user.client)](?) has launched the emergency shuttle in ([x],[y],[z] - JMP)",0,1) log_game("[user.ckey]([user]) has launched the emergency shuttle in ([x],[y],[z])") - world << "\blue Alert: Shuttle launch time shortened to 10 seconds!" + priority_announce("The emergency shuttle will launch in 10 seconds", null, null, "Priority") emergency_shuttle.online = 1 emergency_shuttle.settimeleft(10) //src.authorized = null @@ -49,10 +49,10 @@ if("Repeal") src.authorized -= W:registered_name - world << text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + priority_announce("[src.auth_need - src.authorized.len] authorizations needed until shuttle is launched early", null, null, "Priority") if("Abort") - world << "\blue All authorizations to shorting time for shuttle launch have been revoked!" + priority_announce("All authorizations to launch the shuttle early have been revoked.", null, null, "Priority") src.authorized.len = 0 src.authorized = list( ) @@ -64,7 +64,7 @@ if("Launch") message_admins("[key_name(user.client)](?) has emagged the emergency shuttle in ([x],[y],[z] - JMP)",0,1) log_game("[user.ckey]([user]) has emagged the emergency shuttle in ([x],[y],[z])") - world << "\blue Alert: Shuttle launch time shortened to 10 seconds!" + priority_announce("System Error: The emergency shuttle will launch in 10 seconds", null, null, "Priority") emergency_shuttle.settimeleft( 10 ) emagged = 1 if("Cancel") diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index afaca2f0e76..1ea98bb5c4b 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -44,7 +44,7 @@ var/datum/feed_message/wanted_issue /datum/feed_network/New() - CreateFeedChannel("Central Command", "Centcom Official", 1) + CreateFeedChannel("Station Announcements", "SS13", 1) /datum/feed_network/proc/CreateFeedChannel(var/channel_name, var/author, var/locked, var/adminChannel = 0) var/datum/feed_channel/newChannel = new /datum/feed_channel diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 9a4f1c6c9d8..e39e53257a8 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -283,6 +283,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() for(var/mob/M in player_list) if(!istype(M,/mob/new_player)) M << "[department] announcement: [message]" + news_network.SubmitArticle(message, department, "Station Announcements", null) announceAuth = 0 message = "" screen = 0 diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 0d94167f7f8..f9fcfb99bf8 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -157,7 +157,7 @@ if ((!( ticker ) || emergency_shuttle.location)) return emergency_shuttle.incall() - captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") + priority_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.", null,'sound/AI/shuttlecalled.ogg', "Priority") log_admin("[key_name(usr)] called the Emergency Shuttle") message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1) @@ -167,7 +167,7 @@ switch(emergency_shuttle.direction) if(-1) emergency_shuttle.incall() - captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") + priority_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.", null, 'sound/AI/shuttlerecalled.ogg', "Priority") log_admin("[key_name(usr)] called the Emergency Shuttle") message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1) if(1) @@ -182,7 +182,7 @@ emergency_shuttle.settimeleft( input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", emergency_shuttle.timeleft() ) as num ) log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]") - captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") + priority_announce("The emergency shuttle will reach its destination in [round(emergency_shuttle.timeleft()/60)] minutes.", null, null, "Priority") message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]", 1) href_list["secretsadmin"] = "check_antagonist" @@ -1854,8 +1854,7 @@ if(W.z == 1 && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison)) W.req_access = list() message_admins("[key_name_admin(usr)] activated Egalitarian Station mode") - command_alert("Centcom airlock control override activated. Please take this time to get acquainted with your coworkers.") - world << sound('sound/AI/commandreport.ogg') + priority_announce("Centcom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/AI/commandreport.ogg') if("guns") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","SG") diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 6191f79fa22..643baf99c12 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -423,7 +423,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/confirm = alert(src, "Do you want to announce the contents of the report to the crew?", "Announce", "Yes", "No") if(confirm == "Yes") - command_alert(input); + priority_announce(input, null, 'sound/AI/commandreport.ogg'); for (var/obj/machinery/computer/communications/C in machines) if(! (C.stat & (BROKEN|NOPOWER) ) ) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) @@ -432,7 +432,7 @@ Traitors and the like can also be revived with the previous role mostly intact. C.messagetitle.Add("[command_name()] Update") C.messagetext.Add(P.info) else - command_alert("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message"); + priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg'); for (var/obj/machinery/computer/communications/C in machines) if(! (C.stat & (BROKEN|NOPOWER) ) ) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) @@ -441,7 +441,6 @@ Traitors and the like can also be revived with the previous role mostly intact. C.messagetitle.Add("Classified [command_name()] Update") C.messagetext.Add(P.info) - world << sound('sound/AI/commandreport.ogg') log_admin("[key_name(src)] has created a command report: [input]") message_admins("[key_name_admin(src)] has created a command report", 1) feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -703,8 +702,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return emergency_shuttle.incall() - captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") - world << sound('sound/AI/shuttlecalled.ogg') + priority_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.", null, 'sound/AI/shuttlecalled.ogg', "Priority") feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-called the emergency shuttle.") message_admins("\blue [key_name_admin(usr)] admin-called the emergency shuttle.", 1) diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 32fadf2eef7..16fcdb2f4b6 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -40,7 +40,7 @@ if (usr.stat || usr.restrained()) return if(src.reload < 180) return if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - command_alert("Bluespace artillery fire detected. Brace for impact.") + priority_announce("Bluespace artillery fire detected. Brace for impact.") message_admins("[key_name_admin(usr)] has launched an artillery strike.", 1) var/list/L = list() for(var/turf/T in get_area_turfs(thearea.type)) @@ -53,7 +53,7 @@ var/A A = input("Area to jump bombard", "Open Fire", A) in teleportlocs var/area/thearea = teleportlocs[A] - command_alert("Bluespace artillery fire detected. Brace for impact.") + priority_announce("Bluespace artillery fire detected. Brace for impact.") spawn(30) var/list/L = list() diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index 7e2240a0df5..c4c82a9cf45 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -22,8 +22,7 @@ /datum/round_event/alien_infestation/announce() if(successSpawn) - command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") - world << sound('sound/AI/aliens.ogg') + priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", 'sound/AI/aliens.ogg') /datum/round_event/alien_infestation/start() diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm index f1f3cc44185..654c227e810 100644 --- a/code/modules/events/anomaly.dm +++ b/code/modules/events/anomaly.dm @@ -22,7 +22,7 @@ setup(safety_loop) /datum/round_event/anomaly/announce() - command_alert("Localized hyper-energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert") + priority_announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert") /datum/round_event/anomaly/start() var/turf/T = pick(get_area_turfs(impact_area)) diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm index 8adc6d88713..256a4322c81 100644 --- a/code/modules/events/anomaly_bluespace.dm +++ b/code/modules/events/anomaly_bluespace.dm @@ -11,7 +11,7 @@ /datum/round_event/anomaly/anomaly_bluespace/announce() - command_alert("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") + priority_announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") /datum/round_event/anomaly/anomaly_bluespace/start() @@ -40,7 +40,7 @@ var/turf/TO = get_turf(chosen) // the turf of origin we're travelling TO playsound(TO, 'sound/effects/phasein.ogg', 100, 1) - command_alert("Massive bluespace translocation detected.", "Anomaly Alert") + priority_announce("Massive bluespace translocation detected.", "Anomaly Alert") var/list/flashers = list() for(var/mob/living/carbon/human/M in viewers(TO, null)) diff --git a/code/modules/events/anomaly_flux.dm b/code/modules/events/anomaly_flux.dm index 2c84d7fc70b..dc7e9d4b219 100644 --- a/code/modules/events/anomaly_flux.dm +++ b/code/modules/events/anomaly_flux.dm @@ -11,7 +11,7 @@ /datum/round_event/anomaly/anomaly_flux/announce() - command_alert("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") + priority_announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") /datum/round_event/anomaly/anomaly_flux/start() diff --git a/code/modules/events/anomaly_grav.dm b/code/modules/events/anomaly_grav.dm index 9d7ada2d60d..69d38c62231 100644 --- a/code/modules/events/anomaly_grav.dm +++ b/code/modules/events/anomaly_grav.dm @@ -11,7 +11,7 @@ /datum/round_event/anomaly/anomaly_grav/announce() - command_alert("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") + priority_announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") /datum/round_event/anomaly/anomaly_grav/start() var/turf/T = pick(get_area_turfs(impact_area)) diff --git a/code/modules/events/anomaly_pyro.dm b/code/modules/events/anomaly_pyro.dm index 270ebed2aed..49600a58136 100644 --- a/code/modules/events/anomaly_pyro.dm +++ b/code/modules/events/anomaly_pyro.dm @@ -11,7 +11,7 @@ /datum/round_event/anomaly/anomaly_pyro/announce() - command_alert("Atmospheric anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") + priority_announce("Atmospheric anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") /datum/round_event/anomaly/anomaly_pyro/start() var/turf/T = pick(get_area_turfs(impact_area)) diff --git a/code/modules/events/anomaly_vortex.dm b/code/modules/events/anomaly_vortex.dm index b97310c4ece..993bec48862 100644 --- a/code/modules/events/anomaly_vortex.dm +++ b/code/modules/events/anomaly_vortex.dm @@ -11,7 +11,7 @@ /datum/round_event/anomaly/anomaly_vortex/announce() - command_alert("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert") + priority_announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert") /datum/round_event/anomaly/anomaly_vortex/start() var/turf/T = pick(get_area_turfs(impact_area)) diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index e4846922a30..368172ebecd 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -14,8 +14,7 @@ /datum/round_event/blob/announce() - command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('sound/AI/outbreak5.ogg') + priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg') /datum/round_event/blob/start() diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index d90b575acfc..1c63424387c 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -21,7 +21,7 @@ /datum/round_event/brand_intelligence/announce() - command_alert("Rampant brand intelligence has been detected aboard [station_name()], please stand-by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert") + priority_announce("Rampant brand intelligence has been detected aboard [station_name()], please stand-by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert") /datum/round_event/brand_intelligence/start() diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index d4ec0097553..4820806be23 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -13,7 +13,7 @@ startWhen = rand(40, 60) /datum/round_event/carp_migration/announce() - command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") + priority_announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") /datum/round_event/carp_migration/start() diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index 37cc583a468..353b92a78b8 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -17,7 +17,7 @@ A << "
" if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. - command_alert(alert) + priority_announce(alert) /datum/round_event/communications_blackout/start() diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 8a33611d24f..142e58fa0f6 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -11,8 +11,7 @@ /datum/round_event/disease_outbreak/announce() - command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('sound/AI/outbreak7.ogg') + priority_announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak7.ogg') /datum/round_event/disease_outbreak/setup() announceWhen = rand(15, 30) diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index dae41caea66..51fa161ef23 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -10,7 +10,7 @@ /datum/round_event/electrical_storm/announce() - command_alert("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert") + priority_announce("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert") /datum/round_event/electrical_storm/start() diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index 56b5458ca8f..67536e1dec7 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -14,4 +14,4 @@ Ian.place_on_head(new /obj/item/weapon/bedsheet(Ian)) /datum/round_event/spooky/announce() - command_alert(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE") \ No newline at end of file + priority_announce(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE") \ No newline at end of file diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index a5fd2bad884..d7021e0e12d 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -35,7 +35,7 @@ Monitor.icon_state = "entertainment_xmas" /datum/round_event/presents/announce() - command_alert("Ho Ho Ho, Merry Xmas!", "Unknown Transmission") + priority_announce("Ho Ho Ho, Merry Xmas!", "Unknown Transmission") /obj/item/weapon/toy/xmas_cracker diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 8b1a178b77d..f32befc9310 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -16,7 +16,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 announceWhen = 5 /datum/round_event/immovable_rod/announce() - command_alert("What the fuck was that?!", "General Alert") + priority_announce("What the fuck was that?!", "General Alert") /datum/round_event/immovable_rod/start() var/startx = 0 diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index af4dbb2c68b..659ff0c3168 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -21,8 +21,7 @@ /datum/round_event/ion_storm/announce() if(announceEvent == ION_ANNOUNCE || (announceEvent == ION_RANDOM && prob(ionAnnounceChance))) - command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert") - world << sound('sound/AI/ionstorm.ogg') + priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", 'sound/AI/ionstorm.ogg') /datum/round_event/ion_storm/start() diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index b77c50b716b..e9e950f6c37 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -9,10 +9,9 @@ endWhen = 66 /datum/round_event/meteor_wave/announce() - command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert") - world << sound('sound/AI/meteors.ogg') + priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/AI/meteors.ogg') /datum/round_event/meteor_wave/tick() if(IsMultiple(activeFor, 3)) - spawn_meteors(5, meteorsA) //meteor list types defined in gamemode/meteor/meteors.dm \ No newline at end of file + spawn_meteors(5, meteorsA) //meteor list types defined in gamemode/meteor/meteors.dm diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 99495fbc36e..878a22a0050 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -20,7 +20,7 @@ /datum/round_event/prison_break/announce() if(prisonAreas && prisonAreas.len > 0) - command_alert("Gr3y.T1d3 virus detected in [station_name()] imprisonment subroutines. Recommend station AI involvement.", "Security Alert") + priority_announce("Gr3y.T1d3 virus detected in [station_name()] imprisonment subroutines. Recommend station AI involvement.", "Security Alert") else world.log << "ERROR: Could not initate grey-tide. Unable find prison or brig area." kill() diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 065fde0e00f..8053cea32db 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -12,8 +12,8 @@ endWhen = startWhen + 5 /datum/round_event/radiation_storm/announce() - command_alert("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert") - world << sound('sound/AI/radiation.ogg') //sound not longer matches the text, but an audible warning is probably good + priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/AI/radiation.ogg') + //sound not longer matches the text, but an audible warning is probably good /datum/round_event/radiation_storm/start() @@ -52,4 +52,4 @@ /datum/round_event/radiation_storm/end() - command_alert("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert") \ No newline at end of file + priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert") \ No newline at end of file diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index ef47bc8df91..d785caa4292 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -23,18 +23,18 @@ supply_shuttle.shuttle_loan = src switch(dispatch_type) if(HIJACK_SYNDIE) - command_alert("The syndicate are trying to infiltrate your station. If you let them hijack your shuttle, you'll save us a headache.","Centcom Counter Intelligence") + priority_announce("The syndicate are trying to infiltrate your station. If you let them hijack your shuttle, you'll save us a headache.","Centcom Counter Intelligence") if(RUSKY_PARTY) - command_alert("A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","Centcom Russian Outreach Program") + priority_announce("A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","Centcom Russian Outreach Program") if(SPIDER_GIFT) - command_alert("The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","Centcom Diplomatic Corps") + priority_announce("The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","Centcom Diplomatic Corps") if(DEPARTMENT_RESUPPLY) - command_alert("Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","Centcom Supply Department") + priority_announce("Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","Centcom Supply Department") thanks_msg = "The shuttle will be returned in 5 minutes." bonus_points = 0 /datum/round_event/shuttle_loan/proc/loan_shuttle() - command_alert(thanks_msg, "Cargo shuttle commandeered by Centcom.") + priority_announce(thanks_msg, "Cargo shuttle commandeered by Centcom.") dispatched = 1 supply_shuttle.points += bonus_points diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 994fe6cbac8..8bfb56e49f8 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -15,8 +15,7 @@ spawncount = rand(5, 8) /datum/round_event/spider_infestation/announce() - command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") - world << sound('sound/AI/aliens.ogg') + priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", 'sound/AI/aliens.ogg') /datum/round_event/spider_infestation/start() diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 51e62dd24f1..f202148ca29 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -11,7 +11,7 @@ var/list/vents = list() /datum/round_event/vent_clog/announce() - command_alert("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") + priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") /datum/round_event/vent_clog/setup() diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index 04b9898e9fb..b373671d5d1 100644 --- a/code/modules/events/wormholes.dm +++ b/code/modules/events/wormholes.dm @@ -28,10 +28,7 @@ wormholes += new /obj/effect/portal/wormhole(T, null, null, -1) /datum/round_event/wormholes/announce() - command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert") - for(var/mob/M in player_list) - if(!istype(M, /mob/new_player)) - M << sound('sound/AI/spanomalies.ogg') + priority_announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", 'sound/AI/spanomalies.ogg') /datum/round_event/wormholes/tick() if(activeFor % shift_frequency == 0) diff --git a/sound/AI/attention.ogg b/sound/AI/attention.ogg new file mode 100644 index 00000000000..912be4425eb Binary files /dev/null and b/sound/AI/attention.ogg differ diff --git a/sound/misc/announce.ogg b/sound/misc/announce.ogg new file mode 100644 index 00000000000..e5db9b0cb31 Binary files /dev/null and b/sound/misc/announce.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 22fd102974c..2d9d581ecb6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -213,9 +213,8 @@ #include "code\defines\obj.dm" #include "code\defines\obj\weapon.dm" #include "code\defines\procs\AStar.dm" -#include "code\defines\procs\captain_announce.dm" -#include "code\defines\procs\command_alert.dm" #include "code\defines\procs\dbcore.dm" +#include "code\defines\procs\priority_announce.dm" #include "code\defines\procs\statistics.dm" #include "code\game\asteroid.dm" #include "code\game\atoms.dm"