From 10e4613d550698e16420df1d1f167ae7815d5f2c Mon Sep 17 00:00:00 2001
From: CDB <87905328+cdb-is-not-good@users.noreply.github.com>
Date: Sat, 17 Feb 2024 12:11:47 -0800
Subject: [PATCH] mob armor nukiing. (#5025)

Generally reduces common mobs armor by up to half. Particularly energy/bullet armor with the sole exception of strangers who've been given a bit more energy/bullet armor and less melee armor.

Deepmaints mobs not touched. Megafauna not touched(for now). This is mostly roaches/spiders/termites and jungle birds(some of them had ablative armor equivilents).

This will likely need a lotta tweak before it's ready to go to market.
---
 .../superior_animal/giant_spider/giant_spider.dm     |  2 +-
 .../giant_spider/types/hunter/hunter.dm              |  4 ++--
 .../superior_animal/giant_spider/types/nurse.dm      |  4 ++--
 .../living/carbon/superior_animal/human/stranger.dm  |  2 +-
 .../mob/living/carbon/superior_animal/roach/roach.dm |  2 +-
 .../carbon/superior_animal/roach/types/fuhrer.dm     |  2 +-
 .../carbon/superior_animal/roach/types/glowing.dm    |  2 +-
 .../carbon/superior_animal/roach/types/roachling.dm  |  4 ++--
 .../carbon/superior_animal/roach/types/tank.dm       |  2 +-
 .../living/carbon/superior_animal/termite/termite.dm | 12 ++++++------
 .../carbon/superior_animal/vox/types/vox_types.dm    |  4 ++--
 .../carbon/superior_animal/wurms/types/wurm.dm       | 10 +++++-----
 12 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/code/modules/mob/living/carbon/superior_animal/giant_spider/giant_spider.dm b/code/modules/mob/living/carbon/superior_animal/giant_spider/giant_spider.dm
index a2f6d671eba..1318f01eb42 100644
--- a/code/modules/mob/living/carbon/superior_animal/giant_spider/giant_spider.dm
+++ b/code/modules/mob/living/carbon/superior_animal/giant_spider/giant_spider.dm
@@ -20,7 +20,7 @@
 	get_stat_modifier = TRUE //We get randomized addition armor
 	armor_penetration = 5
 
-	armor = list(melee = 5, bullet = 5, energy = 5, bomb = 5, bio = 10, rad = 25)
+	armor = list(melee = 5, bullet = 0, energy = 0, bomb = 5, bio = 10, rad = 25)
 
 	allowed_stat_modifiers = list(
 		/datum/stat_modifier/mob/living/carbon/superior_animal/lustrous = 33,
diff --git a/code/modules/mob/living/carbon/superior_animal/giant_spider/types/hunter/hunter.dm b/code/modules/mob/living/carbon/superior_animal/giant_spider/types/hunter/hunter.dm
index ef9a37711c2..d7e0f3595e5 100644
--- a/code/modules/mob/living/carbon/superior_animal/giant_spider/types/hunter/hunter.dm
+++ b/code/modules/mob/living/carbon/superior_animal/giant_spider/types/hunter/hunter.dm
@@ -70,7 +70,7 @@
 	melee_damage_upper = 25
 	emote_see = list("chitters.","rubs its legs.","thumps its many legs on the ground.")
 	mob_size = MOB_LARGE
-	armor = list(melee = 15, bullet = 15, energy = 5, bomb = 5, bio = 10, rad = 25, agony = 0)
+	armor = list(melee = 15, bullet = 10, energy = 5, bomb = 5, bio = 10, rad = 25, agony = 0)
 
 
 /mob/living/carbon/superior_animal/giant_spider/tarantula/UnarmedAttack(var/atom/A, var/proximity)
@@ -204,7 +204,7 @@
 	flash_resistances = 3 //For balance against are speedy fello
 	poison_type = "party drops"
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/spider/emperor
-	armor = list(melee = 25, bullet = 25, energy = 15, bomb = 25, bio = 10, rad = 25, agony = 0)
+	armor = list(melee = 25, bullet = 10, energy = 5, bomb = 25, bio = 10, rad = 25, agony = 0)
 	armor_penetration = 25
 
 	get_stat_modifier = FALSE //Were not getting armor
diff --git a/code/modules/mob/living/carbon/superior_animal/giant_spider/types/nurse.dm b/code/modules/mob/living/carbon/superior_animal/giant_spider/types/nurse.dm
index 9a63db35307..ad1dbe67f0c 100644
--- a/code/modules/mob/living/carbon/superior_animal/giant_spider/types/nurse.dm
+++ b/code/modules/mob/living/carbon/superior_animal/giant_spider/types/nurse.dm
@@ -88,7 +88,7 @@
 	icon_living = "webslinger"
 	emote_see = list("chitters.","rubs its legs.","trails webs through its hairs.","screeches.","bounces happily in place!")
 	web_activity = 70
-	armor = list(melee = 15, bullet = 10, energy = 5, bomb = 5, bio = 10, rad = 25, agony = 0)
+	armor = list(melee = 15, bullet = 10, energy = 0, bomb = 5, bio = 10, rad = 25, agony = 0)
 
 /mob/living/carbon/superior_animal/giant_spider/nurse/recluse
 	name = "recluse spider"
@@ -126,7 +126,7 @@
 	egg_inject_chance = 10 //Likely
 	//Giving the queen her own meat type which contains MENACE.
 	mob_size = MOB_LARGE
-	armor = list(melee = 15, bullet = 10, energy = 5, bomb = 5, bio = 10, rad = 25, agony = 0)
+	armor = list(melee = 15, bullet = 0, energy = 0, bomb = 5, bio = 10, rad = 25, agony = 0)
 	inherent_mutations = list(MUTATION_GIGANTISM, MUTATION_SPIDER_FRIEND, MUTATION_RAND_UNSTABLE, MUTATION_RAND_UNSTABLE, MUTATION_RAND_UNSTABLE)
 	armor_penetration = 35
 
diff --git a/code/modules/mob/living/carbon/superior_animal/human/stranger.dm b/code/modules/mob/living/carbon/superior_animal/human/stranger.dm
index c9e5f52549d..ca1bc620edc 100644
--- a/code/modules/mob/living/carbon/superior_animal/human/stranger.dm
+++ b/code/modules/mob/living/carbon/superior_animal/human/stranger.dm
@@ -20,7 +20,7 @@
 	status_flags = CANPUSH
 	ranged = TRUE
 	rapid = TRUE
-	armor = list(melee = 25, bullet = 15, energy = 25, bomb = 25, bio = 100, rad = 100) //Were in a space suit thing?
+	armor = list(melee = 10, bullet = 35, energy = 40, bomb = 25, bio = 100, rad = 100) //Were in a space suit thing?
 	projectiletype = /obj/item/projectile/plasma/heavy
 	projectilesound = 'sound/weapons/guns/unknown_spacegun_vaporize.ogg'
 	faction = "bluespace"
diff --git a/code/modules/mob/living/carbon/superior_animal/roach/roach.dm b/code/modules/mob/living/carbon/superior_animal/roach/roach.dm
index be6e8db27c9..b017f4dd846 100644
--- a/code/modules/mob/living/carbon/superior_animal/roach/roach.dm
+++ b/code/modules/mob/living/carbon/superior_animal/roach/roach.dm
@@ -15,7 +15,7 @@
 
 	get_stat_modifier = TRUE //We get randomized addition armor
 
-	armor = list(melee = 10, bullet = 5, energy = 0, bomb = 5, bio = 20, rad = 0, agony = 0)
+	armor = list(melee = 5, bullet = 0, energy = 0, bomb = 5, bio = 20, rad = 100, agony = 0)
 
 	allowed_stat_modifiers = list(
 		/datum/stat_modifier/mob/living/carbon/superior_animal/biosilicified = 26,
diff --git a/code/modules/mob/living/carbon/superior_animal/roach/types/fuhrer.dm b/code/modules/mob/living/carbon/superior_animal/roach/types/fuhrer.dm
index 4971810cace..4618dbc62ee 100644
--- a/code/modules/mob/living/carbon/superior_animal/roach/types/fuhrer.dm
+++ b/code/modules/mob/living/carbon/superior_animal/roach/types/fuhrer.dm
@@ -21,7 +21,7 @@
 
 	flash_resistances = 5 //half stuns by flash, so we can still get up and be in the fight!
 
-	armor = list(melee = 15, bullet = 15, energy = 5, bomb = 5, bio = 20, rad = 0, agony = 0)
+	armor = list(melee = 10, bullet = 10, energy = 5, bomb = 5, bio = 20, rad = 0, agony = 0)
 	armor_penetration = 25
 
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat/fuhrer
diff --git a/code/modules/mob/living/carbon/superior_animal/roach/types/glowing.dm b/code/modules/mob/living/carbon/superior_animal/roach/types/glowing.dm
index b4ed048e9ba..05b4db91248 100644
--- a/code/modules/mob/living/carbon/superior_animal/roach/types/glowing.dm
+++ b/code/modules/mob/living/carbon/superior_animal/roach/types/glowing.dm
@@ -14,7 +14,7 @@
 
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat/glowing
 
-	armor = list(melee = 10, bullet = 5, energy = 0, bomb = 5, bio = 20, rad = 100, agony = 0)
+	armor = list(melee = 5, bullet = 0, energy = 0, bomb = 5, bio = 20, rad = 100, agony = 0)
 
 	contaminant_immunity = TRUE
 	toxin_immune = TRUE
diff --git a/code/modules/mob/living/carbon/superior_animal/roach/types/roachling.dm b/code/modules/mob/living/carbon/superior_animal/roach/types/roachling.dm
index edde856db4b..276b1323f1a 100644
--- a/code/modules/mob/living/carbon/superior_animal/roach/types/roachling.dm
+++ b/code/modules/mob/living/carbon/superior_animal/roach/types/roachling.dm
@@ -12,7 +12,7 @@
 	melee_damage_lower = 2
 	melee_damage_upper = 3
 
-	armor = list(melee = 5, bullet = 0, energy = 0, bomb = 0, bio = 5, rad = 0, agony = 0)
+	armor = list(melee = 0, bullet = 0, energy = 0, bomb = 0, bio = 5, rad = 0, agony = 0)
 
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat
 	meat_amount = 1
@@ -57,4 +57,4 @@
 			else if(ispath(spawn_type, /mob))
 				var/mob/living/carbon/superior_animal/roach/roach = new spawn_type(src.loc, src)
 				roach.friends += src.friends
-			qdel(src)
\ No newline at end of file
+			qdel(src)
diff --git a/code/modules/mob/living/carbon/superior_animal/roach/types/tank.dm b/code/modules/mob/living/carbon/superior_animal/roach/types/tank.dm
index ce502f3e3c2..62ea34a2002 100644
--- a/code/modules/mob/living/carbon/superior_animal/roach/types/tank.dm
+++ b/code/modules/mob/living/carbon/superior_animal/roach/types/tank.dm
@@ -12,7 +12,7 @@
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat/panzer
 	knockdown_odds = 3
 
-	armor = list(melee = 15, bullet = 10, energy = 5, bomb = 5, bio = 20, rad = 0, agony = 0)
+	armor = list(melee = 15, bullet = 10, energy = 10, bomb = 5, bio = 20, rad = 0, agony = 0)
 	armor_penetration = 15
 
 // Panzers won't slip over on water or soap.
diff --git a/code/modules/mob/living/carbon/superior_animal/termite/termite.dm b/code/modules/mob/living/carbon/superior_animal/termite/termite.dm
index fe5b7565de1..8e705b1dfb8 100644
--- a/code/modules/mob/living/carbon/superior_animal/termite/termite.dm
+++ b/code/modules/mob/living/carbon/superior_animal/termite/termite.dm
@@ -162,7 +162,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
 	melee_damage_upper = TERMITE_DMG_MED
 
 //Armor related variables
-	armor = list(melee = 20, bullet = 35, energy = 35, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 15, bullet = 20, energy = 20, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/iron
@@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
 	melee_damage_upper = TERMITE_DMG_HIGH
 
 //Armor related variables
-	armor = list(melee = 35, bullet = 59, energy = 20, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 20, bullet = 30, energy = 10, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/silver
@@ -217,7 +217,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
 	melee_damage_upper = TERMITE_DMG_LOW
 
 //Armor related variables
-	armor = list(melee = 50, bullet = 35, energy = 20, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 30, bullet = 20, energy = 10, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/uranium
@@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
 	melee_damage_upper = TERMITE_DMG_MED
 
 //Armor related variables
-	armor = list(melee = 20, bullet = 30, energy = 50, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 10, bullet = 20, energy = 25, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/plasma
@@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
 	melee_damage_upper = TERMITE_DMG_HIGH
 
 //Armor related variables
-	armor = list(melee = 25, bullet = 40, energy = 50, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 15, bullet = 20, energy = 25, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/diamond
@@ -302,7 +302,7 @@ GLOBAL_LIST_INIT(termites_special, list(/mob/living/carbon/superior_animal/termi
 	ranged = TRUE
 
 //Armor related variables
-	armor = list(melee = 50, bullet = 30, energy = 40, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 30, bullet = 20, energy = 15, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/osmium
diff --git a/code/modules/mob/living/carbon/superior_animal/vox/types/vox_types.dm b/code/modules/mob/living/carbon/superior_animal/vox/types/vox_types.dm
index 810ec37db8c..98babe78d19 100644
--- a/code/modules/mob/living/carbon/superior_animal/vox/types/vox_types.dm
+++ b/code/modules/mob/living/carbon/superior_animal/vox/types/vox_types.dm
@@ -44,7 +44,7 @@
 
 	reload_message = "picks up a rock!"
 
-	armor = list(melee = 40, bullet = 30, energy = 10, bomb = 50, bio = 0, rad = 0)
+	armor = list(melee = 20, bullet = 15, energy = 5, bomb = 50, bio = 0, rad = 0)
 
 	ranged = FALSE
 
@@ -133,7 +133,7 @@
 
 	knock_over_odds = 30
 
-	armor = list(melee = 50, bullet = 40,  bomb = 60, bio = 0, rad = 0)
+	armor = list(melee = 30, bullet = 20,  bomb = 60, bio = 0, rad = 0)
 	ranged = FALSE
 
 	can_burrow = TRUE
diff --git a/code/modules/mob/living/carbon/superior_animal/wurms/types/wurm.dm b/code/modules/mob/living/carbon/superior_animal/wurms/types/wurm.dm
index c2f0da400a5..d39b1f44cc5 100644
--- a/code/modules/mob/living/carbon/superior_animal/wurms/types/wurm.dm
+++ b/code/modules/mob/living/carbon/superior_animal/wurms/types/wurm.dm
@@ -153,7 +153,7 @@ GLOBAL_LIST_INIT(wurms_special, list(/mob/living/carbon/superior_animal/wurm/osm
 	melee_damage_upper = WURM_DMG_MED
 
 //Armor related variables
-	armor = list(melee = 20, bullet = 35, energy = 35, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 10, bullet = 15, energy = 15, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/iron
@@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(wurms_special, list(/mob/living/carbon/superior_animal/wurm/osm
 	melee_damage_upper = WURM_DMG_LOW
 
 //Armor related variables
-	armor = list(melee = 50, bullet = 35, energy = 20, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 25, bullet = 20, energy = 10, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/silver
@@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(wurms_special, list(/mob/living/carbon/superior_animal/wurm/osm
 	melee_damage_upper = WURM_DMG_MED
 
 //Armor related variables
-	armor = list(melee = 35, bullet = 59, energy = 20, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 15, bullet = 30, energy = 10, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/osmium
@@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(wurms_special, list(/mob/living/carbon/superior_animal/wurm/osm
 	melee_damage_upper = WURM_DMG_MED
 
 //Armor related variables
-	armor = list(melee = 20, bullet = 35, energy = 50, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 20, bullet = 20, energy = 25, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/osmium
@@ -261,7 +261,7 @@ GLOBAL_LIST_INIT(wurms_special, list(/mob/living/carbon/superior_animal/wurm/osm
 	melee_damage_upper = WURM_DMG_MED
 
 //Armor related variables
-	armor = list(melee = 20, bullet = 35, energy = 50, bomb = 50, bio = 100, rad = 0)
+	armor = list(melee = 20, bullet = 20, energy = 25, bomb = 50, bio = 100, rad = 0)
 
 //Loot related variables
 	ore = /obj/item/stack/ore/iron // given something just in case.