cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] another fix for mentor replies (#11863)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-10-24 13:11:20 -07:00
committed by GitHub
parent a6089302a7
commit 1ddedcf57b
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/verbs/adminpm.dm
View File

@@ -45,7 +45,7 @@
if(cmptext(copytext(whom,1,2),"@"))
whom = findStealthKey(whom)
C = GLOB.directory[whom]
else if(istype(whom,/client))
else if(isclient(whom))
C = whom
if(!C)
if(holder)

5
code/modules/client/client procs.dm
View File

@@ -103,10 +103,13 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
//Admin PM
if(href_list["priv_msg"])
var/client/C = locate(href_list["priv_msg"])
var/passed_key = href_list["priv_msg"]
var/client/C = locate(passed_key)
if(ismob(C)) //Old stuff can feed-in mobs instead ofGLOB.clients
var/mob/M = C
C = M.client
if(!C && istext(passed_key))
C = passed_key
cmd_admin_pm(C,null)
return

8
code/modules/tickets/procs.dm
View File

@@ -195,7 +195,7 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T
var/client/C
if(istext(whom))
C = GLOB.directory[whom]
else if(istype(whom,/client))
else if(isclient(whom))
C = whom
if(!C)
if(src.holder)
@@ -270,7 +270,7 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T
if(!msg)
return
var/interaction_message = span_mentor_notice("Mentor-PM from-<b>[src]</b> to-<b>[recipient]</b>: [msg]")
var/interaction_message = span_mentor_notice("Mentor-PM from-" + span_bold("[src]") + " to-" + span_bold("[recipient]") + ": [msg]")
if (recipient.current_ticket && !recipient.holder && recipient.current_ticket.level == 0)
recipient.current_ticket.AddInteraction(interaction_message)
@@ -284,8 +284,8 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T
if (src.current_ticket && src.current_ticket.level == 0)
src.current_ticket.AddInteraction(interaction_message)
to_chat(recipient, span_mentor(span_italics("Mentor-PM from-<b><a href='byond://?mentorhelp_msg=\ref[src]'>[src]</a></b>: [msg]")))
to_chat(src, span_mentor(span_italics("Mentor-PM to-<b>[recipient]</b>: [msg]")))
to_chat(recipient, span_mentor(span_italics("Mentor-PM from-" + span_bold("<a href='byond://?mentorhelp_msg=\ref[src]'>[src]</a>") + ": [msg]")))
to_chat(src, span_mentor(span_italics("Mentor-PM to-" + span_bold("[recipient]") + ": [msg]")))
log_admin("[key_name(src)]->[key_name(recipient)]: [msg]")

4
code/modules/tickets/tickets_ui.dm
View File

@@ -183,9 +183,9 @@
switch(ui.user.client.selected_ticket.level)
if (0)
ui.user.client.cmd_mentor_pm(ui.user.client.selected_ticket.initiator, sanitize(params["msg"]), ui.user.client.selected_ticket)
ui.user.client.cmd_mentor_pm(ui.user.client.selected_ticket.initiator, params["msg"], ui.user.client.selected_ticket)
if (1)
ui.user.client.cmd_admin_pm(ui.user.client.selected_ticket.initiator, sanitize(params["msg"]), ui.user.client.selected_ticket)
ui.user.client.cmd_admin_pm(ui.user.client.selected_ticket.initiator, params["msg"], ui.user.client.selected_ticket)
. = TRUE
/datum/tickets/tgui_fallback(payload, user)