From bf3468f61ce038acac49082e68959ebb802888bc Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Thu, 4 Jan 2018 21:37:32 +0100 Subject: [PATCH 1/2] Adds more observation messages in deadchat (#34075) * Adds more observation messages * so bold kobold * caching --- code/controllers/subsystem/shuttle.dm | 2 ++ .../game/machinery/computer/communications.dm | 25 +++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 65385c031f..1b05061904 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -249,6 +249,7 @@ SUBSYSTEM_DEF(shuttle) emergency.request(null, signal_origin, html_decode(emergency_reason), 0) log_game("[key_name(user)] has called the shuttle.") + deadchat_broadcast("[user.name] has called the shuttle.", user) if(call_reason) SSblackbox.record_feedback("text", "shuttle_reason", 1, "[call_reason]") log_game("Shuttle call reason: [call_reason]") @@ -286,6 +287,7 @@ SUBSYSTEM_DEF(shuttle) emergency.cancel(get_area(user)) log_game("[key_name(user)] has recalled the shuttle.") message_admins("[key_name_admin(user)] has recalled the shuttle.") + deadchat_broadcast("[user.name] has recalled the shuttle.", user) return 1 /datum/controller/subsystem/shuttle/proc/canRecall() diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 2cb4528de4..27f24b7902 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -112,9 +112,11 @@ if(GLOB.security_level != old_level) to_chat(usr, "Authorization confirmed. Modifying security level.") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - //Only notify the admins if an actual change happened - log_game("[key_name(usr)] has changed the security level to [get_security_level()].") - message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") + //Only notify people if an actual change happened + var/security_level = get_security_level() + log_game("[key_name(usr)] has changed the security level to [security_level].") + message_admins("[key_name_admin(usr)] has changed the security level to [security_level].") + deadchat_broadcast("[usr.name] has changed the security level to [security_level].", usr) tmp_alertlevel = 0 else to_chat(usr, "You are not authorized to do this!") @@ -129,6 +131,7 @@ if(authenticated==2) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) make_announcement(usr) + deadchat_broadcast("[usr.name] made an priority announcement.", usr) if("crossserver") if(authenticated==2) @@ -144,6 +147,7 @@ minor_announce(input, title = "Outgoing message to allied station") log_talk(usr,"[key_name(usr)] has sent a message to the other server: [input]",LOGSAY) message_admins("[key_name_admin(usr)] has sent a message to the other server.") + deadchat_broadcast("[usr.name] has sent an outgoing message to the other station(s).", usr) CM.lastTimeUsed = world.time if("purchase_menu") @@ -246,11 +250,13 @@ make_maint_all_access() log_game("[key_name(usr)] enabled emergency maintenance access.") message_admins("[key_name_admin(usr)] enabled emergency maintenance access.") + deadchat_broadcast("[usr.name] enabled emergency maintenance access.", usr) state = STATE_DEFAULT if("disableemergency") revoke_maint_all_access() log_game("[key_name(usr)] disabled emergency maintenance access.") message_admins("[key_name_admin(usr)] disabled emergency maintenance access.") + deadchat_broadcast("[usr.name] disabled emergency maintenance access.", usr) state = STATE_DEFAULT // Status display stuff @@ -284,9 +290,9 @@ CentCom_announce(input, usr) to_chat(usr, "Message transmitted to Central Command.") log_talk(usr,"[key_name(usr)] has made a CentCom announcement: [input]",LOGSAY) + deadchat_broadcast("[usr.name] has messaged CentComm: [input]", usr) CM.lastTimeUsed = world.time - // OMG SYNDICATE ...LETTERHEAD if("MessageSyndicate") if((authenticated==2) && (emagged)) @@ -301,6 +307,7 @@ Syndicate_announce(input, usr) to_chat(usr, "SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.") log_talk(usr,"[key_name(usr)] has made a Syndicate announcement: [input]",LOGSAY) + deadchat_broadcast("[usr.name] has messaged the Syndicate: [input]", usr) CM.lastTimeUsed = world.time if("RestoreBackup") @@ -379,9 +386,11 @@ tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this set_security_level(tmp_alertlevel) if(GLOB.security_level != old_level) - //Only notify the admins if an actual change happened - log_game("[key_name(usr)] has changed the security level to [get_security_level()].") - message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") + //Only notify people if an actual change happened + var/security_level = get_security_level() + log_game("[key_name(usr)] has changed the security level to [security_level].") + message_admins("[key_name_admin(usr)] has changed the security level to [security_level].") + deadchat_broadcast("[usr.name] has changed the security level to [security_level].", usr) tmp_alertlevel = 0 aistate = STATE_DEFAULT if("ai-changeseclevel") @@ -392,11 +401,13 @@ make_maint_all_access() log_game("[key_name(usr)] enabled emergency maintenance access.") message_admins("[key_name_admin(usr)] enabled emergency maintenance access.") + deadchat_broadcast("[usr.name] enabled emergency maintenance access.", usr) aistate = STATE_DEFAULT if("ai-disableemergency") revoke_maint_all_access() log_game("[key_name(usr)] disabled emergency maintenance access.") message_admins("[key_name_admin(usr)] disabled emergency maintenance access.") + deadchat_broadcast("[usr.name] disabled emergency maintenance access.", usr) aistate = STATE_DEFAULT updateUsrDialog()