From 9cc747f29fb75f58495cc74ed8a378f9b4e13edb Mon Sep 17 00:00:00 2001
From: KateAnbolho <141269115+KateAnbolho@users.noreply.github.com>
Date: Sat, 20 Sep 2025 23:55:42 -0700
Subject: [PATCH] Fixes missing MODsuit armor buffs  (#4708)

## About The Pull Request

Due to a skyrat file all of the recent /tg/ MOD armor buffs were
overriden, how lovely
## Why It's Good For The Game

/tg/ intended even crew to have good space armor

## Proof Of Testing

works on my machine

</details>

## Changelog
:cl:

fix: Fixed Skyrat overriding new /tg/ MOD armor values

/:cl:

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
---
 .../code/modules/mod/mod_theme.dm             | 147 ++----------------
 1 file changed, 15 insertions(+), 132 deletions(-)

diff --git a/modular_skyrat/master_files/code/modules/mod/mod_theme.dm b/modular_skyrat/master_files/code/modules/mod/mod_theme.dm
index c8017166b4b..92f8cd041b9 100644
--- a/modular_skyrat/master_files/code/modules/mod/mod_theme.dm
+++ b/modular_skyrat/master_files/code/modules/mod/mod_theme.dm
@@ -1,12 +1,8 @@
 // -- Modular mod theme changes. -- (Modception.)
-
-/datum/mod_theme/engineering // Engineer
-	armor_type = /datum/armor/mod_theme_engineering
-
-/datum/armor/mod_theme_engineering
+/datum/armor/mod_theme_engineering  // Engineer
 	melee = 10
 	bullet = 5
-	laser = 10
+	laser = 20
 	energy = 10
 	bomb = 30
 	bio = 100
@@ -14,38 +10,29 @@
 	acid = 25
 	wound = 10
 
-/datum/mod_theme/atmospheric // Atmospheric Technician
-	armor_type = /datum/armor/mod_theme_atmospheric
-
-/datum/armor/mod_theme_atmospheric
+/datum/armor/mod_theme_atmospheric // Atmospheric Technician
 	melee = 10
 	bullet = 5
 	laser = 10
-	energy = 10
+	energy = 15
 	bomb = 40
 	bio = 100
 	fire = 100
 	acid = 75
 	wound = 10
 
-/datum/mod_theme/advanced // Chief Engineer
-	armor_type = /datum/armor/mod_theme_advanced
-
-/datum/armor/mod_theme_advanced
+/datum/armor/mod_theme_advanced  // Chief Engineer
 	melee = 30
 	bullet = 5
-	laser = 10
-	energy = 10
+	laser = 20
+	energy = 15
 	bomb = 50
 	bio = 100
 	fire = 100
 	acid = 90
 	wound = 10
 
-/datum/mod_theme/loader // Cargo
-	armor_type = /datum/armor/mod_theme_loader
-
-/datum/armor/mod_theme_loader
+/datum/armor/mod_theme_loader // Cargo
 	melee = 20
 	bullet = 5
 	laser = 10
@@ -56,24 +43,7 @@
 	acid = 25
 	wound = 10
 
-/datum/mod_theme/mining // Shaft Miner / Other half comes from the ashland booster
-	armor_type = /datum/armor/mod_theme_mining
-
-/datum/armor/mod_theme_mining
-	melee = 5
-	bullet = 5
-	laser = 5
-	energy = 5
-	bomb = 25
-	bio = 100
-	fire = 100
-	acid = 75
-	wound = 15
-
-/datum/mod_theme/medical // Paramedic / Medical Doctor
-	armor_type = /datum/armor/mod_theme_medical
-
-/datum/armor/mod_theme_medical
+/datum/armor/mod_theme_medical // Paramedic / Medical Doctor
 	melee = 10
 	bullet = 5
 	laser = 5
@@ -84,12 +54,9 @@
 	acid = 75
 	wound = 10
 
-/datum/mod_theme/rescue // Chief Medical Officer
-	armor_type = /datum/armor/mod_theme_rescue
-
-/datum/armor/mod_theme_rescue
+/datum/armor/mod_theme_rescue // Chief Medical Officer
 	melee = 20
-	bullet = 5
+	bullet = 10
 	laser = 10
 	energy = 10
 	bomb = 20
@@ -98,12 +65,9 @@
 	acid = 100
 	wound = 10
 
-/datum/mod_theme/research // Research Director
-	armor_type = /datum/armor/mod_theme_research
-
-/datum/armor/mod_theme_research
-	melee = 10
-	bullet = 5
+/datum/armor/mod_theme_research // Research Director
+	melee = 20
+	bullet = 15
 	laser = 20
 	energy = 20
 	bomb = 100
@@ -114,7 +78,6 @@
 
 /datum/mod_theme/security // Security Officer
 	default_skin = "security_blue"
-	armor_type = /datum/armor/mod_theme_security
 	variants = list(
 		"security" = list(
 			/obj/item/clothing/head/mod = list(
@@ -186,19 +149,7 @@
 		),
 	)
 
-/datum/armor/mod_theme_security
-	melee = 30
-	bullet = 20
-	laser = 20
-	energy = 30
-	bomb = 20
-	bio = 100
-	fire = 75
-	acid = 75
-	wound = 20
-
 /datum/mod_theme/safeguard // Head of Security
-	armor_type = /datum/armor/mod_theme_safeguard
 	default_skin = "safeguard_blue"
 	variants = list(
 		"safeguard" = list(
@@ -267,47 +218,7 @@
 		),
 	)
 
-/datum/armor/mod_theme_safeguard
-	melee = 40
-	bullet = 30
-	laser = 30
-	energy = 40
-	bomb = 30
-	bio = 100
-	fire = 100
-	acid = 95
-	wound = 25
-
-/datum/mod_theme/magnate // Captain
-	armor_type = /datum/armor/mod_theme_magnate
-
-/datum/armor/mod_theme_magnate
-	melee = 40
-	bullet = 40
-	laser = 40
-	energy = 40
-	bomb = 50
-	bio = 100
-	fire = 100
-	acid = 100
-	wound = 20
-
-/datum/mod_theme/cosmohonk // Clown
-	armor_type = /datum/armor/mod_theme_cosmohonk
-
-/datum/armor/mod_theme_cosmohonk
-	melee = 10
-	energy = 10
-	bomb = 10
-	bio = 100
-	fire = 50
-	acid = 25
-	wound = 5
-
-/datum/mod_theme/prototype // Charlie Station
-	armor_type = /datum/armor/mod_theme_prototype
-
-/datum/armor/mod_theme_prototype
+/datum/armor/mod_theme_prototype // Charlie Station
 	melee = 25
 	bullet = 5
 	laser = 20
@@ -318,34 +229,6 @@
 	acid = 75
 	wound = 5
 
-/datum/mod_theme/responsory // ERT
-	armor_type = /datum/armor/mod_theme_responsory
-
-/datum/armor/mod_theme_responsory
-	melee = 40
-	bullet = 30
-	laser = 30
-	energy = 40
-	bomb = 50
-	bio = 100
-	fire = 100
-	acid = 90
-	wound = 15
-
-/datum/mod_theme/corporate // Centcom Commander
-	armor_type = /datum/armor/mod_theme_corporate
-
-/datum/armor/mod_theme_corporate
-	melee = 50
-	bullet = 50
-	laser = 50
-	energy = 50
-	bomb = 50
-	bio = 100
-	fire = 100
-	acid = 100
-	wound = 15
-
 /datum/mod_theme/asset_protection
 	name = "Asset Protection"
 	desc = "A weaker version of the Apocryphal Modsuit, chiefly worn by Nanotrasen Asset Protection."