Merge branch 'master' into upstream-merge-29741

This commit is contained in:
LetterJay
2017-09-30 13:35:47 -04:00
committed by GitHub
251 changed files with 4917 additions and 2764 deletions
@@ -400,7 +400,6 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
singular_name = "plastic sheet"
icon_state = "sheet-plastic"
throwforce = 7
origin_tech = "materials=1"
origin_tech = "materials=1;biotech=1"
merge_type = /obj/item/stack/sheet/plastic
+1
View File
@@ -76,6 +76,7 @@
to_chat(user, "There are [get_amount()] in the stack.")
else
to_chat(user, "There is [get_amount()] in the stack.")
to_chat(user, "<span class='notice'>Alt-click to take a custom amount.</span>")
/obj/item/stack/proc/get_amount()
if(is_cyborg)