Merge pull request #4418 from Ikarrus/minorannouncements

Minor Announcements

code/defines/procs/priority_announce.dm

@@ -24,7 +24,7 @@
 	announcement += "<br>"
 
 	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)
 
@@ -35,4 +35,13 @@
 			P.name = "paper- '[title]'"
 			P.info = text
 			C.messagetitle.Add("[title]")
-			C.messagetext.Add(text)
+			C.messagetext.Add(text)
+
+/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.ear_deaf)
+			M << "<b><font size = 3><font color = red>[title]</font color> [message]</font size></b>"
+			M << sound('sound/misc/notice2.ogg')

code/game/jobs/job/captain.dm

@@ -43,7 +43,7 @@ Captain
 	L.imp_in = H
 	L.implanted = 1
 
-	world << "<b>Captain [H.real_name] on deck!</b>"
+	minor_announce("Captain [H.real_name] on deck!")
 
 /datum/job/captain/get_access()
 	return get_all_accesses()

code/game/machinery/computer/shuttle.dm

@@ -36,11 +36,11 @@
 				if (src.auth_need - src.authorized.len > 0)
 					message_admins("[key_name(user.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) has authorized early shuttle launch in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",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("[src.auth_need - src.authorized.len] more authorization(s) needed until shuttle is launched early")
 				else
 					message_admins("[key_name(user.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) has launched the emergency shuttle in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",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("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("[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("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)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) has emagged the emergency shuttle in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",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("The emergency shuttle will launch in 10 seconds", "System Error:")
 					emergency_shuttle.settimeleft( 10 )
 					emagged = 1
 				if("Cancel")

code/game/machinery/requests_console.dm

@@ -280,9 +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 << "<b><font size = 3><font color = red>[department] announcement:</font color> [message]</font size></b>"
+		minor_announce(message, "[department] Announcement:")
 		news_network.SubmitArticle(message, department, "Station Announcements", null)
 		announceAuth = 0
 		message = ""
@@ -371,7 +369,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 +401,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]'")

code/modules/admin/topic.dm

@@ -181,7 +181,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"
 

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 << "<font size=4 color='red'>Attention! Station-wide emergency declared</font>"
-	world << "<font color='red'>Access restrictions on maintenance and external airlocks have been lifted.</font>"
+	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 << "<font size=4 color='red'>Attention! Emergency maintenance access disabled</font>"
-	world << "<font color='red'>Access restrictions in maintenance areas have been restored.</font>"
+	minor_announce("Access restrictions in maintenance areas have been restored.", "Attention! Station-wide emergency rescinded:")
 	emergency_access = 0

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 << "<font size=4 color='red'>Attention! Security level lowered to green</font>"
-				world << "<font color='red'>[config.alert_desc_green]</font>"
+				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 << "<font size=4 color='red'>Attention! Security level elevated to blue</font>"
-					world << "<font color='red'>[config.alert_desc_blue_upto]</font>"
+					minor_announce(config.alert_desc_blue_upto, "Attention! Security level elevated to blue:")
 				else
-					world << "<font size=4 color='red'>Attention! Security level lowered to blue</font>"
-					world << "<font color='red'>[config.alert_desc_blue_downto]</font>"
+					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 << "<font size=4 color='red'>Attention! Code red!</font>"
-					world << "<font color='red'>[config.alert_desc_red_upto]</font>"
+					minor_announce(config.alert_desc_red_upto, "Attention! Code red!")
 				else
-					world << "<font size=4 color='red'>Attention! Code red!</font>"
-					world << "<font color='red'>[config.alert_desc_red_downto]</font>"
+					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 << "<font size=4 color='red'>Attention! Delta security level reached!</font>"
-				world << "<font color='red'>[config.alert_desc_delta]</font>"
+				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)