From 9fe0177a0ea62e00e05ebdf9b65b1faec2a3959f Mon Sep 17 00:00:00 2001 From: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com> Date: Mon, 6 Nov 2023 06:34:27 +0530 Subject: [PATCH] [MODULAR]Combat Cybernetic Implants listing change (#24134) * Implant listing * Update * Review Compliance Removed armblade from PR changes. It is back to mechfab only as it has been. * Review Compliance * review compliance 2 * review compliance 3 * Apply suggestions from code review --------- Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- .../modules/implants/code/medical_designs.dm | 24 +++++++++++++++---- .../modules/implants/code/medical_nodes.dm | 3 ++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/modular_skyrat/modules/implants/code/medical_designs.dm b/modular_skyrat/modules/implants/code/medical_designs.dm index fe795717df3..3197d96c5b7 100644 --- a/modular_skyrat/modules/implants/code/medical_designs.dm +++ b/modular_skyrat/modules/implants/code/medical_designs.dm @@ -45,14 +45,14 @@ name = "Photon Projector Implant" desc = "An integrated projector mounted onto a user's arm that is able to be used as a powerful flash." id = "ci-flash" - build_type = MECHFAB + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT) construction_time = 200 build_path = /obj/item/organ/internal/cyberimp/arm/flash category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT ) - departmental_flags = DEPARTMENT_BITFLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_botany name = "Botany Arm Implant" @@ -71,12 +71,12 @@ name = "Night Vision Eyes" desc = "These cybernetic eyes will give you Night Vision. Big, mean, and green." id = "ci-nv" - build_type = MECHFAB | PROTOLATHE + build_type = PROTOLATHE | MECHFAB construction_time = 60 materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 6, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 6, /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,) build_path = /obj/item/organ/internal/eyes/night_vision/cyber category = list( - RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT + RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY ) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL @@ -84,7 +84,7 @@ name = "CNS Jumpstarter Implant" desc = "This implant will automatically attempt to jolt you awake from unconsciousness, with a short cooldown between jolts. Conflicts with the CNS Rebooter." id = "ci-antisleep" - build_type = MECHFAB | PROTOLATHE + build_type = PROTOLATHE | MECHFAB construction_time = 60 materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 6, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 5) build_path = /obj/item/organ/internal/cyberimp/brain/anti_sleep @@ -131,3 +131,17 @@ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_MISC ) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE + +/datum/design/cyberimp_thermals + name = "Thermal Eyes" + id = "ci-thermals" + build_type = AWAY_LATHE | MECHFAB + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/cyberimp_reviver + name = "Reviver Implant" + id = "ci-reviver" + category = list( + RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT + ) + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL diff --git a/modular_skyrat/modules/implants/code/medical_nodes.dm b/modular_skyrat/modules/implants/code/medical_nodes.dm index 4eb34b69568..a329693e8e5 100644 --- a/modular_skyrat/modules/implants/code/medical_nodes.dm +++ b/modular_skyrat/modules/implants/code/medical_nodes.dm @@ -16,9 +16,10 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) /datum/techweb_node/adv_cyber_implants + design_ids = list("ci-nv", "ci-nutrimentplus", "ci-surgery", "ci-toolset") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500) /datum/techweb_node/combat_cyber_implants - design_ids = list("ci-nv", "ci-antidrop", "ci-antistun", "ci-antisleep", "ci-thrusters", "ci-mantis", "ci-flash") + design_ids = list("ci-antidrop", "ci-antistun", "ci-antisleep", "ci-thrusters", "ci-mantis", "ci-flash", "ci-reviver") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 12000)