cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-18 03:36:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] fix program reopening (#11545)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-30 15:15:40 -07:00
committed by GitHub
parent 1df8445415
commit 70b3bc21b5
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/program.dm
+3 -2
View File
@@ -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.
code/modules/tickets/procs.dm
+4 -4
View File
@@ -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