Merge pull request #6287 from Citadel-Station-13/upstream-merge-36953

[MIRROR] Stack Sheets Cancel Button
This commit is contained in:
deathride58
2018-04-11 21:40:22 +00:00
committed by GitHub
+2 -2
View File
@@ -339,7 +339,7 @@
return
//get amount from user
var/max = get_amount()
var/stackmaterial = round(input(user,"How many sheets do you wish to take out of this stack? (Maximum [max])") as num)
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)))
@@ -415,4 +415,4 @@
/datum/stack_recipe_list/New(title, recipes)
src.title = title
src.recipes = recipes
src.recipes = recipes