From b535552bd3d1c26a0bb8ce243310736cf8beea37 Mon Sep 17 00:00:00 2001
From: Manatee <74586965+MajManatee@users.noreply.github.com>
Date: Wed, 25 Feb 2026 13:35:50 -0600
Subject: [PATCH] Cybernetic Reshuffling (#5271)
## About The Pull Request
Moves combat cybernetics to the combat cybernetic techweb node, and
section in the fab.
## Why It's Good For The Game
Things that are illegal, dont look illegal, and thats bad. This makes
the combat implants visible and undeniable.
## Proof Of Testing
Screenshots/Videos
## Changelog
:cl:
fix: Combat implants are in the combat implant section. Where you would
think they would be.
/:cl:
---------
Co-authored-by: Alexis
---
code/modules/research/designs/medical_designs.dm | 6 +++---
code/modules/research/techweb/nodes/cyborg_nodes.dm | 6 ++++--
modular_skyrat/modules/implants/code/medical_nodes.dm | 5 -----
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index d2bca7ccce5..6db26106256 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -617,7 +617,7 @@
)
build_path = /obj/item/organ/cyberimp/chest/spine
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT // BUBBER EDIT - CHANGE - PREVIOUS: RND_CATEGORY_CYBERNETICS
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -687,7 +687,7 @@
)
build_path = /obj/item/organ/cyberimp/chest/reviver
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT // BUBBER EDIT - CHANGE - PREVIOUS: RND_CATEGORY_CYBERNETICS
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -896,7 +896,7 @@
)
build_path = /obj/item/organ/heart/cybernetic/anomalock
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT // BUBBER EDIT - CHANGE - PREVIOUS: RND_CATEGORY_EQUIPMENT
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
diff --git a/code/modules/research/techweb/nodes/cyborg_nodes.dm b/code/modules/research/techweb/nodes/cyborg_nodes.dm
index e6f54d9e5d8..c74bd8c9785 100644
--- a/code/modules/research/techweb/nodes/cyborg_nodes.dm
+++ b/code/modules/research/techweb/nodes/cyborg_nodes.dm
@@ -162,8 +162,9 @@
design_ids = list(
"ci-breather",
"ci-nutriment",
+ "ci-nutrimentplus", // BUBBER EDIT - ADDITION
"ci-thrusters",
- "ci-herculean",
+ //"ci-herculean", // BUBBER EDIT - REMOVAL
"ci-connector",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
@@ -183,6 +184,7 @@
"ci-reviver",
"ci-antidrop",
"ci-antistun",
+ "ci-herculean", // BUBBER EDIT - ADDITION
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
announce_channels = list(RADIO_CHANNEL_SCIENCE, RADIO_CHANNEL_MEDICAL)
@@ -193,7 +195,7 @@
description = "Decades of contraband smuggling by assistants have led to the development of a full toolbox that fits seamlessly into your arm."
prereq_ids = list(TECHWEB_NODE_COMBAT_IMPLANTS, TECHWEB_NODE_EXP_TOOLS)
design_ids = list(
- "ci-nutrimentplus",
+ //"ci-nutrimentplus", // BUBBER EDIT - REMOVAL
"ci-toolset",
"ci-surgery",
)
diff --git a/modular_skyrat/modules/implants/code/medical_nodes.dm b/modular_skyrat/modules/implants/code/medical_nodes.dm
index d5fe796cbe4..9a1fe365316 100644
--- a/modular_skyrat/modules/implants/code/medical_nodes.dm
+++ b/modular_skyrat/modules/implants/code/medical_nodes.dm
@@ -12,10 +12,6 @@
"ci-lighter",
"ci-razor",
)
- // thrusters in combat_implants
- design_ids -= list(
- "ci-thrusters",
- )
return ..()
/datum/techweb_node/cyber/cyber_organs_upgraded/New()
@@ -29,7 +25,6 @@
design_ids += list(
"ci-mantis",
"ci-flash",
- "ci-thrusters",
"ci-antisleep",
)
return ..()