modifications

code/modules/mob/living/living_active_parry.dm

@@ -238,12 +238,13 @@
 	// before doing anything, check if the user moused over them properly
 	if(!client)
 		return BLOCK_NONE
-	var/found = FALSE
-	for(var/i in client.moused_over_objects)
-		if(i == object)
-			if((client.moused_over_objects[i] + (data.autoparry_mouse_delay_maximum SECONDS)) >= world.time)
-				found = TRUE
-			break
+	var/found = attacker == client.mouseObject
+	if(!found)
+		for(var/i in client.moused_over_objects)
+			if(i == object)
+				if((client.moused_over_objects[i] + (data.autoparry_mouse_delay_maximum)) >= world.time)
+					found = TRUE
+				break
 	if(!found)
 		return BLOCK_NONE
 
@@ -267,7 +268,7 @@
 		if(isnull(efficiency))
 			efficiency = data.autoparry_single_efficiency
 		var/method = determined[1]
-		switch(parrying)
+		switch(method)
 			if(ITEM_PARRY)
 				var/obj/item/I = determined[3]
 				. = I.on_active_parry(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, efficiency, null, TRUE)
@@ -347,7 +348,8 @@
 		// If they're not currently parrying, attempt auto parry
 		if(stage == NOT_PARRYING)
 			if(!allow_auto || SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-				return attempt_auto_parry(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list)
+				return BLOCK_NONE
+			return attempt_auto_parry(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list)
 		else
 			return BLOCK_NONE
 	var/datum/block_parry_data/data = get_parry_data()

code/modules/mob/living/living_blocking_parrying.dm

@@ -108,7 +108,7 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 	/// Priority for [mob/do_run_block()] while we're being used to parry.
 	//  None - Parry is always highest priority!
 	/// Parry doesn't work if you aren't able to otherwise attack due to clickdelay
-	var/parry_respect_clickdelay = TRUE
+	var/parry_respect_clickdelay = FALSE
 	/// Parry stamina cost
 	var/parry_stamina_cost = 5
 	/// Attack types we can block
@@ -164,7 +164,7 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 	/// Stagger duration post-parry if you fail to parry an attack
 	var/parry_failed_stagger_duration = 3.5 SECONDS
 	/// Clickdelay duration post-parry if you fail to parry an attack
-	var/parry_failed_clickcd_duration = 2 SECONDS
+	var/parry_failed_clickcd_duration = 0 SECONDS
 	/// Parry cooldown post-parry if failed. This is ADDED to parry_cooldown!!!
 	var/parry_failed_cooldown_duration = 0 SECONDS
 
@@ -199,7 +199,7 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 	// Clickdelay/cooldown settings not included, as well as whether or not to lock attack/sprinting/etc. They will be pulled from the above.
 
 	/// ADVANCED - Autoparry requirement for time since last moused over for a specific object
-	var/autoparry_mouse_delay_maximum = 0.5
+	var/autoparry_mouse_delay_maximum = 0.5 SECONDS
 
 /**
   * Quirky proc to get average of flags in list that are in attack_type because why is attack_type a flag.