From 5d181511aa713e854f2dd58072504f6526748490 Mon Sep 17 00:00:00 2001 From: Gristlebee <56049844+Gristlebee@users.noreply.github.com> Date: Sun, 7 Jun 2026 18:48:39 -0700 Subject: [PATCH 1/2] Update randomverbs.dm --- code/modules/admin/verbs/randomverbs.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 1a77d38cdcb5..a47036b038e9 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -370,11 +370,11 @@ if(!istype(overmap_location)) // Sanity check return - var/confirm = alert(src, "Do you want to create a distress signal for [overmap_location.name] [overmap_location.docked_to ? "docked to [overmap_location.docked_to]" : "at ([overmap_location.x], [overmap_location.y])"]?", "Distress Signal", "Yes", "No") + var/distress_message = input(src, "Input any information you'd like attached with the distress signal.", "Distress Signal Message") + var/confirm = alert(src, "Do you want to create a distress signal for [overmap_location.name] [overmap_location.docked_to ? "docked to [overmap_location.docked_to]" : "at ([overmap_location.x], [overmap_location.y])"]?", "Distress Signal", "Yes", "No") switch(confirm) if("Yes") - var/distress_message = input(src, "Input any information you'd like attached with the distress signal.", "Distress Signal Message") if(distress_message) create_distress_beacon(overmap_location, distress_message) else @@ -401,11 +401,10 @@ if(!overmap_location && !istype(overmap_location)) return + var/distress_message = input(src, "Input any information you'd like attached with the distress signal.", "Distress Signal Message") var/confirm = alert(src, "Do you want to create a distress signal for [overmap_location.name] [overmap_location.docked_to ? "docked to [overmap_location.docked_to]" : "at ([overmap_location.x], [overmap_location.y])"]?", "Distress Signal", "Yes", "No") - switch(confirm) if("Yes") - var/distress_message = input(src, "Input any information you'd like attached with the distress signal.", "Distress Signal Message") if(distress_message) create_distress_beacon(overmap_location, distress_message) else From 2258f75c88ab12d05ca1b84fd252a8e269950659 Mon Sep 17 00:00:00 2001 From: Gristlebee <56049844+Gristlebee@users.noreply.github.com> Date: Sun, 7 Jun 2026 20:15:28 -0700 Subject: [PATCH 2/2] tgui --- code/modules/admin/verbs/randomverbs.dm | 27 +++++++++---------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index a47036b038e9..76c3c06369b1 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -372,14 +372,11 @@ return var/distress_message = input(src, "Input any information you'd like attached with the distress signal.", "Distress Signal Message") - var/confirm = alert(src, "Do you want to create a distress signal for [overmap_location.name] [overmap_location.docked_to ? "docked to [overmap_location.docked_to]" : "at ([overmap_location.x], [overmap_location.y])"]?", "Distress Signal", "Yes", "No") - switch(confirm) - if("Yes") - if(distress_message) - create_distress_beacon(overmap_location, distress_message) - else - create_distress_beacon(overmap_location) - if("No") + if(tgui_alert(src,"Do you want to create a distress signal for [overmap_location.name] [overmap_location.docked_to ? "docked to [overmap_location.docked_to]" : "at ([overmap_location.x], [overmap_location.y])"]?","Distress Signal",list("Yes","No")) == "Yes") + if(distress_message) + create_distress_beacon(overmap_location, distress_message) + else + create_distress_beacon(overmap_location) return /client/proc/cmd_admin_distress_signal_here() @@ -402,15 +399,11 @@ return var/distress_message = input(src, "Input any information you'd like attached with the distress signal.", "Distress Signal Message") - var/confirm = alert(src, "Do you want to create a distress signal for [overmap_location.name] [overmap_location.docked_to ? "docked to [overmap_location.docked_to]" : "at ([overmap_location.x], [overmap_location.y])"]?", "Distress Signal", "Yes", "No") - switch(confirm) - if("Yes") - if(distress_message) - create_distress_beacon(overmap_location, distress_message) - else - create_distress_beacon(overmap_location) - if("No") - return + if(tgui_alert(src,"Do you want to create a distress signal for [overmap_location.name] [overmap_location.docked_to ? "docked to [overmap_location.docked_to]" : "at ([overmap_location.x], [overmap_location.y])"]?","Distress Signal",list("Yes","No"),0) == "Yes") + if(distress_message) + create_distress_beacon(overmap_location, distress_message) + else + create_distress_beacon(overmap_location) /client/proc/cmd_admin_delete(atom/A as obj|mob|turf in world) set category = "Debug"