cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor Announcements

Browse Source 
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.
This commit is contained in:
ikarrus
2014-08-14 00:03:43 -06:00
parent 8e19262d16
commit f4cfd04485
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/procs/priority_announce.dm
+11 -1
View File
@@ -26,4 +26,14 @@
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player))
M << announcement
M << sound(sound)
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 << "<br><br><b><font size = 3><font color = red>[department] Announcement:</font color> [message]</font size></b><br>"
if(submit_to_news)
news_network.SubmitArticle(message, department, "Station Announcements", null)
code/game/jobs/job/captain.dm
+1 -1
View File
@@ -43,7 +43,7 @@ Captain
L.imp_in = H
L.implanted = 1
world << "<b>Captain [H.real_name] on deck!</b>"
minor_announce("Staffing", "Captain [H.real_name] on deck!")
/datum/job/captain/get_access()
return get_all_accesses()
code/game/machinery/computer/shuttle.dm
+5 -5
View File
@@ -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("Evacuation", "[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("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)](<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("Evacuation", "System Error: The emergency shuttle will launch in 10 seconds")
emergency_shuttle.settimeleft( 10 )
emagged = 1
if("Cancel")
code/game/machinery/requests_console.dm
+3 -6
View File
@@ -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 << "<b><font size = 3><font color = red>[department] announcement:</font color> [message]</font size></b>"
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]'")