shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stack Sheets Cancel Button

Browse Source
This commit is contained in:
Davidj361
2018-04-06 04:48:02 -04:00
committed by CitadelStationBot
parent 49fd917fee
commit 1164cec64d
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+7
View File
@@ -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)