Merge pull request #33180 from praisenarsie/patch-13

cardboard no longer can damage you
This commit is contained in:
Leo
2017-12-01 21:56:45 -02:00
committed by CitadelStationBot
parent a3a87bdb3f
commit 4723a1813b
@@ -256,6 +256,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
icon_state = "sheet-card"
origin_tech = "materials=1"
resistance_flags = FLAMMABLE
force = 0
throwforce = 0
merge_type = /obj/item/stack/sheet/cardboard
novariants = TRUE