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

Update stack.dm

Browse Source
This commit is contained in:
deathride58
2018-04-06 20:51:39 -04:00
committed by GitHub
parent 1164cec64d
commit e54029a382
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
-5
View File
@@ -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)