Merge pull request #2635 from ARF-SS13/over-powered-power-overmer

Rebalances PA

code/game/objects/effects/spawners/masterlootdrop.dm

@@ -109,7 +109,7 @@
 	name = "rare high-value loot, found in dangerous dungeons"
 	icon_state = "x7"
 	loot = list(
-		/obj/effect/spawner/lootdrop/f13/rare_weps = 1,
+		/obj/effect/spawner/lootdrop/f13/rare_weps = 3,
 		/obj/effect/spawner/lootdrop/f13/rare_armor = 1,
 		/obj/effect/spawner/lootdrop/f13/rare_mods = 1,
 	)
@@ -895,15 +895,15 @@
 /obj/effect/spawner/lootdrop/f13/rare_armor
 	name = "rare armor"
 	loot = list(
-		/obj/effect/spawner/bundle/f13/armor/t45b_salvaged = 5,
-		/obj/effect/spawner/bundle/f13/armor/riot = 10,
-		/obj/effect/spawner/bundle/f13/armor/combat/mk2 = 10,
-		/obj/effect/spawner/bundle/f13/armor/combat/mk2/dark = 10,
+		/obj/effect/spawner/bundle/f13/armor/t45b_salvaged = 20,
+		/obj/effect/spawner/bundle/f13/armor/riot = 40,
+		/obj/effect/spawner/bundle/f13/armor/combat/mk2 = 40,
+		/obj/effect/spawner/bundle/f13/armor/combat/mk2/dark = 40,
 		/obj/effect/spawner/bundle/f13/armor/hotrodpa = 2,
 		/obj/effect/spawner/bundle/f13/armor/t45d = 1,
-		/obj/item/clothing/suit/armor/heavy/riot/retrofitted = 5,
-		/obj/item/clothing/suit/armor/heavy/riot/vault = 5,
-		/obj/item/clothing/suit/armor/heavy/riot/marine = 5,
+		/obj/item/clothing/suit/armor/heavy/riot/retrofitted = 20,
+		/obj/item/clothing/suit/armor/heavy/riot/vault = 20,
+		/obj/item/clothing/suit/armor/heavy/riot/marine = 20,
 		/obj/effect/spawner/bundle/f13/armor/t51b = 1,
 		/obj/item/clothing/suit/armor/power_armor/t51b/pony = 1
 	)

code/modules/clothing/suits/arfsuits.dm

@@ -3107,7 +3107,7 @@
 	/// How much slowdown is added when suit is unpowered
 	var/unpowered_slowdown = 3
 	/// Projectiles below this damage will get deflected
-	var/deflect_damage = BULLET_DAMAGE_PISTOL_10MM
+	var/deflect_damage = 20 // blocks handload 9mm, which simplemobs shoot
 	/// If TRUE - it requires PA training trait to be worn
 	var/requires_training = TRUE
 	/// If TRUE - the suit will give its user specific traits when worn
@@ -3119,9 +3119,11 @@
 	/// Used to track next tool required to salvage the suit
 	var/salvage_step = 0
 	var/deflecting = TRUE
+	var/deflect_power_mult = 20
 	COOLDOWN_DECLARE(emp_cooldown)
 	COOLDOWN_DECLARE(deflect_cd)
-	var/deflect_cooldown = 0.5 SECONDS
+	var/deflect_cooldown = 1 SECONDS
+	var/can_deflect_while_blocking = TRUE
 	slowdown = ARMOR_SLOWDOWN_PA * ARMOR_SLOWDOWN_GLOBAL_MULT
 	armor = ARMOR_VALUE_PA
 	armor_tier_desc = ARMOR_CLOTHING_PA
@@ -3417,18 +3419,23 @@
 		return ..()
 	if(!deflecting)
 		return ..()
+	if(!can_deflect_while_blocking && (CHECK_BITFIELD(owner.combat_flags, COMBAT_FLAG_ACTIVE_BLOCKING) || CHECK_BITFIELD(owner.combat_flags, COMBAT_FLAG_ACTIVE_BLOCK_STARTING)))
+		return ..()
 	if(attack_type != ATTACK_TYPE_PROJECTILE)
 		return ..()
 	if(!(def_zone in protected_zones))
 		return ..()
 	if(!powered || !cell || cell.charge <= 0)
 		return ..()
-	if(damage > deflect_damage)
+	if(!istype(object, /obj/item/projectile))
+		return ..()
+	var/obj/item/projectile/P = object
+	if(P.damage > deflect_damage)
 		return ..()
-	if(armour_penetration > 0)
+	if(P.armour_penetration > 0)
 		return ..()
 	block_return[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT
-	cell.use(round(rand(1, damage*15), 10)) // A normal capacity cell gets 30ish shots on average
+	cell.use(round(rand(damage*(deflect_power_mult*0.5), damage*(deflect_power_mult*2)), 100))
 	do_sparks(2, FALSE, owner)
 	SSrecoil.kickback(owner, recoil_in = 10)
 	var/soundplay = pick("sound/weapons/bullet_ricochet_1.ogg", "sound/weapons/bullet_ricochet_2.ogg")
@@ -3446,6 +3453,9 @@
 	armor = ARMOR_VALUE_SALVAGE
 	slowdown =  ARMOR_SLOWDOWN_REPA * ARMOR_SLOWDOWN_GLOBAL_MULT
 	salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b
+	deflect_power_mult = 80
+	deflect_cooldown = 2 SECONDS
+	can_deflect_while_blocking = FALSE
 
 /obj/item/clothing/suit/armor/power_armor/t45b/debug_pa
 	name = "Debug T-45b power armor"
@@ -3462,6 +3472,16 @@
 	mutantrace_variation = STYLE_DIGITIGRADE
 	salvaged_type = /obj/item/clothing/suit/armor/medium/raider/raidermetal
 
+/obj/item/clothing/suit/armor/power_armor/t45b/hotrod
+	name = "Refurbished T-45b Hotrod power armor"
+	desc = "It's a set of T-45b power armor with a with some of its plating replaced by ablative, fire resistant armor. This set has exhaust pipes piped to the pauldrons, flames erupting from them."
+	icon_state = "t45hotrod"
+	item_state = "t45hotrod"
+	armor = ARMOR_VALUE_SALVAGE
+	slowdown = ARMOR_SLOWDOWN_REPA * ARMOR_SLOWDOWN_GLOBAL_MULT
+	salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b/hotrod
+	armor_tokens = list(ARMOR_MODIFIER_UP_FIRE_T3, ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T3, )
+
 /obj/item/clothing/suit/armor/power_armor/t45d
 	name = "T-45d power armor"
 	desc = "Originally developed and manufactured for the United States Army by American defense contractor West Tek, the T-45d power armor was the first version of power armor to be successfully deployed in battle."
@@ -3515,17 +3535,6 @@
 	icon_state = "t51bpowerarmor_bos"
 	item_state = "t51bpowerarmor_bos"
 
-/obj/item/clothing/suit/armor/power_armor/t45b/hotrod
-	name = "Refurbished T-45b Hotrod power armor"
-	desc = "It's a set of T-45b power armor with a with some of its plating replaced by ablative, fire resistant armor. This set has exhaust pipes piped to the pauldrons, flames erupting from them."
-	icon_state = "t45hotrod"
-	item_state = "t45hotrod"
-	armor = ARMOR_VALUE_SALVAGE
-	slowdown = ARMOR_SLOWDOWN_REPA * ARMOR_SLOWDOWN_GLOBAL_MULT
-	salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b/hotrod
-	armor_tokens = list(ARMOR_MODIFIER_UP_FIRE_T3, ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T3, )
-
-
 /obj/item/clothing/suit/armor/power_armor/excavator
 	name = "excavator power armor"
 	desc = "Developed by Garrahan Mining Co. in collaboration with West Tek, the Excavator-class power armor was designed to protect miners from rockfalls and airborne contaminants while increasing the speed at which they could work. "