shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-29741

Browse Source
This commit is contained in:
LetterJay
2017-09-30 13:35:47 -04:00
committed by GitHub
parent 4f85246e42 2bbc880bf1
commit 47a65d829d
251 changed files with 4917 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/sheet_types.dm
-1
View File
@@ -400,7 +400,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