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

more merge conflict fixes

Browse Source
This commit is contained in:
Seris02
2020-01-24 10:14:31 +08:00
parent 379d5b9463 4888e1522a
commit 9761d68f4b
315 changed files with 15287 additions and 11002 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm
+3 -2
View File
@@ -87,9 +87,10 @@
name = "Conveyor Belt"
id = "conveyor_belt"
build_type = AUTOLATHE
materials = list(MAT_METAL = 5000)
build_path = /obj/item/conveyor_construct
materials = list(MAT_METAL = 3000)
build_path = /obj/item/stack/conveyor
category = list("initial", "Construction")
maxstack = 30
/datum/design/conveyor_switch
name = "Conveyor Belt Switch"
code/modules/research/designs/medical_designs.dm
+2
View File
@@ -317,6 +317,8 @@
build_type = PROTOLATHE
build_path = /obj/item/defibrillator/compact
materials = list(MAT_METAL = 16000, MAT_GLASS = 8000, MAT_SILVER = 6000, MAT_GOLD = 3000)
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/////////////////////////////////////////
//////////Cybernetic Implants////////////