From 1ef86a0aab4ceb1b07bd4f00f4bf3c6b1c77625e Mon Sep 17 00:00:00 2001 From: Tom Heeren Date: Fri, 17 Mar 2017 12:34:10 -0500 Subject: [PATCH 1/4] Adds a cancel button to the drop bomb command. why was this not a thing before --- code/modules/admin/admin_verbs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index d8c38d5f666..a2923e3bd01 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -552,7 +552,7 @@ var/list/admin_verbs_snpc = list( return var/turf/epicenter = mob.loc - var/list/choices = list("Small Bomb", "Medium Bomb", "Big Bomb", "Custom Bomb") + var/list/choices = list("Small Bomb", "Medium Bomb", "Big Bomb", "Custom Bomb", "Cancel") var/choice = input("What size explosion would you like to produce?") in choices switch(choice) if(null) From fb4a3b050097941321095ef17b06b461d043ebec Mon Sep 17 00:00:00 2001 From: Tom Heeren Date: Fri, 17 Mar 2017 12:45:52 -0500 Subject: [PATCH 2/4] Makes the cancel option not forge a log. --- code/modules/admin/admin_verbs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index a2923e3bd01..47d3b255c8e 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -577,6 +577,8 @@ var/list/admin_verbs_snpc = list( if(flash_range == null) return explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, 1, 1) + if("Cancel") + return //No really why wasn't this a thing before log_admin("[key_name(usr)] created an admin explosion at [epicenter.loc]") message_admins("[key_name_admin(usr)] created an admin explosion at [epicenter.loc]") feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! From 879a8507e49b1de1512801eb72c5b072a0573299 Mon Sep 17 00:00:00 2001 From: Tom Heeren Date: Thu, 23 Mar 2017 16:04:12 -0500 Subject: [PATCH 3/4] Makes code better and shit reeeeeeeeeeeeeeeeeee --- code/modules/admin/admin_verbs.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 47d3b255c8e..f73ccba6942 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -553,7 +553,7 @@ var/list/admin_verbs_snpc = list( var/turf/epicenter = mob.loc var/list/choices = list("Small Bomb", "Medium Bomb", "Big Bomb", "Custom Bomb", "Cancel") - var/choice = input("What size explosion would you like to produce?") in choices + var/choice = input("What size explosion would you like to produce?") as null|anything in choices switch(choice) if(null) return 0 @@ -577,8 +577,6 @@ var/list/admin_verbs_snpc = list( if(flash_range == null) return explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, 1, 1) - if("Cancel") - return //No really why wasn't this a thing before log_admin("[key_name(usr)] created an admin explosion at [epicenter.loc]") message_admins("[key_name_admin(usr)] created an admin explosion at [epicenter.loc]") feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! From 3dcf322115b9d6a718a7d5add9f1e7577f721c83 Mon Sep 17 00:00:00 2001 From: Tom Heeren Date: Thu, 23 Mar 2017 21:55:16 -0500 Subject: [PATCH 4/4] Removes the cancel bit Don't need this --- code/modules/admin/admin_verbs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f73ccba6942..c4f7cf01062 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -552,7 +552,7 @@ var/list/admin_verbs_snpc = list( return var/turf/epicenter = mob.loc - var/list/choices = list("Small Bomb", "Medium Bomb", "Big Bomb", "Custom Bomb", "Cancel") + var/list/choices = list("Small Bomb", "Medium Bomb", "Big Bomb", "Custom Bomb") var/choice = input("What size explosion would you like to produce?") as null|anything in choices switch(choice) if(null)