From 70b3bc21b5e6c02e3d2fbdfc08623853b59cd121 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sat, 30 Aug 2025 15:15:40 -0700 Subject: [PATCH] [MIRROR] fix program reopening (#11545) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/modules/modular_computers/file_system/program.dm | 5 +++-- code/modules/tickets/procs.dm | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 9619d2728d..7be70390cf 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -209,6 +209,7 @@ if(!computer.active_program) return + var/mob/user = ui.user computer.idle_threads.Add(computer.active_program) program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs @@ -216,8 +217,8 @@ computer.update_icon() ui.close() - if(ui.user && istype(ui.user)) - computer.tgui_interact(ui.user) // Re-open the UI on this computer. It should show the main screen now. + if(istype(user)) + computer.tgui_interact(user) // Re-open the UI on this computer. It should show the main screen now. diff --git a/code/modules/tickets/procs.dm b/code/modules/tickets/procs.dm index b288fbcc19..a512169971 100644 --- a/code/modules/tickets/procs.dm +++ b/code/modules/tickets/procs.dm @@ -69,11 +69,11 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T set name = "Request help" set hidden = 1 - var/mhelp = tgui_alert(usr, "Select the help you need.","Request for Help",list("Adminhelp","Mentorhelp")) + var/mhelp = tgui_alert(src, "Select the help you need.","Request for Help",list("Adminhelp","Mentorhelp")) if(!mhelp) return - var/msg = tgui_input_text(usr, "Input your request for help.", "Request for Help ([mhelp])", multiline = TRUE) + var/msg = tgui_input_text(src, "Input your request for help.", "Request for Help ([mhelp])", multiline = TRUE) if(!msg) return @@ -130,7 +130,7 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T var/browse_to - switch(tgui_input_list(usr, "Display which ticket list?", "List Choice", list("Active Tickets", "Closed Tickets", "Resolved Tickets"))) + switch(tgui_input_list(src, "Display which ticket list?", "List Choice", list("Active Tickets", "Closed Tickets", "Resolved Tickets"))) if("Active Tickets") browse_to = AHELP_ACTIVE if("Closed Tickets") @@ -206,7 +206,7 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T if(T) message_mentors(span_mentor_channel("[src] has started replying to [C]'s mentor help.")) - var/msg = tgui_input_text(src,"Message:", "Private message to [C]", multiline = TRUE) + var/msg = tgui_input_text(src,"Message:", "Private message to [C]", multiline = TRUE, encode = FALSE) if (!msg) message_mentors(span_mentor_channel("[src] has cancelled their reply to [C]'s mentor help.")) return