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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics

Browse Source
This commit is contained in:
Seris02
2020-03-09 16:49:32 +08:00
parent 9b66940807 878947bf7e
commit cccd0e9eef
1093 changed files with 386415 additions and 224664 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
code/modules/research/designs/electronics_designs.dm
-10
View File
@@ -23,16 +23,6 @@
category = list("Electronics")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/ai_cam_upgrade
name = "AI Surveillance Software Update"
desc = "A software package that will allow an artificial intelligence to 'hear' from its cameras via lip reading."
id = "ai_cam_upgrade"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 5000, /datum/material/glass = 5000, /datum/material/gold = 15000, /datum/material/silver = 15000, /datum/material/diamond = 20000, /datum/material/plasma = 10000)
build_path = /obj/item/surveillance_upgrade
category = list("Electronics")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
///////////////////////////////////
//////////Nanite Devices///////////
///////////////////////////////////
code/modules/research/designs/medical_designs.dm
+33
View File
@@ -379,6 +379,39 @@
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cyberimp_shield
name = "Riot Shield Arm Implant"
desc = "An implanted riot shield, designed to be installed on subject's arm."
id = "ci-shield"
build_type = PROTOLATHE
materials = list (/datum/material/iron = 8500, /datum/material/glass = 8500, /datum/material/silver = 1800, /datum/material/titanium = 600)
construction_time = 200
build_path = /obj/item/organ/cyberimp/arm/shield
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/cyberimp_janitor
name = "Janitor Arm Implant"
desc = "A set of janitor tools fitted into an arm implant, designed to be installed on subject's arm."
id = "ci-janitor"
build_type = PROTOLATHE | MECHFAB
materials = list (/datum/material/iron = 3500, /datum/material/glass = 1500, /datum/material/silver = 1500)
construction_time = 200
build_path = /obj/item/organ/cyberimp/arm/janitor
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cyberimp_service
name = "Service Arm Implant"
desc = "Everything a cook or barkeep needs in an arm implant, designed to be installed on subject's arm."
id = "ci-service"
build_type = PROTOLATHE | MECHFAB
materials = list (/datum/material/iron = 3500, /datum/material/glass = 1500, /datum/material/silver = 1500)
construction_time = 200
build_path = /obj/item/organ/cyberimp/arm/service
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cyberimp_medical_hud
name = "Medical HUD Implant"
desc = "These cybernetic eyes will display a medical HUD over everything you see. Wiggle eyes to control."