Reverts Sojourn's PR 5029 armour changes

code/__DEFINES/mobs.dm

@@ -89,7 +89,7 @@
 #define DEFAULT_ATTACK_COOLDOWN 8 //Default timeout for aggressive actions
 #define DEFAULT_QUICK_COOLDOWN  4
 
-#define FAST_WEAPON_COOLDOWN -2
+#define FAST_WEAPON_COOLDOWN 3
 #define DEFAULT_WEAPON_COOLDOWN 5
 #define SLOW_WEAPON_COOLDOWN 7
 
@@ -116,23 +116,23 @@
 // Mobs may have multiple types, attached to a max() operator.  this is mostly because some 'miscelaneous' mobs are grouped more generally.
 // If you don't see something here that seems to fit what you want, it may very well not have a define.
 #define ROACH_HEALTH_MOD         1            //all roaches other than kaisers./
-#define SPIDER_HEALTH_MOD        0.5          //all spiders other than reapers./
-#define TERMITE_HEALTH_MOD       0.5          //all termites./
-#define CAVEMOB_HEALTH_MOD       0.70         //wurms, Sargoyle./
-#define AMGOLEM_HEALTH_MOD       0.70         //ameridien golems./
+#define SPIDER_HEALTH_MOD        1            //all spiders other than reapers./
+#define TERMITE_HEALTH_MOD       1            //all termites./
+#define CAVEMOB_HEALTH_MOD       1            //wurms, Sargoyle./
+#define AMGOLEM_HEALTH_MOD       1            //ameridien golems./
 #define CHURCHMOB_HEALTH_MOD     1            //Rooks and other church related mobs.
 #define XENOMORPH_HEALTH_MOD     1            //Xenos, duh. includes queens.
 #define REPUBLICON_HEALTH_MOD    1            //preppers bots, including seekers and drones.
-#define GREYSONWEAK_HEALTH_MOD   0.8          //Weak greyson bots
-#define GREYSONROBUST_HEALTH_MOD 0.70         //Strong greyson bots
+#define GREYSONWEAK_HEALTH_MOD   1            //Weak greyson bots
+#define GREYSONROBUST_HEALTH_MOD 1            //Strong greyson bots
 #define CARP_HEALTH_MOD          1            //All space carp./
-#define VOIDWOLF_HEALTH_MOD      0.75         //all voidwolves other than reavers.
+#define VOIDWOLF_HEALTH_MOD      1            //all voidwolves other than reavers.
 #define MEGAFAUNA_HEALTH_MOD     1            //all megafauna other than levaiathans. Renders, mukwah, nightmare stalkers.
 #define VOXBIRD_HEALTH_MOD       1            //all the tribal birds./
-#define EXCELSIOR_HEALTH_MOD     0.7          //all the excelsior mobs, including mindslaves, and bears.
+#define EXCELSIOR_HEALTH_MOD     1            //all the excelsior mobs, including mindslaves, and bears.
 #define LEVIATHAN_HEALTH_MOD     1            //leviathans; Kaiser, Reaper, Patriarch, etc./
-#define PSIMOB_HEALTH_MOD        0.5          //Deepmaints mobs other than bosses./
-#define DVEY_HEALTH_MOD          0.6          //'corrupted beings', I.E Daskvey and their pets./
+#define PSIMOB_HEALTH_MOD        1            //Deepmaints mobs other than bosses./
+#define DVEY_HEALTH_MOD          1            //'corrupted beings', I.E Daskvey and their pets./
 #define PSIBOSS_HEALTH_MOD       1            //deepmaints bosses, be careful with this one. it's generally preferable to manually tweak them because they're...yknow, uniques./
 
 

code/__DEFINES/weapons.dm

@@ -12,14 +12,13 @@
 #define WEAPON_FORCE_GODLIKE		88 // currently only used by the energy axe, which can only be obtained via admin verbs
 
 //Armor Penetration: Ignores a certain amount of armor for the purposes of inflicting damage.
-#define ARMOR_PEN_GRAZING			1.2
-#define ARMOR_PEN_SHALLOW			1.4
-#define ARMOR_PEN_MODERATE			1.6
-#define ARMOR_PEN_DEEP				1.8
-#define ARMOR_PEN_HALF				2
-#define ARMOR_PEN_EXTREME			2.5
-#define ARMOR_PEN_MASSIVE			3
-#define ARMOR_PEN_MAX				10
+#define ARMOR_PEN_GRAZING			5
+#define ARMOR_PEN_SHALLOW			10
+#define ARMOR_PEN_MODERATE			15
+#define ARMOR_PEN_DEEP				20
+#define ARMOR_PEN_EXTREME			25
+#define ARMOR_PEN_MASSIVE			30
+#define ARMOR_PEN_HALF				50
 
 //Wounding Multiplier: Increases damage taken, applied after armor.
 #define WOUNDING_HARMLESS			0.25
@@ -84,10 +83,10 @@ Fire delay 15 = 40 rounds per minute
 */
 
 //Quick defines for fire modes
-#define FULL_AUTO_150		list(mode_name = "full auto",    mode_desc = "150 rounds per minute",   mode_type = /datum/firemode/automatic, fire_delay = 4  , icon="auto")
-#define FULL_AUTO_200		list(mode_name = "full auto",    mode_desc = "200 rounds per minute",   mode_type = /datum/firemode/automatic, fire_delay = 3  , icon="auto")
-#define FULL_AUTO_300		list(mode_name = "full auto",    mode_desc = "300 rounds per minute",   mode_type = /datum/firemode/automatic, fire_delay = 2  , icon="auto")
-#define FULL_AUTO_600		list(mode_name = "fuller auto",  mode_desc = "600 rounds per minute",   mode_type = /datum/firemode/automatic, fire_delay = 1  , icon="fuller")
+#define FULL_AUTO_150		list(mode_name = "full auto",    mode_desc = "150 rounds per minute",   mode_type = /datum/firemode/automatic, fire_delay = 4  , icon="auto", damage_mult_add = -0.2)
+#define FULL_AUTO_200		list(mode_name = "full auto",    mode_desc = "200 rounds per minute",   mode_type = /datum/firemode/automatic, fire_delay = 3  , icon="auto", damage_mult_add = -0.2)
+#define FULL_AUTO_300		list(mode_name = "full auto",    mode_desc = "300 rounds per minute",   mode_type = /datum/firemode/automatic, fire_delay = 2  , icon="auto", damage_mult_add = -0.2)
+#define FULL_AUTO_600		list(mode_name = "fuller auto",  mode_desc = "600 rounds per minute",   mode_type = /datum/firemode/automatic, fire_delay = 1  , icon="fuller", damage_mult_add = -0.2)
 
 #define FULL_AUTO_150_NOLOSS		list(mode_name = "full auto",    mode_desc = "150 rounds per minute",   mode_type = /datum/firemode/automatic, fire_delay = 4  , icon="auto")
 #define FULL_AUTO_200_NOLOSS		list(mode_name = "full auto",    mode_desc = "200 rounds per minute",   mode_type = /datum/firemode/automatic, fire_delay = 3  , icon="auto")

code/_onclick/item_attack.dm

@@ -285,7 +285,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
 			if(!i==0)
 				T = get_step(T, get_dir(user, A))
 				force = force * 0.8 //20% less damage each step forwards
-				armor_divisor -= 0.2 //Lower AD a little, per tile
+				armor_penetration -= 10 //Lower AP a little, per tile
 			//else
 				//message_admins("0th tile bypassed")
 
@@ -357,7 +357,6 @@ avoid code duplication. This includes items that may sometimes act as a standard
 
 	if (is_hot() >= HEAT_MOBIGNITE_THRESHOLD)
 		target.IgniteMob()
-
 	var/power = force
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
@@ -366,8 +365,8 @@ avoid code duplication. This includes items that may sometimes act as a standard
 		power *= H.damage_multiplier
 		if(H.holding_back)
 			power /= 2
-	if(HULK in user.mutations)
-		power *= 2
+//	if(HULK in user.mutations)
+//		power *= 2
 	if(target.faction in effective_faction) // Is the mob's in our list of factions we're effective against?
 		power *= damage_mult // Increase the damage
 	target.hit_with_weapon(src, user, power, hit_zone)

code/datums/stat_modifiers/mob_modifiers.dm

@@ -21,9 +21,9 @@
 	var/inherent_projectile_increment_adjustment
 
 	/// Any projectiles fired by the holder will have their armor penetration increased by this much, added after the mult
-	var/projectile_armor_divisor_adjustment
+	var/projectile_armor_penetration_adjustment
 	/// Any projectiles fired by the holder will have their armor penetration multiplied by this much, added first
-	var/projectile_armor_divisor_mult_increment
+	var/projectile_armor_penetration_mult_increment
 
 	/// Inverted, lower = higher speed
 	var/projectile_speed_increment_adjustment
@@ -66,10 +66,10 @@
 			for (var/entry in projectile_damage_mult)
 				livingholder.projectile_damage_mult[entry] = ZERO_OR_MORE((livingholder.projectile_damage_mult[entry] - projectile_damage_mult[entry]))
 
-		if (projectile_armor_divisor_adjustment)
-			livingholder.projectile_armor_divisor_adjustment = ZERO_OR_MORE((livingholder.projectile_armor_divisor_adjustment - projectile_armor_divisor_adjustment))
-		if (projectile_armor_divisor_mult_increment)
-			livingholder.projectile_armor_divisor_mult = ZERO_OR_MORE((livingholder.projectile_armor_divisor_mult - projectile_armor_divisor_mult_increment))
+		if (projectile_armor_penetration_adjustment)
+			livingholder.projectile_armor_penetration_adjustment = ZERO_OR_MORE((livingholder.projectile_armor_penetration_adjustment - projectile_armor_penetration_adjustment))
+		if (projectile_armor_penetration_mult_increment)
+			livingholder.projectile_armor_penetration_mult = ZERO_OR_MORE((livingholder.projectile_armor_penetration_mult - projectile_armor_penetration_mult_increment))
 
 		if (projectile_speed_increment_adjustment)
 			livingholder.projectile_speed_increment = ZERO_OR_MORE((livingholder.projectile_speed_increment - projectile_speed_increment_adjustment))
@@ -110,10 +110,10 @@
 			for (var/entry in projectile_damage_mult)
 				livingtarget.projectile_damage_mult[entry] = ZERO_OR_MORE((livingtarget.projectile_damage_mult[entry] + projectile_damage_mult[entry]))
 
-		if (projectile_armor_divisor_adjustment)
-			livingtarget.projectile_armor_divisor_adjustment = ZERO_OR_MORE((livingtarget.projectile_armor_divisor_adjustment + projectile_armor_divisor_adjustment))
-		if (projectile_armor_divisor_mult_increment)
-			livingtarget.projectile_armor_divisor_mult = ZERO_OR_MORE((livingtarget.projectile_armor_divisor_mult + projectile_armor_divisor_mult_increment))
+		if (projectile_armor_penetration_adjustment)
+			livingtarget.projectile_armor_penetration_adjustment = ZERO_OR_MORE((livingtarget.projectile_armor_penetration_adjustment + projectile_armor_penetration_adjustment))
+		if (projectile_armor_penetration_mult_increment)
+			livingtarget.projectile_armor_penetration_mult = ZERO_OR_MORE((livingtarget.projectile_armor_penetration_mult + projectile_armor_penetration_mult_increment))
 
 		if (projectile_speed_increment_adjustment)
 			livingtarget.projectile_speed_increment = ZERO_OR_MORE((livingtarget.projectile_speed_increment + projectile_speed_increment_adjustment))

code/datums/stat_modifiers/modifiers/mob/superior/armor.dm

@@ -92,9 +92,9 @@
 
 /datum/stat_modifier/mob/living/carbon/superior_animal/armor/flat/positive/low
 	armor_adjustment = list(
-		melee = 2,
-		bullet = 2,
-		energy = 2,
+		melee = 10,
+		bullet = 10,
+		energy = 10,
 		bomb = 10,
 		bio = 10,
 		rad = 10,
@@ -103,9 +103,9 @@
 
 /datum/stat_modifier/mob/living/carbon/superior_animal/armor/flat/positive/medium
 	armor_adjustment = list(
-		melee = 3,
-		bullet = 3,
-		energy = 3,
+		melee = 20,
+		bullet = 20,
+		energy = 20,
 		bomb = 20,
 		bio = 20,
 		rad = 20,
@@ -114,9 +114,9 @@
 
 /datum/stat_modifier/mob/living/carbon/superior_animal/armor/flat/positive/high
 	armor_adjustment = list(
-		melee = 4,
-		bullet = 4,
-		energy = 4,
+		melee = 30,
+		bullet = 30,
+		energy = 30,
 		bomb = 30,
 		bio = 30,
 		rad = 30,
@@ -161,9 +161,9 @@
 
 /datum/stat_modifier/mob/living/carbon/superior_animal/armor/flat/negative/low
 	armor_adjustment = list(
-		melee = -2,
-		bullet = -2,
-		energy = -2,
+		melee = -10,
+		bullet = -10,
+		energy = -10,
 		bomb = -10,
 		bio = -10,
 		rad = -10,
@@ -172,9 +172,9 @@
 
 /datum/stat_modifier/mob/living/carbon/superior_animal/armor/flat/negative/medium
 	armor_adjustment = list(
-		melee = -5,
-		bullet = -5,
-		energy = -5,
+		melee = -20,
+		bullet = -20,
+		energy = -20,
 		bomb = -20,
 		bio = -20,
 		rad = -20,
@@ -183,9 +183,9 @@
 
 /datum/stat_modifier/mob/living/carbon/superior_animal/armor/flat/negative/high
 	armor_adjustment = list(
-		melee = -7,
-		bullet = -7,
-		energy = -7,
+		melee = -30,
+		bullet = -30,
+		energy = -30,
 		bomb = -30,
 		bio = -30,
 		rad = -30,

code/datums/stat_modifiers/modifiers/mob/superior/ranged/ranged_modifiers.dm

@@ -1,7 +1,7 @@
 /datum/stat_modifier/mob/living/carbon/superior_animal/deadeye
 
 	inherent_projectile_mult_increment = 1 //a little more dps, but more easily avoided
-	projectile_armor_divisor_mult_increment = 1.25
+	projectile_armor_penetration_mult_increment = 0.25
 
 	delay_for_range_mult = 1.4
 	delay_for_rapid_range_mult = 1.4
@@ -34,7 +34,7 @@
 	rapid_fire_shooting_amount_mult = 2 //pretty noticable damage increase
 	delay_for_rapid_range_mult = 0.5 //half the delay
 
-	projectile_armor_divisor_mult_increment = -0.5 //significantly worse armor penetration because they're just shooting whatever part of you they can
+	projectile_armor_penetration_mult_increment = -0.5 //significantly worse armor penetration because they're just shooting whatever part of you they can
 
 	inherent_projectile_mult_increment = -0.3 // but still with higher DPS because theyre shooting you twice as much for 70% damage
 

code/datums/stat_modifiers/modifiers/mob/superior/roach_modifiers.dm

@@ -1,13 +1,13 @@
 /datum/stat_modifier/mob/living/carbon/superior_animal/biosilicified
 
 	armor_adjustment = list(
-	melee = 2,
-	bullet = 1,
+	melee = 10,
+	bullet = 5,
 	bomb = 10,
 	agony = 15 //Rubbers deal way less to us!
 	)
 
-	armor_divisor_increment = 1.5
+	armor_penetration_increment = 15
 
 	stattags = DEFENSE_STATTAG | MELEE_STATTAG
 
@@ -18,12 +18,12 @@
 /datum/stat_modifier/mob/living/carbon/superior_animal/lambertian
 
 	armor_adjustment = list(
-	energy = 2,
-	agony = 1
+	energy = 10,
+	agony = 10
 	)
 
 	flash_resistances_increment = 2
-	armor_divisor_increment = 1.15
+	armor_penetration_increment = 5
 
 	stattags = DEFENSE_STATTAG
 

code/datums/stat_modifiers/modifiers/mob/superior/special/special_modifiers.dm

@@ -29,20 +29,20 @@
 /datum/stat_modifier/mob/living/carbon/superior_animal/aggressive/savage
 
 	armor_adjustment = list(
-		melee = -10,
-		bullet = -8,
-		energy = -8,
+		melee = -40,
+		bullet = -35,
+		energy = -35,
 		bomb = -40,
-		agony = 12 //it doesnt care, it just wants you dead
+		agony = 50 //it doesnt care, it just wants you dead
 	)
 
 	maxHealth_mult = 0.8 //80% hp
 
 	move_to_delay_increment = -1.3 // fast
 
-	projectile_armor_divisor_mult_increment = 0.5
-	armor_divisor_mult = 1.5
-	armor_divisor_zeroth = 0.1
+	projectile_armor_penetration_mult_increment = 0.5
+	armor_penetration_mult = 1.5
+	armor_penetration_zeroth = 0.1
 
 	melee_damage_lower_mult = 1.5
 	melee_damage_upper_mult = 1.5

code/datums/stat_modifiers/modifiers/mob/superior/spider_modifiers.dm

@@ -5,7 +5,7 @@
 	)
 
 	flash_resistances_increment = 2
-	armor_divisor_increment = 1.25
+	armor_penetration_increment = 15
 
 	prefix = "Lustrous"
 
@@ -16,13 +16,13 @@
 /datum/stat_modifier/mob/living/carbon/superior_animal/durable/spider
 
 	armor_adjustment = list(
-		melee = 1,
-		bullet = 1,
+		melee = 5,
+		bullet = 5,
 		bomb = 15,
-		agony = 7
+		agony = 30
 	)
 
-	armor_divisor_increment = 1.1
+	armor_penetration_increment = 5
 	flash_resistances_increment = 1
 	maxHealth_increment = 20
 
@@ -33,10 +33,10 @@
 /datum/stat_modifier/mob/living/carbon/superior_animal/young/spider
 
 	armor_adjustment = list(
-		melee = -1,
-		bullet = -1,
-		energy = -1,
-		agony = -1
+		melee = -5,
+		bullet = -5,
+		energy = -5,
+		agony = -5
 	)
 
 	maxHealth_increment = -10
@@ -51,10 +51,10 @@
 /datum/stat_modifier/mob/living/carbon/superior_animal/old/spider
 
 	armor_adjustment = list(
-		melee = 1,
-		bullet = 1,
+		melee = 5,
+		bullet = 5,
 		bomb = 10,
-		agony = 5 //just cant feel it
+		agony = 20 //just cant feel it
 	)
 
 	maxHealth_increment = 20 //life already seen them by
@@ -71,7 +71,7 @@
 		bomb = 5,
 		bio = 15,
 		rad = 15,
-		agony = 2
+		agony = 10
 	)
 
 	stattags = DEFENSE_STATTAG | MELEE_STATTAG