Merge pull request #1948 from Citadel-Station-13/upstream-merge-29114

[MIRROR] Fixes plasma glass merging with normal glass
This commit is contained in:
LetterJay
2017-07-08 14:33:41 -05:00
committed by GitHub
3 changed files with 12 additions and 12 deletions
@@ -22,7 +22,7 @@
id = "plasmaglass"
build_type = SMELTER
materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/glass/plasma
build_path = /obj/item/stack/sheet/plasmaglass
category = list("initial")
/datum/design/alienalloy