From a60f801f69c1031bbf4cc38a326c06fa7579e803 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Wed, 12 May 2021 04:23:53 -0700
Subject: [PATCH] e

---
 code/modules/mob/living/living_active_parry.dm      | 3 ++-
 code/modules/mob/living/living_blocking_parrying.dm | 4 ----
 code/modules/mob/living/living_defines.dm           | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm
index 57866bacbe..d8f5edefb8 100644
--- a/code/modules/mob/living/living_active_parry.dm
+++ b/code/modules/mob/living/living_active_parry.dm
@@ -231,7 +231,7 @@
 	if(!islist(determined))
 		return FALSE
 	var/datum/block_parry_data/data = return_block_parry_datum(determined[2])
-	if(!data.parry_automatic_enabled)
+	if(!data.parry_automatic_enabled || (last_autoparry > (world.time + data.autoparry_cooldown_absolute)))
 		return FALSE
 	// before doing anything, check if the user moused over them properly
 	if(!client)
@@ -249,6 +249,7 @@
 	// first, check cooldowns
 
 	// now, depending on if we're doing a single simulation or a full sequence
+	last_autoparry = world.time
 	if(data.autoparry_sequence_simulation)
 		// for full sequence simulation
 		initiate_parry_sequence(TRUE, determined)
diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm
index 453f521575..d32ef5a2ac 100644
--- a/code/modules/mob/living/living_blocking_parrying.dm
+++ b/code/modules/mob/living/living_blocking_parrying.dm
@@ -189,10 +189,6 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 	/// Autoparry : Simulate a parry sequence starting at a certain tick, or simply simulate a single attack parry?
 	var/autoparry_sequence_simulation = FALSE
 	// Single attack simulation:
-	/// Parry cooldown to inflict on single-attack autoparry
-	var/autoparry_single_parry_cooldown = 3 SECONDS
-	/// Clickdelay to inflict on single-attack autoparry
-	var/autoparry_single_click_cooldown = 0
 	/// Single attack autoparry - efficiency
 	var/autoparry_single_efficiency = 75
 	/// Single attack autoparry - efficiency overrides by attack type, see above
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 14acf72f57..94f4ff60a3 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -50,6 +50,8 @@
 	var/obj/effect/abstract/parry/parry_visual_effect
 	/// world.time of last parry end
 	var/parry_end_time_last = 0
+	/// Last autoparry
+	var/last_autoparry = 0
 	/// Successful parries within the current parry cycle. It's a list of efficiency percentages.
 	var/list/successful_parries
 	/// Current parry counterattacks. Makes sure we can only counterattack someone once per parry.