Merge pull request #990 from Citadel-Station-13/upstream-merge-27271

[MIRROR] Refactors supply talismans to be less shitcode
2017-05-17 10:51:02 -04:00
parent b4c1a9afc8 f52625b18c
commit da2fc1da0d
4 changed files with 131 additions and 71 deletions
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -286,13 +286,16 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
 		return
 	..()

-/obj/item/stack/sheet/runed_metal/fifty
-	amount = 50
-
 /obj/item/stack/sheet/runed_metal/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.runed_metal_recipes
 	return ..()

+/obj/item/stack/sheet/runed_metal/fifty
+	amount = 50
+
+/obj/item/stack/sheet/runed_metal/five
+	amount = 5
+
 /*
 * Brass
 */