modifications

code/game/objects/items/dualsaber.dm

@@ -71,7 +71,6 @@
 	parry_imperfect_falloff_percent = 10
 	parry_efficiency_considered_successful = 25		// VERY generous
 	parry_failed_stagger_duration = 3 SECONDS
-	parry_failed_clickcd_duration = CLICK_CD_MELEE
 
 /obj/item/dualsaber/directional_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return, override_direction)
 	if((attack_type & ATTACK_TYPE_PROJECTILE) && is_energy_reflectable_projectile(object))
@@ -374,7 +373,6 @@
 		TEXT_ATTACK_TYPE_PROJECTILE = 30,
 	)
 	parry_failed_stagger_duration = 3 SECONDS
-	parry_failed_clickcd_duration = 2 SECONDS
 
 /obj/item/dualsaber/hypereutactic/chaplain/ComponentInitialize()
 	. = ..()

code/game/objects/items/electrostaff.dm

@@ -62,7 +62,6 @@
 	)
 	// not extremely punishing to fail, but no spamming the parry.
 	parry_failed_stagger_duration = 1.5 SECONDS
-	parry_failed_clickcd_duration = 1 SECONDS
 
 /obj/item/electrostaff/Initialize(mapload)
 	. = ..()

code/game/objects/items/melee/energy.dm

@@ -126,6 +126,9 @@
 	parry_efficiency_perfect = 100
 	parry_failed_stagger_duration = 4 SECONDS
 	parry_cooldown = 0.5 SECONDS
+	parry_automatic_enabled = TRUE
+	autoparry_single_efficiency = 65
+	autoparry_cooldown_absolute = 3 SECONDS
 
 /obj/item/melee/transforming/energy/sword/Initialize(mapload)
 	. = ..()

code/game/objects/items/melee/misc.dm

@@ -194,7 +194,6 @@
 	parry_efficiency_perfect = 100
 	parry_stamina_cost = 5
 	parry_failed_stagger_duration = 2 SECONDS
-	parry_failed_clickcd_duration = CLICK_CD_RANGE
 	parry_cooldown = 0
 
 /obj/item/melee/rapier/active_parry_reflex_counter(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list, parry_efficiency, list/effect_text)

code/game/objects/items/shields.dm

@@ -34,6 +34,10 @@
 	block_damage_absorption = 5
 	block_resting_stamina_penalty_multiplier = 2
 	block_projectile_mitigation = 75
+	block_damage_absorption_override = list(
+		TEXT_ATTACK_TYPE_TACKLE = INFINITY,
+		TEXT_ATTACK_TYPE_THROWN = 10
+	)
 
 /obj/item/shield/examine(mob/user)
 	. = ..()
@@ -374,11 +378,10 @@
 
 /obj/item/shield/riot/flash/on_shield_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
 	. = ..()
-	if (. && !embedded_flash.crit_fail)
+	if (. && damage && !embedded_flash.crit_fail)
 		embedded_flash.activate()
 		update_icon()
 
-
 /obj/item/shield/riot/flash/attackby(obj/item/W, mob/user)
 	if(istype(W, /obj/item/assembly/flash/handheld))
 		var/obj/item/assembly/flash/handheld/flash = W

code/game/objects/items/weaponry.dm

@@ -364,7 +364,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	parry_time_perfect = 2.5 // however...
 	parry_time_perfect_leeway = 2 // the entire time, the parry is perfect
 	parry_failed_stagger_duration = 1 SECONDS
-	parry_failed_clickcd_duration = 1 SECONDS // more forgiving punishments for missed parries
 	// still, don't fucking miss your parries or you're down stamina and staggered to shit
 
 /datum/block_parry_data/bokken/quick_parry/proj
@@ -481,7 +480,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	parry_time_perfect = 1
 	parry_time_perfect_leeway = 1
 	parry_failed_stagger_duration = 1 SECONDS
-	parry_failed_clickcd_duration = 1 SECONDS
 
 /datum/block_parry_data/bokken/waki/quick_parry/proj
 	parry_efficiency_perfect_override = list()