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

Merge remote-tracking branch 'citadel/master' into mobility_flags

Browse Source
This commit is contained in:
kevinz000
2020-02-27 20:11:36 -07:00
parent 67c857292f 879032c52f
commit 56eab760fc
196 changed files with 170125 additions and 14092 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm
+1 -1
View File
@@ -49,7 +49,7 @@
/datum/design/multitool
name = "Multitool"
id = "multitool"
build_type = AUTOLATHE
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 50, /datum/material/glass = 20)
build_path = /obj/item/multitool
category = list("initial","Tools","Tool Designs")
code/modules/research/designs/biogenerator_designs.dm
+1 -1
View File
@@ -56,7 +56,7 @@
id = "enzyme"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 30)
make_reagents = list("enzyme" = 10)
make_reagents = list(/datum/reagent/consumable/enzyme = 10)
category = list("initial","Food")
/datum/design/flour_sack