cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33180 from praisenarsie/patch-13

Browse Source 
cardboard no longer can damage you
This commit is contained in:
Leo
2017-12-01 21:56:45 -02:00
committed by GitHub
parent 8c3a2372a7 17d64981bc
commit 4bdcebef99
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/sheet_types.dm
+3 -1
View File
@@ -247,6 +247,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
singular_name = "cardboard sheet"
icon_state = "sheet-card"
resistance_flags = FLAMMABLE
force = 0
throwforce = 0
merge_type = /obj/item/stack/sheet/cardboard
novariants = TRUE
@@ -442,4 +444,4 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
/obj/item/stack/sheet/paperframes/twenty
amount = 20
/obj/item/stack/sheet/paperframes/fifty
amount = 50
amount = 50