Merge pull request #3178 from Citadel-Station-13/upstream-merge-31330

[MIRROR] Fixes runed metal and brass sprites
This commit is contained in:
LetterJay
2017-10-07 01:03:35 -04:00
committed by GitHub
@@ -274,7 +274,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
desc = "Sheets of cold metal with shifting inscriptions writ upon them."
singular_name = "runed metal sheet"
icon_state = "sheet-runed"
icon = 'icons/obj/items_and_weapons.dmi'
icon = 'icons/obj/stack_objects.dmi'
sheettype = "runed"
merge_type = /obj/item/stack/sheet/runed_metal
novariants = TRUE
@@ -326,7 +326,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
desc = "Sheets made out of brass."
singular_name = "brass sheet"
icon_state = "sheet-brass"
icon = 'icons/obj/items_and_weapons.dmi'
icon = 'icons/obj/stack_objects.dmi'
resistance_flags = FIRE_PROOF | ACID_PROOF
throwforce = 10
max_amount = 50