Skip to content

Commit 78b96dc

Browse files
authored
admin -> gamemaster simple stuff (#1199)
1 parent 984943f commit 78b96dc

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

code/modules/admin/verbs/adminhelp.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
407407
//send this msg to all admins
408408
for(var/client/X in GLOB.admins)
409409
if(X.prefs.toggles & SOUND_ADMINHELP)
410-
SEND_SOUND(X, sound('sound/effects/adminhelp.ogg'))
410+
SEND_SOUND(X, sound('goon/sounds/adminhelp.ogg'))
411411
window_flash(X, ignorepref = TRUE)
412412
to_chat(X,
413413
type = MESSAGE_TYPE_ADMINPM,
@@ -533,7 +533,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
533533
if(initiator)
534534
initiator.giveadminhelpverb()
535535

536-
SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg'))
536+
SEND_SOUND(initiator, sound('goon/sounds/adminhelp.ogg'))
537537

538538
to_chat(initiator, "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>", confidential = TRUE)
539539
to_chat(initiator, "<font color='red'><b>Your admin help was rejected.</b> The adminhelp verb has been returned to you so that you may try again.</font>", confidential = TRUE)

code/modules/admin/verbs/adminpm.dm

+4-4
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@
271271

272272
//play the receiving admin the adminhelp sound (if they have them enabled)
273273
if(recipient.prefs.toggles & SOUND_ADMINHELP)
274-
SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
274+
SEND_SOUND(recipient, sound('goon/sounds/adminhelp.ogg'))
275275
else
276276
if(holder) //sender is an admin but recipient is not. Do BIG RED TEXT
277277
var/already_logged = FALSE
@@ -292,7 +292,7 @@
292292
var/recipient_message = "\
293293
<div class='adminpmbox'>\
294294
<div class='' style='color: black; background: #f88; padding: 0.2em 0.5em;'>\
295-
Administrator PM from [admin_pm_href(src, key_name(src, FALSE, FALSE), "color:#00379e")]\
295+
Gamemaster PM from [admin_pm_href(src, key_name(src, FALSE, FALSE), "color:#00379e")]\
296296
</div>\
297297
<div style='padding: 0.2em 0.5em;text-align: left'>\
298298
[span_adminsay(msg)]\
@@ -319,7 +319,7 @@
319319
SSblackbox.LogAhelp(recipient.current_ticket.id, "Reply", msg, recipient.ckey, src.ckey)
320320

321321
//always play non-admin recipients the adminhelp sound
322-
SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
322+
SEND_SOUND(recipient, sound('goon/sounds/adminhelp.ogg'))
323323

324324
else //neither are admins
325325
if(!current_ticket)
@@ -454,7 +454,7 @@
454454

455455
window_flash(C, ignorepref = TRUE)
456456
//always play non-admin recipients the adminhelp sound
457-
SEND_SOUND(C, 'sound/effects/adminhelp.ogg')
457+
SEND_SOUND(C, 'goon/sounds/adminhelp.ogg')
458458

459459
C.externalreplyamount = EXTERNALREPLYCOUNT
460460

code/modules/interview/interview.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
log_admin_private("[key_name(approved_by)] has approved interview #[id] for [owner_ckey][!owner ? "(DC)": ""].")
6363
message_admins(span_adminnotice("[key_name(approved_by)] has approved [link_self()] for [owner_ckey][!owner ? "(DC)": ""]."))
6464
if (owner)
65-
SEND_SOUND(owner, sound('sound/effects/adminhelp.ogg'))
65+
SEND_SOUND(owner, sound('goon/sounds/adminhelp.ogg'))
6666
to_chat(owner, "<font color='red' size='4'><b>-- Interview Update --</b></font>" \
6767
+ "\n[span_adminsay("Your interview was approved, you will now be reconnected in 5 seconds.")]", confidential = TRUE)
6868
addtimer(CALLBACK(src, PROC_REF(reconnect_owner)), 50)
@@ -82,7 +82,7 @@
8282
message_admins(span_adminnotice("[key_name(denied_by)] has denied [link_self()] for [owner_ckey][!owner ? "(DC)": ""]."))
8383
addtimer(CALLBACK(GLOB.interviews, TYPE_PROC_REF(/datum/interview_manager, release_from_cooldown), owner_ckey), 180)
8484
if (owner)
85-
SEND_SOUND(owner, sound('sound/effects/adminhelp.ogg'))
85+
SEND_SOUND(owner, sound('goon/sounds/adminhelp.ogg'))
8686
to_chat(owner, "<font color='red' size='4'><b>-- Interview Update --</b></font>" \
8787
+ "\n<span class='adminsay'>Unfortunately your interview was denied. Please try submitting another questionnaire." \
8888
+ " You may do this in three minutes.</span>", confidential = TRUE)

code/modules/interview/interview_manager.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ GLOBAL_DATUM_INIT(interviews, /datum/interview_manager, new)
107107
to_chat(to_queue.owner, span_notice("No active admins are online, your interview's submission was sent through TGS to admins who are available. This may use IRC or Discord."))
108108
for(var/client/X in GLOB.admins)
109109
if(X.prefs.toggles & SOUND_ADMINHELP)
110-
SEND_SOUND(X, sound('sound/effects/adminhelp.ogg'))
110+
SEND_SOUND(X, sound('goon/sounds/adminhelp.ogg'))
111111
window_flash(X, ignorepref = TRUE)
112112
to_chat(X, span_adminhelp("[to_queue.link_self()] for [ckey] enqueued for review. Current position in queue: [to_queue.pos_in_queue]"), confidential = TRUE)
113113

goon/sounds/adminhelp.ogg

16.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)