diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 8aac184cee..83ea648872 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -10,7 +10,7 @@ #define TEXT_WEST "[WEST]" /// yeah yeah i'm a lazy asshole who can't debug yeah yeah -#define DEBUG_LINE message_admins("DEBUG: [__FILE__] [__LINE__] executing!") +#define DEBUG_LINE message_admins("DEBUG: [__FILE__] [__LINE__] executing!") /// world.icon_size #define PIXELS 32 diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm index 70e41c0c6a..e34c5ce053 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 BLOCK_NONE var/datum/block_parry_data/data = return_block_parry_datum(determined[2]) - if(!data.parry_automatic_enabled || (last_autoparry > (world.time + data.autoparry_cooldown_absolute))) + if(!data.parry_automatic_enabled || (last_autoparry > (world.time - data.autoparry_cooldown_absolute))) return BLOCK_NONE if(attack_type && !(attack_type & data.parry_attack_types)) return BLOCK_NONE diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm index 1ffdc1b9e4..0ccc03982a 100644 --- a/code/modules/mob/living/living_blocking_parrying.dm +++ b/code/modules/mob/living/living_blocking_parrying.dm @@ -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 SECONDS + var/autoparry_mouse_delay_maximum = 0.35 SECONDS /** * Quirky proc to get average of flags in list that are in attack_type because why is attack_type a flag.