From 674b7c9e2a9577e1ddec472c780bb4892a38f93a Mon Sep 17 00:00:00 2001
From: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Date: Fri, 31 Jan 2025 18:50:38 +0100
Subject: [PATCH] Moved the expand and shrink modules to Augmentation, moved
 artistic module to the correct tab (#2966)

## About The Pull Request

See name, +generic upkeep

## Why It's Good For The Game

Borgs don't really have much going for them in the way of customization,
and the shrink and expand modules provide no additional bonuses. If
anything, they provide one of the very limited ways borg players can
express their character, so locking it behind a lategame research is a
bit stupid

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>


![image](https://github.com/user-attachments/assets/d2e256d2-a116-4b34-a862-f3e5cc7d6baf)

![image](https://github.com/user-attachments/assets/d0455087-f184-489e-9686-f9a5eb74e9ab)


![image](https://github.com/user-attachments/assets/c09bb268-643a-4005-869a-b1267730c985)


</details>

## Changelog

:cl:
balance: Shrink and Expand modules are now unlocked immediately
fix: The artistic module is now in the correct tab
spellcheck: fixed lowercase on the dominatrix module
/:cl:
---
 .../code/modules/research/techweb/all_nodes.dm             | 2 --
 modular_skyrat/modules/borgs/code/robot_upgrade.dm         | 2 +-
 .../code/modules/research/designs/mechfab_designs.dm       | 2 +-
 modular_zubbers/code/modules/research/techweb/all_nodes.dm | 7 +++++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
index 1d513f30a3c..d79ec08dbac 100644
--- a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
+++ b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
@@ -263,7 +263,6 @@
 	return ..()
 
 /////////////////////////robotics tech/////////////////////////
-
 /datum/techweb_node/robotics/New()
 	design_ids += list(
 		"borg_upgrade_snacks",
@@ -284,7 +283,6 @@
 		"borg_upgrade_cargo_tele",
 		"borg_upgrade_forging",
 		"borg_upgrade_brush",
-		"borg_upgrade_shrink",
 	)
 	return ..()
 
diff --git a/modular_skyrat/modules/borgs/code/robot_upgrade.dm b/modular_skyrat/modules/borgs/code/robot_upgrade.dm
index e0e1fe7d85e..0fd42c72e44 100644
--- a/modular_skyrat/modules/borgs/code/robot_upgrade.dm
+++ b/modular_skyrat/modules/borgs/code/robot_upgrade.dm
@@ -177,7 +177,7 @@
 					/datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
 	construction_time = 10 SECONDS
 	category = list(
-		RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL
+		RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SERVICE
 	)
 
 /obj/item/borg/upgrade/artistic
diff --git a/modular_zubbers/code/modules/research/designs/mechfab_designs.dm b/modular_zubbers/code/modules/research/designs/mechfab_designs.dm
index 0bd9850fbdd..f6bc1dccaeb 100644
--- a/modular_zubbers/code/modules/research/designs/mechfab_designs.dm
+++ b/modular_zubbers/code/modules/research/designs/mechfab_designs.dm
@@ -68,7 +68,7 @@
 	)
 
 /datum/design/borg_dominatrix
-	name = "borg dominatrix module"
+	name = "Cyborg dominatrix module"
 	id = "dominatrixmodule"
 	build_type = MECHFAB
 	build_path = /obj/item/borg/upgrade/dominatrixmodule
diff --git a/modular_zubbers/code/modules/research/techweb/all_nodes.dm b/modular_zubbers/code/modules/research/techweb/all_nodes.dm
index d3e510449df..b1df92aaae7 100644
--- a/modular_zubbers/code/modules/research/techweb/all_nodes.dm
+++ b/modular_zubbers/code/modules/research/techweb/all_nodes.dm
@@ -92,6 +92,13 @@
 	design_ids += list(
 		"blanksynth",
 		"dominatrixmodule",
+		"borg_upgrade_expand",
+		"borg_upgrade_shrink",
+	)
+
+/datum/techweb_node/borg_utility/New()
+	design_ids -= list(
+		"borg_upgrade_expand" // Moved to default robotics, always available. It provides no practical benefit so it shouldn't be here
 	)
 
 // Computer Tech