Merge pull request #2971 from Citadel-Station-13/upstream-merge-31048

[MIRROR] Fixed duplicate definition
This commit is contained in:
LetterJay
2017-09-28 12:32:57 -04:00
committed by GitHub
@@ -390,7 +390,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