cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Manual MIRROR] dmapi manual update port (#11138)

Browse Source
This commit is contained in:
Kashargul
2025-07-03 23:30:00 +02:00
committed by GitHub
parent 7d7ef755ee
commit c71ab6c9bd
48 changed files with 1101 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T
GLOB.tickets.BrowseTickets(browse_to)
/proc/message_mentors(var/msg)
msg = span_mentor_channel(span_prefix("Mentor:") + span_message("[msg]"))
msg = span_mentor_channel(span_prefix("Mentor: ") + span_message("[msg]"))
for(var/client/C in GLOB.admins)
to_chat(C, msg)

38
code/modules/tickets/tickets.dm
View File

@@ -20,6 +20,7 @@
else
world.TgsTargetedChatBroadcast(message,TRUE)
//
//TICKET MANAGER
//
@@ -318,9 +319,9 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick/ticket_list)
var/list/activemins = adm["present"]
var activeMins = activemins.len
if(is_bwoink)
ahelp_discord_message("ADMINHELP: FROM: [key_name_admin(usr)] TO [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.")
ahelp_discord_message("[level == 0 ? "MENTORHELP" : "ADMINHELP"]: FROM: [key_name_admin(usr)] TO [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.")
else
ahelp_discord_message("ADMINHELP: FROM: [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.")
ahelp_discord_message("[level == 0 ? "MENTORHELP" : "ADMINHELP"]: FROM: [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.")
// Also send it to discord since that's the hip cool thing now.
SSwebhooks.send(
@@ -357,11 +358,11 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick/ticket_list)
tgui_interact(usr.client.mob)
//private
/datum/ticket/proc/FullMonty(ref_src, admin = FALSE)
/datum/ticket/proc/FullMonty(ref_src, admin_commands = FALSE)
if(!ref_src)
ref_src = "\ref[src]"
if(initiator && initiator.mob)
if(admin)
if(admin_commands)
. = ADMIN_FULLMONTY_NONAME(initiator.mob)
else
. = "Initiator disconnected."
@@ -403,22 +404,26 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick/ticket_list)
//won't bug irc
/datum/ticket/proc/MessageNoRecipient(msg)
var/ref_src = "\ref[src]"
var/chat_msg = span_admin_pm_notice(span_adminhelp("Ticket [TicketHref("#[id]", ref_src)]") + span_bold(": [LinkedReplyName(ref_src)] [FullMonty(ref_src)]:") + msg)
AddInteraction(span_red("[LinkedReplyName(ref_src)]: [msg]"))
//send this msg to all admins
if(level == 0)
for (var/client/C in GLOB.admins)
if (C.prefs?.read_preference(/datum/preference/toggle/play_mentorhelp_ping))
C << 'sound/effects/mentorhelp.mp3'
message_mentors(chat_msg)
else if(level == 1)
for(var/client/X in GLOB.admins)
if(X.prefs?.read_preference(/datum/preference/toggle/holder/play_adminhelp_ping))
X << 'sound/effects/adminhelp.ogg'
window_flash(X)
to_chat(X, chat_msg)
switch(level)
if(0)
for (var/client/C in GLOB.admins)
var/chat_msg = span_mentor_channel(span_admin_pm_notice(span_adminhelp("Ticket [TicketHref("#[id]", ref_src)]") + span_bold(" (Mentor): [LinkedReplyName(ref_src)] [FullMonty(ref_src, check_rights_for(C, (R_ADMIN|R_SERVER|R_MOD)))]:") + msg))
if (C.prefs?.read_preference(/datum/preference/toggle/play_mentorhelp_ping))
C << 'sound/effects/mentorhelp.mp3'
to_chat(C, chat_msg)
if(1)
for(var/client/X in GLOB.admins)
var/chat_msg = span_admin_pm_notice(span_adminhelp("Ticket [TicketHref("#[id]", ref_src)] (Admin)") + span_bold(": [LinkedReplyName(ref_src)] [FullMonty(ref_src, check_rights_for(X, (R_ADMIN|R_SERVER|R_MOD)))]:") + msg)
if(!check_rights_for(X, R_HOLDER))
continue
if(X.prefs?.read_preference(/datum/preference/toggle/holder/play_adminhelp_ping))
X << 'sound/effects/adminhelp.ogg'
window_flash(X)
to_chat(X, chat_msg)
/*
//Reopen a closed ticket
@@ -649,6 +654,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick/ticket_list)
level = level + 1
AddInteraction("[key_name_admin(usr)] escalated Ticket.")
message_mentors("[usr.ckey] escalated Ticket [TicketHref("#[id]")]")
log_admin("[key_name(usr)] escalated ticket [src.name]")
to_chat(src.initiator, span_mentor("[usr.ckey] escalated your ticket to admins."))

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

@@ -45,7 +45,7 @@
"closed_at" = (world.time - T.closed_at),
"opened_at_date" = gameTimestamp(wtime = T.opened_at),
"closed_at_date" = gameTimestamp(wtime = T.closed_at),
"actions" = check_rights_for(user.client, (R_ADMIN|R_SERVER|R_MOD)) ? T.FullMonty(,TRUE) : T.FullMonty(),
"actions" = T.FullMonty(null, check_rights_for(user.client, (R_ADMIN|R_SERVER|R_MOD))),
"log" = T._interactions,
)
@@ -235,7 +235,7 @@
data["opened_at_date"] = gameTimestamp(wtime = opened_at)
data["closed_at_date"] = gameTimestamp(wtime = closed_at)
data["actions"] = check_rights_for(user.client, (R_ADMIN|R_SERVER|R_MOD)) ? FullMonty(ref_src, TRUE) : FullMonty(ref_src)
data["actions"] = FullMonty(ref_src, check_rights_for(user.client, (R_ADMIN|R_SERVER|R_MOD)))
data["log"] = _interactions
@@ -296,7 +296,7 @@
dat += "<br>Closed at: [gameTimestamp(wtime = closed_at)] (Approx [(world.time - closed_at) / 600] minutes ago)"
dat += "<br><br>"
if(initiator)
dat += span_bold("Actions:") + " [check_rights_for(user.client, (R_ADMIN|R_SERVER|R_MOD)) ? FullMonty(ref_src, TRUE) : FullMonty(ref_src)]<br>"
dat += span_bold("Actions:") + " [FullMonty(ref_src, check_rights_for(user.client, (R_ADMIN|R_SERVER|R_MOD)))]<br>"
else
dat += span_bold("DISCONNECTED") + "[GLOB.TAB][ClosureLinks(ref_src)]<br>"
dat += "<br><b>Log:</b><br><br>"