From e897a4d10b977626057e399a0a33bf2b3bcbee7f Mon Sep 17 00:00:00 2001 From: dearmochi <1496804+dearmochi@users.noreply.github.com> Date: Sat, 21 Oct 2023 04:11:30 +0900 Subject: [PATCH] Add cancel button to Admin PM verbs (#22896) --- code/modules/admin/verbs/adminpm.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 7fc64ba3e17..e46b8ae95c3 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -28,7 +28,9 @@ else targets["(No Mob) - [T]"] = T var/list/sorted = sortList(targets) - var/target = input(src,"To whom shall we send a message?","Admin PM",null) in sorted|null + var/target = input(src,"To whom shall we send a message?","Admin PM",null) as null|anything in sorted|null + if(!target) + return cmd_admin_pm(targets[target],null) SSblackbox.record_feedback("tally", "admin_verb", 1, "Admin PM Name") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -50,7 +52,9 @@ else targets["(No Mob) - [T]"] = T var/list/sorted = sortList(targets) - var/target = input(src,"To whom shall we send a message?","Admin PM",null) in sorted|null + var/target = input(src,"To whom shall we send a message?","Admin PM",null) as null|anything in sorted + if(!target) + return cmd_admin_pm(targets[target],null) SSblackbox.record_feedback("tally", "admin_verb", 1, "Admin PM Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!