fixes

code/game/objects/items/shields.dm

@@ -29,6 +29,7 @@
 	block_start_delay = 3
 	block_damage_absorption = 0
 	block_resting_stamina_penalty_multiplier = 2
+	block_projectile_mitigation = 50
 
 /obj/item/shield/examine(mob/user)
 	. = ..()

code/game/objects/items/stunbaton.dm

@@ -170,10 +170,12 @@
 	return disarming || (user.a_intent != INTENT_HARM)
 
 /obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user, disarming = FALSE)
-	if(L.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, null) & BLOCK_SUCCESS) //No message; check_shields() handles that
+	var/list/return_list = list()
+	if(L.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, return_list) & BLOCK_SUCCESS) //No message; check_shields() handles that
 		playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
 		return FALSE
 	var/stunpwr = stamforce
+	stunpwr = block_calculate_resultant_damage(stunpwr, return_list)
 	var/obj/item/stock_parts/cell/our_cell = get_cell()
 	if(!our_cell)
 		switch_status(FALSE)

code/game/objects/items/toys.dm

@@ -446,6 +446,7 @@
 	throw_range = 5
 	force_unwielded = 0
 	force_wielded = 0
+	block_parry_data = null
 	attack_verb = list("attacked", "struck", "hit")
 	total_mass_on = TOTAL_MASS_TOY_SWORD
 	sharpness = IS_BLUNT

code/game/objects/items/twohanded.dm

@@ -318,6 +318,7 @@
 	block_slowdown = 1
 	// no attacking while blocking
 	block_lock_attacking = TRUE
+	block_projectile_mitigation = 75
 
 	parry_time_windup = 0
 	parry_time_active = 8