Merge pull request #4189 from Citadel-Station-13/upstream-merge-33180

[MIRROR] cardboard no longer can damage you
2017-12-03 06:16:00 -06:00
parent 8ddab27d8e 513056ff60
commit 6217206bae
1 changed files with 2 additions and 0 deletions
@@ -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