Skip to content

Admin distress verb gives option to cancel after writing the message #6375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gristlebee wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −20
Open

Admin distress verb gives option to cancel after writing the message #6375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d18151
Update randomverbs.dm
Gristlebee Jun 8, 2026
2258f75
tgui
Gristlebee Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 12 additions & 20 deletions code/modules/admin/verbs/randomverbs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,16 +370,13 @@

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")

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
create_distress_beacon(overmap_location)
if("No")
var/distress_message = input(src, "Input any information you'd like attached with the distress signal.", "Distress Signal Message")
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()
Expand All @@ -401,17 +398,12 @@
if(!overmap_location && !istype(overmap_location))
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")

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
create_distress_beacon(overmap_location)
if("No")
return
var/distress_message = input(src, "Input any information you'd like attached with the distress signal.", "Distress Signal Message")
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"
Expand Down
Loading