From 1164cec64dfb85248ad1dbefaba5820a994070fd Mon Sep 17 00:00:00 2001 From: Davidj361 Date: Fri, 6 Apr 2018 04:48:02 -0400 Subject: [PATCH 1/2] Stack Sheets Cancel Button --- code/game/objects/items/stacks/stack.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 0c4e522107..944b2a30e7 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -334,8 +334,15 @@ //get amount from user var/min = 0 var/max = get_amount() +<<<<<<< HEAD var/stackmaterial = round(input(user,"How many sheets do you wish to take out of this stack? (Maximum [max])") as num) if(stackmaterial == null || stackmaterial <= min || stackmaterial >= get_amount() || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) +======= + var/stackmaterial = round(input(user,"How many sheets do you wish to take out of this stack? (Maximum [max])") as null|num) + max = get_amount() + stackmaterial = min(max, stackmaterial) + if(stackmaterial == null || stackmaterial <= 0 || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) +>>>>>>> e5d407a... Added cancel button (#36953) return else change_stack(user,stackmaterial) From e54029a3828e014d61a442d7905ed6b4c1f481d1 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 6 Apr 2018 20:51:39 -0400 Subject: [PATCH 2/2] Update stack.dm --- code/game/objects/items/stacks/stack.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 944b2a30e7..483d96c8a1 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -334,15 +334,10 @@ //get amount from user var/min = 0 var/max = get_amount() -<<<<<<< HEAD - var/stackmaterial = round(input(user,"How many sheets do you wish to take out of this stack? (Maximum [max])") as num) - if(stackmaterial == null || stackmaterial <= min || stackmaterial >= get_amount() || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) -======= var/stackmaterial = round(input(user,"How many sheets do you wish to take out of this stack? (Maximum [max])") as null|num) max = get_amount() stackmaterial = min(max, stackmaterial) if(stackmaterial == null || stackmaterial <= 0 || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) ->>>>>>> e5d407a... Added cancel button (#36953) return else change_stack(user,stackmaterial)