From 4723a1813bf25b536bba50c947423c7caa39e18f Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 1 Dec 2017 21:56:45 -0200 Subject: [PATCH] Merge pull request #33180 from praisenarsie/patch-13 cardboard no longer can damage you --- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e78ba6b719..88bccfe204 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -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