Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 978c2bd

Browse filesBrowse files
coiaxAnturK
coiax
authored and
AnturK
committed
Various deadchat messages are more informative and consistent (#34326)
More deadchat messages now follow the following format. > George Mellons has done a thing at AreaName. - Shuttle calling - Shuttle recalling - Security level changing - Maintenance accessing - Swiping for red,emergency maint, bsa - Messenging centcom, syndicate Fixes #34230. Fixes #34231.
1 parent cfad4a7 commit 978c2bd
Copy full SHA for 978c2bd

3 files changed

+36-15Lines changed: 36 additions & 15 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎code/controllers/subsystem/shuttle.dm‎

Copy file name to clipboardExpand all lines: code/controllers/subsystem/shuttle.dm
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,10 @@ SUBSYSTEM_DEF(shuttle)
246246
else
247247
emergency.request(null, signal_origin, html_decode(emergency_reason), 0)
248248

249+
var/area/A = get_area(user)
250+
249251
log_game("[key_name(user)] has called the shuttle.")
250-
deadchat_broadcast("<span class='deadsay bold'>[user.name] has called the shuttle.</span>", user)
252+
deadchat_broadcast("<span class='deadsay'><span class='name'>[user.name]</span> has called the shuttle at <span class='name'>[A.name]</span>.</span>", user)
251253
if(call_reason)
252254
SSblackbox.record_feedback("text", "shuttle_reason", 1, "[call_reason]")
253255
log_game("Shuttle call reason: [call_reason]")
@@ -285,7 +287,8 @@ SUBSYSTEM_DEF(shuttle)
285287
emergency.cancel(get_area(user))
286288
log_game("[key_name(user)] has recalled the shuttle.")
287289
message_admins("[key_name_admin(user)] has recalled the shuttle.")
288-
deadchat_broadcast("<span class='deadsay bold'>[user.name] has recalled the shuttle.</span>", user)
290+
var/area/A = get_area(user)
291+
deadchat_broadcast("<span class='deadsay'><span class='name'>[user.name]</span> has recalled the shuttle at <span class='name'>[A.name]</span>.</span>", user)
289292
return 1
290293

291294
/datum/controller/subsystem/shuttle/proc/canRecall()
Collapse file

‎code/game/machinery/computer/communications.dm‎

Copy file name to clipboardExpand all lines: code/game/machinery/computer/communications.dm
+11-7Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@
5757
return
5858
usr.set_machine(src)
5959

60+
var/area/A = get_area(usr)
61+
var/area_name = A.name
62+
6063
if(!href_list["operation"])
6164
return
6265
var/obj/item/circuitboard/computer/communications/CM = circuit
@@ -115,7 +118,7 @@
115118
var/security_level = get_security_level()
116119
log_game("[key_name(usr)] has changed the security level to [security_level].")
117120
message_admins("[key_name_admin(usr)] has changed the security level to [security_level].")
118-
deadchat_broadcast("<span class='deadsay bold'>[usr.name] has changed the security level to [security_level].</span>", usr)
121+
deadchat_broadcast("<span class='deadsay'><span class='name'>[usr.name]</span> has changed the security level to [security_level] at <span class='name'>[area_name]</span>.</span>", usr)
119122
tmp_alertlevel = 0
120123
else
121124
to_chat(usr, "<span class='warning'>You are not authorized to do this!</span>")
@@ -249,13 +252,13 @@
249252
make_maint_all_access()
250253
log_game("[key_name(usr)] enabled emergency maintenance access.")
251254
message_admins("[key_name_admin(usr)] enabled emergency maintenance access.")
252-
deadchat_broadcast("<span class='deadsay bold'>[usr.name] enabled emergency maintenance access.</span>", usr)
255+
deadchat_broadcast("<span class='deadsay'><span class='name'>[usr.name]</span> enabled emergency maintenance access at <span class='name'>[area_name]</span>.</span>", usr)
253256
state = STATE_DEFAULT
254257
if("disableemergency")
255258
revoke_maint_all_access()
256259
log_game("[key_name(usr)] disabled emergency maintenance access.")
257260
message_admins("[key_name_admin(usr)] disabled emergency maintenance access.")
258-
deadchat_broadcast("<span class='deadsay bold'>[usr.name] disabled emergency maintenance access.</span>", usr)
261+
deadchat_broadcast("<span class='deadsay'><span class='name'>[usr.name]</span> disabled emergency maintenance access at <span class='name'>[area_name]</span>.</span>", usr)
259262
state = STATE_DEFAULT
260263

261264
// Status display stuff
@@ -289,7 +292,7 @@
289292
CentCom_announce(input, usr)
290293
to_chat(usr, "<span class='notice'>Message transmitted to Central Command.</span>")
291294
log_talk(usr,"[key_name(usr)] has made a CentCom announcement: [input]",LOGSAY)
292-
deadchat_broadcast("<span class='deadsay'><b>[usr.name] has messaged CentCom:</b> [input]</span>", usr)
295+
deadchat_broadcast("<span class='deadsay'><span class='name'>[usr.name]</span> has messaged CentCom, \"[input]\" at <span class='name'>[area_name]</span>.</span>", usr)
293296
CM.lastTimeUsed = world.time
294297

295298
// OMG SYNDICATE ...LETTERHEAD
@@ -306,7 +309,7 @@
306309
Syndicate_announce(input, usr)
307310
to_chat(usr, "<span class='danger'>SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.</span>")
308311
log_talk(usr,"[key_name(usr)] has made a Syndicate announcement: [input]",LOGSAY)
309-
deadchat_broadcast("<span class='deadsay'><b>[usr.name] has messaged the Syndicate:</b> [input]</span>", usr)
312+
deadchat_broadcast("<span class='deadsay'><span class='name'>[usr.name]</span> has messaged the Syndicate, \"[input]\" at <span class='name'>[area_name]</span>.</span>", usr)
310313
CM.lastTimeUsed = world.time
311314

312315
if("RestoreBackup")
@@ -389,7 +392,7 @@
389392
var/security_level = get_security_level()
390393
log_game("[key_name(usr)] has changed the security level to [security_level].")
391394
message_admins("[key_name_admin(usr)] has changed the security level to [security_level].")
392-
deadchat_broadcast("<span class='deadsay bold'>[usr.name] has changed the security level to [security_level].</span>", usr)
395+
deadchat_broadcast("<span class='deadsay'><span class='name'>[usr.name]</span> has changed the security level to [security_level].</span>", usr)
393396
tmp_alertlevel = 0
394397
aistate = STATE_DEFAULT
395398
if("ai-changeseclevel")
@@ -701,7 +704,8 @@
701704
if(!input || !user.canUseTopic(src))
702705
return
703706
SScommunications.make_announcement(user, is_silicon, input)
704-
deadchat_broadcast("<span class='deadsay bold'>[user.name] made an priority announcement.</span>", user)
707+
var/area/A = get_area(user)
708+
deadchat_broadcast("<span class='deadsay'><span class='name'>[user.name]</span> made an priority announcement at <span class='name'>[A.name]</span>.</span>", user)
705709

706710
/obj/machinery/computer/communications/proc/post_status(command, data1, data2)
707711

Collapse file

‎code/modules/security_levels/keycard_authentication.dm‎

Copy file name to clipboardExpand all lines: code/modules/security_levels/keycard_authentication.dm
+20-6Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
22

3+
#define KEYCARD_RED_ALERT "Red Alert"
4+
#define KEYCARD_EMERGENCY_MAINTENANCE_ACCESS "Emergency Maintenance Access"
5+
#define KEYCARD_BSA_UNLOCK "Bluespace Artillery Unlock"
6+
37
/obj/machinery/keycard_auth
48
name = "Keycard Authentication Device"
59
desc = "This device is used to trigger station functions, which require more than one ID card to authenticate."
@@ -57,11 +61,11 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
5761
switch(action)
5862
if("red_alert")
5963
if(!event_source)
60-
sendEvent("Red Alert")
64+
sendEvent(KEYCARD_RED_ALERT)
6165
. = TRUE
6266
if("emergency_maint")
6367
if(!event_source)
64-
sendEvent("Emergency Maintenance Access")
68+
sendEvent(KEYCARD_EMERGENCY_MAINTENANCE_ACCESS)
6569
. = TRUE
6670
if("auth_swipe")
6771
if(event_source)
@@ -70,7 +74,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
7074
. = TRUE
7175
if("bsa_unlock")
7276
if(!event_source)
73-
sendEvent("Bluespace Artillery Unlock")
77+
sendEvent(KEYCARD_BSA_UNLOCK)
7478
. = TRUE
7579

7680
/obj/machinery/keycard_auth/proc/sendEvent(event_type)
@@ -97,12 +101,18 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
97101
/obj/machinery/keycard_auth/proc/trigger_event(confirmer)
98102
log_game("[key_name(triggerer)] triggered and [key_name(confirmer)] confirmed event [event]")
99103
message_admins("[key_name(triggerer)] triggered and [key_name(confirmer)] confirmed event [event]")
104+
105+
var/area/A1 = get_area(triggerer)
106+
deadchat_broadcast("<span class='deadsay'><span class='name'>[triggerer]</span> triggered [event] at <span class='name'>[A1.name]</span>.</span>", triggerer)
107+
108+
var/area/A2 = get_area(confirmer)
109+
deadchat_broadcast("<span class='deadsay'><span class='name'>[confirmer]</span> confirmed [event] at <span class='name'>[A2.name]</span>.</span>", confirmer)
100110
switch(event)
101-
if("Red Alert")
111+
if(KEYCARD_RED_ALERT)
102112
set_security_level(SEC_LEVEL_RED)
103-
if("Emergency Maintenance Access")
113+
if(KEYCARD_EMERGENCY_MAINTENANCE_ACCESS)
104114
make_maint_all_access()
105-
if("Bluespace Artillery Unlock")
115+
if(KEYCARD_BSA_UNLOCK)
106116
toggle_bluespace_artillery()
107117

108118
GLOBAL_VAR_INIT(emergency_access, FALSE)
@@ -128,3 +138,7 @@ GLOBAL_VAR_INIT(emergency_access, FALSE)
128138
GLOB.bsa_unlock = !GLOB.bsa_unlock
129139
minor_announce("Bluespace Artillery firing protocols have been [GLOB.bsa_unlock? "unlocked" : "locked"]", "Weapons Systems Update:")
130140
SSblackbox.record_feedback("nested tally", "keycard_auths", 1, list("bluespace artillery", GLOB.bsa_unlock? "unlocked" : "locked"))
141+
142+
#undef KEYCARD_RED_ALERT
143+
#undef KEYCARD_EMERGENCY_MAINTENANCE_ACCESS
144+
#undef KEYCARD_BSA_UNLOCK

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.