From f4cfd04485faad04078cf6bb62562f64e0cdf40f Mon Sep 17 00:00:00 2001 From: ikarrus Date: Thu, 14 Aug 2014 00:03:43 -0600 Subject: [PATCH 1/4] Minor Announcements Head of Staff announcements (ie the ones made via request consoles) are now "Minor Announcements". While head announcements are unchanged, other in-game notifications have been expanded to use their format, including when the Captain joins the game, and early shuttly launch notifications. They're basically meant to be big and noticable, but not as annoying and spammy as Priority Announcements. I wanted to include a sound for them, but I've been unable to find one I was satisfied with. --- code/defines/procs/priority_announce.dm | 12 +++++++++++- code/game/jobs/job/captain.dm | 2 +- code/game/machinery/computer/shuttle.dm | 10 +++++----- code/game/machinery/requests_console.dm | 9 +++------ 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/code/defines/procs/priority_announce.dm b/code/defines/procs/priority_announce.dm index 12690ea4a41..7d1083ee43e 100644 --- a/code/defines/procs/priority_announce.dm +++ b/code/defines/procs/priority_announce.dm @@ -26,4 +26,14 @@ for(var/mob/M in player_list) if(!istype(M,/mob/new_player)) M << announcement - M << sound(sound) \ No newline at end of file + M << sound(sound) + +/proc/minor_announce(var/department, var/message, var/submit_to_news) + if(!department || !message) + return + + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << "

[department] Announcement: [message]
" + if(submit_to_news) + news_network.SubmitArticle(message, department, "Station Announcements", null) \ No newline at end of file diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 545c622860e..4016e8fb192 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -43,7 +43,7 @@ Captain L.imp_in = H L.implanted = 1 - world << "Captain [H.real_name] on deck!" + minor_announce("Staffing", "Captain [H.real_name] on deck!") /datum/job/captain/get_access() return get_all_accesses() diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index f997ea86021..65a02bcf7b3 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])") - priority_announce("[src.auth_need - src.authorized.len] more authorization(s) needed until shuttle is launched early", null, null, "Priority") + minor_announce("Evacuation", "[src.auth_need - src.authorized.len] more authorization(s) needed until shuttle is launched early") 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])") - priority_announce("The emergency shuttle will launch in 10 seconds", null, null, "Priority") + minor_announce("Evacuation", "The emergency shuttle will launch in 10 seconds") emergency_shuttle.online = 1 emergency_shuttle.settimeleft(10) //src.authorized = null @@ -49,10 +49,10 @@ if("Repeal") src.authorized -= W:registered_name - priority_announce("[src.auth_need - src.authorized.len] authorizations needed until shuttle is launched early", null, null, "Priority") + minor_announce("Evacuation", "[src.auth_need - src.authorized.len] authorizations needed until shuttle is launched early") if("Abort") - priority_announce("All authorizations to launch the shuttle early have been revoked.", null, null, "Priority") + minor_announce("Evacuation", "All authorizations to launch the shuttle early have been revoked.") 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])") - priority_announce("System Error: The emergency shuttle will launch in 10 seconds", null, null, "Priority") + minor_announce("Evacuation", "System Error: The emergency shuttle will launch in 10 seconds") emergency_shuttle.settimeleft( 10 ) emagged = 1 if("Cancel") diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 807fbe30d1f..1ff2382a913 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -280,10 +280,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(href_list["sendAnnouncement"]) if(!announcementConsole) return - 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) + minor_announce(department, message, 1) announceAuth = 0 message = "" screen = 0 @@ -371,7 +368,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() updateUsrDialog() return - + /obj/machinery/requests_console/proc/createmessage(source, title, message, priority, paper) var/linkedsender var/unlinkedsender @@ -403,7 +400,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(src.newmessagepriority < 3) src.newmessagepriority = 3 src.update_icon() - if(1) + if(1) playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(7, src.loc)) O.show_message("\icon[src] *The Requests Console yells: '[title]'") From c80f22bf524a900ca484011f1bea55a2c182ac53 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Thu, 14 Aug 2014 08:52:54 -0600 Subject: [PATCH 2/4] Added a sound. Changed Captain's arrival announcement type to General --- code/defines/procs/priority_announce.dm | 1 + code/game/jobs/job/captain.dm | 2 +- sound/misc/notice2.ogg | Bin 0 -> 6218 bytes 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sound/misc/notice2.ogg diff --git a/code/defines/procs/priority_announce.dm b/code/defines/procs/priority_announce.dm index 7d1083ee43e..d05ffb77a36 100644 --- a/code/defines/procs/priority_announce.dm +++ b/code/defines/procs/priority_announce.dm @@ -35,5 +35,6 @@ for(var/mob/M in player_list) if(!istype(M,/mob/new_player)) M << "

[department] Announcement: [message]
" + M << sound('sound/misc/notice2.ogg') if(submit_to_news) news_network.SubmitArticle(message, department, "Station Announcements", null) \ No newline at end of file diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 4016e8fb192..9c08a7669f6 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -43,7 +43,7 @@ Captain L.imp_in = H L.implanted = 1 - minor_announce("Staffing", "Captain [H.real_name] on deck!") + minor_announce("General", "Captain [H.real_name] on deck!") /datum/job/captain/get_access() return get_all_accesses() diff --git a/sound/misc/notice2.ogg b/sound/misc/notice2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3489ca3e15b1acc6f8de1ad9b8ae4c8ce272e03e GIT binary patch literal 6218 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 Date: Thu, 14 Aug 2014 20:44:18 -0600 Subject: [PATCH 3/4] Minor Announcement format expanded to include Alert Level changes and Emergency Declarations --- code/defines/procs/priority_announce.dm | 14 ++++++-------- code/game/jobs/job/captain.dm | 2 +- code/game/machinery/computer/shuttle.dm | 10 +++++----- code/game/machinery/requests_console.dm | 3 ++- .../security levels/keycard authentication.dm | 6 ++---- .../modules/security levels/security levels.dm | 18 ++++++------------ 6 files changed, 22 insertions(+), 31 deletions(-) diff --git a/code/defines/procs/priority_announce.dm b/code/defines/procs/priority_announce.dm index d05ffb77a36..f443b7f5338 100644 --- a/code/defines/procs/priority_announce.dm +++ b/code/defines/procs/priority_announce.dm @@ -24,17 +24,15 @@ announcement += "
" for(var/mob/M in player_list) - if(!istype(M,/mob/new_player)) + if(!istype(M,/mob/new_player) && !M.ear_deaf) M << announcement M << sound(sound) -/proc/minor_announce(var/department, var/message, var/submit_to_news) - if(!department || !message) +/proc/minor_announce(var/message, var/title = "Attention:") + if(!message) return for(var/mob/M in player_list) - if(!istype(M,/mob/new_player)) - M << "

[department] Announcement: [message]
" - M << sound('sound/misc/notice2.ogg') - if(submit_to_news) - news_network.SubmitArticle(message, department, "Station Announcements", null) \ No newline at end of file + if(!istype(M,/mob/new_player) && !M.ear_deaf) + M << "[title] [message]" + M << sound('sound/misc/notice2.ogg') \ No newline at end of file diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 9c08a7669f6..f3f2ce107bc 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -43,7 +43,7 @@ Captain L.imp_in = H L.implanted = 1 - minor_announce("General", "Captain [H.real_name] on deck!") + minor_announce("Captain [H.real_name] on deck!") /datum/job/captain/get_access() return get_all_accesses() diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 65a02bcf7b3..653618f5898 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])") - minor_announce("Evacuation", "[src.auth_need - src.authorized.len] more authorization(s) needed until shuttle is launched early") + minor_announce("[src.auth_need - src.authorized.len] more authorization(s) needed until shuttle is launched early") 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])") - minor_announce("Evacuation", "The emergency shuttle will launch in 10 seconds") + minor_announce("The emergency shuttle will launch in 10 seconds") emergency_shuttle.online = 1 emergency_shuttle.settimeleft(10) //src.authorized = null @@ -49,10 +49,10 @@ if("Repeal") src.authorized -= W:registered_name - minor_announce("Evacuation", "[src.auth_need - src.authorized.len] authorizations needed until shuttle is launched early") + minor_announce("[src.auth_need - src.authorized.len] authorizations needed until shuttle is launched early") if("Abort") - minor_announce("Evacuation", "All authorizations to launch the shuttle early have been revoked.") + minor_announce("All authorizations to launch the shuttle early have been revoked.") 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])") - minor_announce("Evacuation", "System Error: The emergency shuttle will launch in 10 seconds") + minor_announce("The emergency shuttle will launch in 10 seconds", "System Error:") emergency_shuttle.settimeleft( 10 ) emagged = 1 if("Cancel") diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 1ff2382a913..9d92c182b7c 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -280,7 +280,8 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(href_list["sendAnnouncement"]) if(!announcementConsole) return - minor_announce(department, message, 1) + minor_announce(message, "[department] Announcement:") + news_network.SubmitArticle(message, department, "Station Announcements", null) announceAuth = 0 message = "" screen = 0 diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 2ed12f11736..2d8578d0e39 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -150,8 +150,7 @@ for(var/obj/machinery/door/airlock/D in A) D.emergency = 1 D.update_icon(0) - world << "Attention! Station-wide emergency declared" - world << "Access restrictions on maintenance and external airlocks have been lifted." + minor_announce("Access restrictions on maintenance and external airlocks have been lifted.", "Attention! Station-wide emergency declared!") emergency_access = 1 /proc/revoke_maint_all_access() @@ -159,6 +158,5 @@ for(var/obj/machinery/door/airlock/D in A) D.emergency = 0 D.update_icon(0) - world << "Attention! Emergency maintenance access disabled" - world << "Access restrictions in maintenance areas have been restored." + minor_announce("Access restrictions in maintenance areas have been restored.", "Attention! Station-wide emergency rescinded:") emergency_access = 0 \ No newline at end of file diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index 52651452ca4..e33370e7fb6 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -21,8 +21,7 @@ if(level >= SEC_LEVEL_GREEN && level <= SEC_LEVEL_DELTA && level != security_level) switch(level) if(SEC_LEVEL_GREEN) - world << "Attention! Security level lowered to green" - world << "[config.alert_desc_green]" + minor_announce(config.alert_desc_green, "Attention! Security level lowered to green:") security_level = SEC_LEVEL_GREEN for(var/obj/machinery/firealarm/FA in world) if(FA.z == 1) @@ -30,11 +29,9 @@ FA.overlays += image('icons/obj/monitors.dmi', "overlay_green") if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) - world << "Attention! Security level elevated to blue" - world << "[config.alert_desc_blue_upto]" + minor_announce(config.alert_desc_blue_upto, "Attention! Security level elevated to blue:") else - world << "Attention! Security level lowered to blue" - world << "[config.alert_desc_blue_downto]" + minor_announce(config.alert_desc_blue_downto, "Attention! Security level lowered to blue:") security_level = SEC_LEVEL_BLUE for(var/obj/machinery/firealarm/FA in world) if(FA.z == 1) @@ -42,11 +39,9 @@ FA.overlays += image('icons/obj/monitors.dmi', "overlay_blue") if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) - world << "Attention! Code red!" - world << "[config.alert_desc_red_upto]" + minor_announce(config.alert_desc_red_upto, "Attention! Code red!") else - world << "Attention! Code red!" - world << "[config.alert_desc_red_downto]" + minor_announce(config.alert_desc_red_downto, "Attention! Code red!") security_level = SEC_LEVEL_RED /* - At the time of commit, setting status displays didn't work properly @@ -59,8 +54,7 @@ FA.overlays = list() FA.overlays += image('icons/obj/monitors.dmi', "overlay_red") if(SEC_LEVEL_DELTA) - world << "Attention! Delta security level reached!" - world << "[config.alert_desc_delta]" + minor_announce(config.alert_desc_delta, "Attention! Delta security level reached!") security_level = SEC_LEVEL_DELTA for(var/obj/machinery/firealarm/FA in world) if(FA.z == 1) From ba45abdf252c982d7ac0654c812903fc8ff574b1 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Sat, 23 Aug 2014 20:22:47 -0600 Subject: [PATCH 4/4] Admins changing shuttle time will use minor_announce instead of priority_announce --- code/modules/admin/topic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index e0375d13081..3552aae5b60 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -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()]") - priority_announce("The emergency shuttle will reach its destination in [round(emergency_shuttle.timeleft()/60)] minutes.", null, null, "Priority") + minor_announce("The emergency shuttle will reach its destination in [round(emergency_shuttle.timeleft()/60)] minutes.") message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]", 1) href_list["secretsadmin"] = "check_antagonist"