From 895a0e8f45bc70174431b18a1c69a642453aa0d6 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Tue, 19 Jan 2016 17:15:55 -0500 Subject: [PATCH] Added cancellation to supply ordering inputs --- code/controllers/Processes/shuttles/supply.dm | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/code/controllers/Processes/shuttles/supply.dm b/code/controllers/Processes/shuttles/supply.dm index 6be3d442030..307d4d30c5d 100644 --- a/code/controllers/Processes/shuttles/supply.dm +++ b/code/controllers/Processes/shuttles/supply.dm @@ -493,13 +493,18 @@ return 1 var/crates = 1 if(multi) - var/num_input = input(usr, "Amount:", "How many crates?", "") as num - crates = Clamp(round(text2num(num_input)), 1, 20) + var/num_input = input(usr, "Amount:", "How many crates?") as null|num + if(!num_input) + return 1 + crates = Clamp(round(num_input), 1, 20) if(..()) return 1 var/timeout = world.time + 600 - var/reason = sanitize(copytext(input(usr,"Reason:","Why do you require this item?","") as null|text, 1, MAX_MESSAGE_LEN)) + var/reason = input(usr,"Reason:","Why do you require this item?","") as null|text + if(!reason) + return 1 + reason = sanitize(copytext(reason, 1, MAX_MESSAGE_LEN)) if(world.time > timeout || !reason || ..()) return 1 @@ -666,13 +671,18 @@ return 1 var/crates = 1 if(multi) - var/num_input = input(usr, "Amount:", "How many crates?", "") as num - crates = Clamp(round(text2num(num_input)), 1, 20) + var/num_input = input(usr, "Amount:", "How many crates?") as null|num + if(!num_input) + return 1 + crates = Clamp(round(num_input), 1, 20) if(!is_authorized(usr) || ..()) return 1 var/timeout = world.time + 600 - var/reason = sanitize(copytext(input(usr,"Reason:","Why do you require this item?","") as null|text,1,MAX_MESSAGE_LEN)) + var/reason = input(usr,"Reason:","Why do you require this item?","") as null|text + if(!reason) + return 1 + reason = sanitize(copytext(reason, 1, MAX_MESSAGE_LEN)) if(world.time > timeout || !reason || !is_authorized(usr) || ..()) return 1