cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 13:09:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16425 from Kashargul/fixadminpms

Browse Source 
fix admin and mentor PMs
This commit is contained in:
Heroman3003
2024-10-05 07:16:03 +10:00
committed by GitHub
parent d138982afe d3f196489a
commit 2ec6fe97cd
19 changed files with 98 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/adminhelp.dm
+4 -4
View File
@@ -177,13 +177,13 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
MessageNoRecipient(parsed_message)
send2adminchat() //VOREStation Add
//show it to the person adminhelping too
to_chat(C, span_pm(span_adminnotice("PM to-<b>Admins</b>: [name]")))
to_chat(C, span_admin_pm_notice("PM to-<b>Admins</b>: [name]"))
//send it to irc if nobody is on and tell us how many were on
var/admin_number_present = send2irc_adminless_only(initiator_ckey, name)
log_admin("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.")
if(admin_number_present <= 0)
to_chat(C, span_pm(span_notice("No active admins are online, your adminhelp was sent to the admin discord."))) //VOREStation Edit
to_chat(C, span_admin_pm_notice("No active admins are online, your adminhelp was sent to the admin discord.")) //VOREStation Edit
// Also send it to discord since that's the hip cool thing now.
SSwebhooks.send(
@@ -243,7 +243,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
//won't bug irc
/datum/admin_help/proc/MessageNoRecipient(msg)
var/ref_src = "\ref[src]"
var/chat_msg = span_pm(span_adminnotice("<span class='adminhelp'>Ticket [TicketHref("#[id]", ref_src)]</span><b>: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]:</b> [msg]"))
var/chat_msg = span_admin_pm_notice(span_adminhelp("Ticket [TicketHref("#[id]", ref_src)]") + span_bold(": [LinkedReplyName(ref_src)] [FullMonty(ref_src)]:") + msg)
AddInteraction("<font color='red'>[LinkedReplyName(ref_src)]: [msg]</font>")
//send this msg to all admins
@@ -618,7 +618,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(input == "Yes")
if(current_ticket)
current_ticket.MessageNoRecipient(msg)
to_chat(usr, span_pm(span_adminnotice("PM to-<b>Admins</b>: [msg]")))
to_chat(usr, span_admin_pm_notice("PM to-<b>Admins</b>: [msg]"))
return
else
to_chat(usr, span_warning("Ticket not found, creating new one..."))
code/modules/admin/verbs/adminpm.dm
+30 -30
View File
@@ -6,7 +6,7 @@
set category = null
set name = "Admin PM Mob"
if(!check_rights(R_ADMIN))
to_chat(src, span_pm(span_warning("Error: Admin-PM-Context: Only administrators may use this command.")))
to_chat(src, span_admin_pm_warning("Error: Admin-PM-Context: Only administrators may use this command."))
return
if( !ismob(M) || !M.client )
return
@@ -18,7 +18,7 @@
set category = "Admin"
set name = "Admin PM"
if(!check_rights(R_ADMIN))
to_chat(src, span_pm(span_warning("Error: Admin-PM-Panel: Only administrators may use this command.")))
to_chat(src, span_admin_pm_warning("Error: Admin-PM-Panel: Only administrators may use this command."))
return
var/list/client/targets[0]
for(var/client/T)
@@ -39,7 +39,7 @@
/client/proc/cmd_ahelp_reply(whom)
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src, span_pm(span_warning("Error: Admin-PM: You are unable to use admin PM-s (muted).")))
to_chat(src, span_admin_pm_warning("Error: Admin-PM: You are unable to use admin PM-s (muted)."))
return
var/client/C
if(istext(whom))
@@ -50,7 +50,7 @@
C = whom
if(!C)
if(holder)
to_chat(src, span_pm(span_warning("Error: Admin-PM: Client not found.")))
to_chat(src, span_admin_pm_warning("Error: Admin-PM: Client not found."))
return
var/datum/admin_help/AH = C.current_ticket
@@ -67,12 +67,12 @@
//Fetching a message if needed. src is the sender and C is the target client
/client/proc/cmd_admin_pm(whom, msg, datum/admin_help/AH)
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src, span_pm(span_warning("Error: Admin-PM: You are unable to use admin PM-s (muted).")))
to_chat(src, span_admin_pm_warning("Error: Admin-PM: You are unable to use admin PM-s (muted)."))
return
if(!holder && !current_ticket) //no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo
to_chat(src, span_pm(span_warning("You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.")))
to_chat(src, span_pm(span_notice("Message: [msg]")))
to_chat(src, span_admin_pm_warning("You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be."))
to_chat(src, span_admin_pm_notice("Message: [msg]"))
return
var/client/recipient
@@ -97,14 +97,14 @@
if(!msg)
return
if(holder)
to_chat(src, span_pm(span_warning("Error: Use the admin IRC channel, nerd.")))
to_chat(src, span_admin_pm_warning("Error: Use the admin IRC channel, nerd."))
return
else
if(!recipient)
if(holder)
to_chat(src, span_pm(span_warning("Error: Admin-PM: Client not found.")))
to_chat(src, span_admin_pm_warning("Error: Admin-PM: Client not found."))
to_chat(src, msg)
else
current_ticket.MessageNoRecipient(msg)
@@ -118,12 +118,12 @@
return
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src, span_pm(span_warning("Error: Admin-PM: You are unable to use admin PM-s (muted).")))
to_chat(src, span_admin_pm_warning("Error: Admin-PM: You are unable to use admin PM-s (muted)."))
return
if(!recipient)
if(holder)
to_chat(src, span_pm(span_warning("Error: Admin-PM: Client not found.")))
to_chat(src, span_admin_pm_warning("Error: Admin-PM: Client not found."))
else
current_ticket.MessageNoRecipient(msg)
return
@@ -142,27 +142,27 @@
var/keywordparsedmsg = keywords_lookup(msg)
if(irc)
to_chat(src, span_pm(span_notice("PM to-<b>Admins</b>: [rawmsg]")))
admin_ticket_log(src, span_pm(span_warning("Reply PM from-<b>[key_name(src, TRUE, TRUE)]</b> to <i>IRC</i>: [keywordparsedmsg]")))
to_chat(src, span_admin_pm_notice("PM to-<b>Admins</b>: [rawmsg]"))
admin_ticket_log(src, span_admin_pm_warning("Reply PM from-<b>[key_name(src, TRUE, TRUE)]</b> to <i>IRC</i>: [keywordparsedmsg]"))
ircreplyamount--
send2irc("Reply: [ckey]",rawmsg)
else
if(recipient.holder)
if(holder) //both are admins
to_chat(recipient, span_pm(span_warning("Admin PM from-<b>[key_name(src, recipient, 1)]</b>: [keywordparsedmsg]")))
to_chat(src, span_pm(span_notice("Admin PM to-<b>[key_name(recipient, src, 1)]</b>: [keywordparsedmsg]")))
to_chat(recipient, span_admin_pm_warning("Admin PM from-<b>[key_name(src, recipient, 1)]</b>: [keywordparsedmsg]"))
to_chat(src, span_admin_pm_notice("Admin PM to-<b>[key_name(recipient, src, 1)]</b>: [keywordparsedmsg]"))
//omg this is dumb, just fill in both their tickets
var/interaction_message = span_pm(span_notice("PM from-<b>[key_name(src, recipient, 1)]</b> to-<b>[key_name(recipient, src, 1)]</b>: [keywordparsedmsg]"))
var/interaction_message = span_admin_pm_notice("PM from-<b>[key_name(src, recipient, 1)]</b> to-<b>[key_name(recipient, src, 1)]</b>: [keywordparsedmsg]")
admin_ticket_log(src, interaction_message)
if(recipient != src) //reeee
admin_ticket_log(recipient, interaction_message)
else //recipient is an admin but sender is not
var/replymsg = span_pm(span_warning("Reply PM from-<b>[key_name(src, recipient, 1)]</b>: [keywordparsedmsg]"))
var/replymsg = span_admin_pm_warning("Reply PM from-<b>[key_name(src, recipient, 1)]</b>: [keywordparsedmsg]")
admin_ticket_log(src, replymsg)
to_chat(recipient, replymsg)
to_chat(src, span_pm(span_notice("PM to-<b>Admins</b>: [msg]")))
to_chat(src, span_admin_pm_notice("PM to-<b>Admins</b>: [msg]"))
//play the recieving admin the adminhelp sound (if they have them enabled)
if(recipient.prefs?.read_preference(/datum/preference/toggle/holder/play_adminhelp_ping))
@@ -173,12 +173,12 @@
if(!recipient.current_ticket)
new /datum/admin_help(msg, recipient, TRUE)
to_chat(recipient, span_pm(span_warning(span_huge("<b>-- Administrator private message --</b>"))))
to_chat(recipient, span_pm(span_warning("Admin PM from-<b>[key_name(src, recipient, 0)]</b>: [msg]")))
to_chat(recipient, span_pm(span_warning("<i>Click on the administrator's name to reply.</i>")))
to_chat(src, span_pm(span_notice("Admin PM to-<b>[key_name(recipient, src, 1)]</b>: [msg]")))
to_chat(recipient, span_admin_pm_warning(span_huge("<b>-- Administrator private message --</b>")))
to_chat(recipient, span_admin_pm_warning("Admin PM from-<b>[key_name(src, recipient, 0)]</b>: [msg]"))
to_chat(recipient, span_admin_pm_warning("<i>Click on the administrator's name to reply.</i>"))
to_chat(src, span_admin_pm_notice("Admin PM to-<b>[key_name(recipient, src, 1)]</b>: [msg]"))
admin_ticket_log(recipient, span_pm(span_notice("PM From [key_name_admin(src)]: [keywordparsedmsg]")))
admin_ticket_log(recipient, span_admin_pm_notice("PM From [key_name_admin(src)]: [keywordparsedmsg]"))
//always play non-admin recipients the adminhelp sound
recipient << 'sound/effects/adminhelp.ogg'
@@ -197,7 +197,7 @@
return
else //neither are admins
to_chat(src, span_pm(span_warning("Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.")))
to_chat(src, span_admin_pm_warning("Error: Admin-PM: Non-admin to non-admin PM communication is forbidden."))
return
if(irc)
@@ -205,7 +205,7 @@
for(var/client/X in GLOB.admins)
if(!check_rights(R_ADMIN, 0, X))
continue
to_chat(X, span_pm(span_notice("<B>PM: [key_name(src, X, 0)]-&gt;IRC:</B> [keywordparsedmsg]")))
to_chat(X, span_admin_pm_notice("<B>PM: [key_name(src, X, 0)]-&gt;IRC:</B> [keywordparsedmsg]"))
else
log_admin("PM: [key_name(src)]->[key_name(recipient)]: [rawmsg]")
//we don't use message_admins here because the sender/receiver might get it too
@@ -213,7 +213,7 @@
if(!check_rights(R_ADMIN, 0, X))
continue
if(X.key!=key && X.key!=recipient.key) //check client/X is an admin and isn't the sender or recipient
to_chat(X, span_pm(span_notice("<B>PM: [key_name(src, X, 0)]-&gt;[key_name(recipient, X, 0)]:</B> [keywordparsedmsg]")))
to_chat(X, span_admin_pm_notice("<B>PM: [key_name(src, X, 0)]-&gt;[key_name(recipient, X, 0)]:</B> [keywordparsedmsg]"))
/proc/IrcPm(target,msg,sender)
var/client/C = GLOB.directory[target]
@@ -262,11 +262,11 @@
message_admins("IRC message from [sender] to [key_name_admin(C)] : [msg]")
log_admin("IRC PM: [sender] -> [key_name(C)] : [msg]")
to_chat(C, span_pm(span_warning(span_huge("<b>-- Administrator private message --</b>"))))
to_chat(C, span_pm(span_warning("Admin PM from-<b><a href='?priv_msg=[stealthkey]'>[adminname]</A></b>: [msg]")))
to_chat(C, span_pm(span_warning("<i>Click on the administrator's name to reply.</i>")))
to_chat(C, span_admin_pm_warning(span_huge("<b>-- Administrator private message --</b>")))
to_chat(C, span_admin_pm_warning("Admin PM from-<b><a href='?priv_msg=[stealthkey]'>[adminname]</A></b>: [msg]"))
to_chat(C, span_admin_pm_warning("<i>Click on the administrator's name to reply.</i>"))
admin_ticket_log(C, span_pm(span_notice("PM From [irc_tagged]: [msg]")))
admin_ticket_log(C, span_admin_pm_notice("PM From [irc_tagged]: [msg]"))
window_flash(C)
//always play non-admin recipients the adminhelp sound
code/modules/admin/verbs/randomverbs.dm
+2 -2
View File
@@ -101,7 +101,7 @@
to_chat(M, "<B>You hear a voice in your head...</B> <i>[msg]</i>")
log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
msg = span_pm(span_adminnotice("<b> SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] :</b> [msg]"))
msg = span_admin_pm_notice("<b> SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] :</b> [msg]")
message_admins(msg)
admin_ticket_log(M, msg)
feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -149,7 +149,7 @@
to_chat(M, msg)
log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]")
msg = span_pm(span_adminnotice("<b> DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]):</b> [msg]<BR>"))
msg = span_admin_pm_notice("<b> DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]):</b> [msg]<BR>")
message_admins(msg)
admin_ticket_log(M, msg)
feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
code/modules/integrated_electronics/core/assemblies/generic.dm
+1 -1
View File
@@ -214,7 +214,7 @@
playsound(src, 'sound/machines/click.ogg', 75, 1)
user.visible_message("\The [user] attaches \the [src] to the wall.",
span_notice("You attach \the [src] to the wall."),
span_italics("You hear clicking."))
span_warningplain("You hear clicking."))
if(istype(user, /mob/living/silicon/robot)) //Robots cannot unequip/drop items, for Safety Reasons.
forceMove(T)
user.drop_item(T)
code/modules/mentor/mentor.dm
+17 -17
View File
@@ -46,7 +46,7 @@ var/list/mentor_verbs_default = list(
set category = "Special Verbs"
set name = "Make Mentor"
if(!holder)
to_chat(src, span_pm(span_warning("Error: Only administrators may use this command.")))
to_chat(src, span_admin_pm_warning("Error: Only administrators may use this command."))
return
var/list/client/targets[0]
for(var/client/T in GLOB.clients)
@@ -56,12 +56,12 @@ var/list/mentor_verbs_default = list(
return
var/client/C = targets[target]
if(has_mentor_powers(C) || C.deadmin_holder) // If an admin is deadminned you could mentor them and that will cause fuckery if they readmin
to_chat(src, span_pm(span_warning("Error: They already have mentor powers.")))
to_chat(src, span_admin_pm_warning("Error: They already have mentor powers."))
return
var/datum/mentor/M = new /datum/mentor(C.ckey)
M.associate(C)
to_chat(C, span_pm(span_notice("You have been granted mentorship.")))
to_chat(src, span_pm(span_notice("You have made [C] a mentor.")))
to_chat(C, span_admin_pm_notice("You have been granted mentorship."))
to_chat(src, span_admin_pm_notice("You have made [C] a mentor."))
log_admin("[key_name(src)] made [key_name(C)] a mentor.")
feedback_add_details("admin_verb","Make Mentor") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -69,7 +69,7 @@ var/list/mentor_verbs_default = list(
set category = "Special Verbs"
set name = "Unmake Mentor"
if(!holder)
to_chat(src, span_pm(span_warning("Error: Only administrators may use this command.")))
to_chat(src, span_admin_pm_warning("Error: Only administrators may use this command."))
return
var/list/client/targets[0]
for(var/client/T in GLOB.mentors)
@@ -79,8 +79,8 @@ var/list/mentor_verbs_default = list(
return
var/client/C = targets[target]
C.mentorholder.disassociate()
to_chat(C, span_pm(span_warning("Your mentorship has been revoked.")))
to_chat(src, span_pm(span_notice("You have revoked [C]'s mentorship.")))
to_chat(C, span_admin_pm_warning("Your mentorship has been revoked."))
to_chat(src, span_admin_pm_notice("You have revoked [C]'s mentorship."))
log_admin("[key_name(src)] revoked [key_name(C)]'s mentorship.")
feedback_add_details("admin_verb","Unmake Mentor") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -134,7 +134,7 @@ var/list/mentor_verbs_default = list(
/client/proc/cmd_mhelp_reply(whom)
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src, span_pm(span_warning("Error: Mentor-PM: You are unable to use admin PM-s (muted).")))
to_chat(src, span_admin_pm_warning("Error: Mentor-PM: You are unable to use admin PM-s (muted)."))
return
var/client/C
if(istext(whom))
@@ -143,7 +143,7 @@ var/list/mentor_verbs_default = list(
C = whom
if(!C)
if(has_mentor_powers(src))
to_chat(src, span_pm(span_warning("Error: Mentor-PM: Client not found.")))
to_chat(src, span_admin_pm_warning("Error: Mentor-PM: Client not found."))
return
var/datum/mentor_help/MH = C.current_mentorhelp
@@ -185,13 +185,13 @@ var/list/mentor_verbs_default = list(
set hidden = 1
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src, span_pm(span_warning("Error: Mentor-PM: You are unable to use admin PM-s (muted).")))
to_chat(src, span_mentor_pm_warning("Error: Mentor-PM: You are unable to use mentor PM-s (muted)."))
return
//Not a mentor and no open ticket
if(!has_mentor_powers(src) && !current_mentorhelp)
to_chat(src, span_pm(span_warning("You can no longer reply to this ticket, please open another one by using the Mentorhelp verb if need be.")))
to_chat(src, span_pm(span_notice("Message: [msg]")))
to_chat(src, span_mentor_pm_warning("You can no longer reply to this ticket, please open another one by using the Mentorhelp verb if need be."))
to_chat(src, span_mentor_pm_notice("Message: [msg]"))
return
var/client/recipient
@@ -210,12 +210,12 @@ var/list/mentor_verbs_default = list(
return
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src, span_pm(span_warning("Error: Mentor-PM: You are unable to use admin PM-s (muted).")))
to_chat(src, span_mentor_pm_warning("Error: Mentor-PM: You are unable to use mentor PM-s (muted)."))
return
if(!recipient)
if(has_mentor_powers(src))
to_chat(src, span_pm(span_warning("Error:Mentor-PM: Client not found.")))
to_chat(src, span_mentor_pm_warning("Error:Mentor-PM: Client not found."))
to_chat(src, msg)
else
log_admin("Mentorhelp: [key_name(src)]: [msg]")
@@ -224,8 +224,8 @@ var/list/mentor_verbs_default = list(
//Has mentor powers but the recipient no longer has an open ticket
if(has_mentor_powers(src) && !recipient.current_mentorhelp)
to_chat(src, span_pm(span_warning("You can no longer reply to this ticket.")))
to_chat(src, span_pm(span_notice("Message: [msg]")))
to_chat(src, span_mentor_pm_warning("You can no longer reply to this ticket."))
to_chat(src, span_mentor_pm_notice("Message: [msg]"))
return
if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
@@ -235,7 +235,7 @@ var/list/mentor_verbs_default = list(
if(!msg)
return
var/interaction_message = span_pm(span_notice("Mentor-PM from-<b>[src]</b> to-<b>[recipient]</b>: [msg]"))
var/interaction_message = span_mentor_pm_notice("Mentor-PM from-<b>[src]</b> to-<b>[recipient]</b>: [msg]")
if (recipient.current_mentorhelp && !has_mentor_powers(recipient))
recipient.current_mentorhelp.AddInteraction(interaction_message)
code/modules/mentor/mentorhelp.dm
+2 -2
View File
@@ -353,7 +353,7 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
if(tgui_alert(usr, "Really escalate this ticket to admins? No mentors will ever be able to interact with it again if you do.","Escalate",list("Yes","No")) != "Yes")
return
if (src.initiator == null) // You can't escalate a mentorhelp of someone who's logged out because it won't create the adminhelp properly
to_chat(usr, span_pm(span_warning("Error: client not found, unable to escalate.")))
to_chat(usr, span_mentor_pm_warning("Error: client not found, unable to escalate."))
return
var/datum/admin_help/AH = new /datum/admin_help(src.name, src.initiator, FALSE)
message_mentors("[usr.ckey] escalated Ticket [TicketHref("#[id]")]")
@@ -462,7 +462,7 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
if(current_mentorhelp)
log_admin("Mentorhelp: [key_name(src)]: [msg]")
current_mentorhelp.MessageNoRecipient(msg)
to_chat(usr, span_adminnotice(span_mentor("Mentor-PM to-<b>Mentors</b>: [msg]")))
to_chat(usr, span_mentor_pm_notice("Mentor-PM to-<b>Mentors</b>: [msg]"))
return
else
to_chat(usr, span_warning("Ticket not found, creating new one..."))
code/modules/power/port_gen_vr.dm
+2 -2
View File
@@ -180,7 +180,7 @@
return
going_kaboom = TRUE
visible_message(span_danger("\The [src] lets out an shower of sparks as it starts to lose stability!"),\
span_italics("You hear a loud electrical crack!"))
span_warningplain("You hear a loud electrical crack!"))
playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 5, power_gen * 0.05)
addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(explosion), get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion.
@@ -286,7 +286,7 @@
/obj/machinery/power/rtg/kugelblitz/proc/asplod()
visible_message(span_danger("\The [src] lets out an shower of sparks as it starts to lose stability!"),\
span_italics("You hear a loud electrical crack!"))
span_warningplain("You hear a loud electrical crack!"))
playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5)
var/turf/T = get_turf(src)
qdel(src)