From 16920ebc2a4961b77998ad9b885833419ce71fb8 Mon Sep 17 00:00:00 2001 From: InsaneRed Date: Thu, 7 Dec 2023 14:52:37 +0300 Subject: [PATCH 1/7] number changes --- .../abilities/praetorian/praetorian_abilities.dm | 6 +++--- .../abilities/praetorian/praetorian_powers.dm | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm index d3865872f0ab..c71a5cc9dd3c 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm @@ -124,12 +124,12 @@ macro_path = /datum/action/xeno_action/verb/verb_prae_abduct ability_primacy = XENO_PRIMARY_ACTION_1 action_type = XENO_ACTION_CLICK - xeno_cooldown = 180 + xeno_cooldown = 15 SECONDS plasma_cost = 180 // Config var/max_distance = 7 - var/windup = 8 + var/windup = 6 /datum/action/xeno_action/activable/oppressor_punch name = "Dislocate" @@ -169,7 +169,7 @@ // Config var/fling_dist = 3 - var/windup = 2 + var/windup = 1 ////////// Dancer Abilities diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm index 85a9ee8f054b..1d525153ba42 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm @@ -412,19 +412,18 @@ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), target_carbon, TRAIT_SOURCE_ABILITY("Oppressor Punch")), get_xeno_stun_duration(target_carbon, 1.2 SECONDS)) to_chat(target_carbon, SPAN_XENOHIGHDANGER("[oppressor_user] has pinned you to the ground! You cannot move!")) - - var/datum/action/xeno_action/activable/prae_abduct/abduct_action = get_xeno_action_by_type(oppressor_user, /datum/action/xeno_action/activable/prae_abduct) - var/datum/action/xeno_action/activable/tail_lash/tail_lash_action = get_xeno_action_by_type(oppressor_user, /datum/action/xeno_action/activable/tail_lash) - if(abduct_action && abduct_action.action_cooldown_check()) - abduct_action.reduce_cooldown(5 SECONDS) - if(tail_lash_action && tail_lash_action.action_cooldown_check()) - tail_lash_action.reduce_cooldown(5 SECONDS) else target_carbon.apply_armoured_damage(get_xeno_damage_slash(target_carbon, damage), ARMOR_MELEE, BRUTE, target_limb? target_limb.name : "chest") step_away(target_carbon, oppressor_user, 2) shake_camera(target_carbon, 2, 1) + var/datum/action/xeno_action/activable/prae_abduct/abduct_action = get_xeno_action_by_type(oppressor_user, /datum/action/xeno_action/activable/prae_abduct) + var/datum/action/xeno_action/activable/tail_lash/tail_lash_action = get_xeno_action_by_type(oppressor_user, /datum/action/xeno_action/activable/tail_lash) + if(abduct_action && abduct_action.action_cooldown_check()) + abduct_action.reduce_cooldown(5 SECONDS) + if(tail_lash_action && tail_lash_action.action_cooldown_check()) + tail_lash_action.reduce_cooldown(5 SECONDS) apply_cooldown() return ..() From 9676a4cddf1a103c1171398c5fdd7e44460216ca Mon Sep 17 00:00:00 2001 From: InsaneRed Date: Thu, 7 Dec 2023 17:00:47 +0300 Subject: [PATCH 2/7] fixed for the cd reduction --- .../xenomorph/abilities/praetorian/praetorian_powers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm index 1d525153ba42..69cddf0808b5 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm @@ -420,9 +420,9 @@ shake_camera(target_carbon, 2, 1) var/datum/action/xeno_action/activable/prae_abduct/abduct_action = get_xeno_action_by_type(oppressor_user, /datum/action/xeno_action/activable/prae_abduct) var/datum/action/xeno_action/activable/tail_lash/tail_lash_action = get_xeno_action_by_type(oppressor_user, /datum/action/xeno_action/activable/tail_lash) - if(abduct_action && abduct_action.action_cooldown_check()) + if(abduct_action && !abduct_action.action_cooldown_check()) abduct_action.reduce_cooldown(5 SECONDS) - if(tail_lash_action && tail_lash_action.action_cooldown_check()) + if(tail_lash_action && !tail_lash_action.action_cooldown_check()) tail_lash_action.reduce_cooldown(5 SECONDS) apply_cooldown() From 47af0fe920a1c70936094fdd088d57674fba0612 Mon Sep 17 00:00:00 2001 From: InsaneRed <47158596+InsaneRed@users.noreply.github.com> Date: Thu, 7 Dec 2023 21:21:09 +0300 Subject: [PATCH 3/7] Update code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm Co-authored-by: Birdtalon --- .../xenomorph/abilities/praetorian/praetorian_abilities.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm index c71a5cc9dd3c..56d5a73ccc2f 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm @@ -129,7 +129,7 @@ // Config var/max_distance = 7 - var/windup = 6 + var/windup = 6 DECISECONDS /datum/action/xeno_action/activable/oppressor_punch name = "Dislocate" From 2c1a4bde08b670bf7a99c178180e1fa841e6ae22 Mon Sep 17 00:00:00 2001 From: InsaneRed <47158596+InsaneRed@users.noreply.github.com> Date: Thu, 7 Dec 2023 21:21:15 +0300 Subject: [PATCH 4/7] Update code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm Co-authored-by: Birdtalon --- .../xenomorph/abilities/praetorian/praetorian_abilities.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm index 56d5a73ccc2f..ace211486c7c 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm @@ -169,7 +169,7 @@ // Config var/fling_dist = 3 - var/windup = 1 + var/windup = 1 DECISECONDS ////////// Dancer Abilities From df7d42c2aa15cc68f12edaea8e5c6ee345e43cc4 Mon Sep 17 00:00:00 2001 From: InsaneRed Date: Fri, 8 Dec 2023 10:11:27 +0300 Subject: [PATCH 5/7] 2 decis --- .../xenomorph/abilities/praetorian/praetorian_abilities.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm index ace211486c7c..443fcac6b5b8 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm @@ -169,7 +169,7 @@ // Config var/fling_dist = 3 - var/windup = 1 DECISECONDS + var/windup = 2 DECISECONDS ////////// Dancer Abilities From c18372604bc64c000be900fec3c3729606702b82 Mon Sep 17 00:00:00 2001 From: InsaneRed Date: Fri, 8 Dec 2023 21:57:36 +0300 Subject: [PATCH 6/7] tweaks and a bug fix --- .../xenomorph/abilities/praetorian/praetorian_abilities.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm index 443fcac6b5b8..f876c2c50669 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm @@ -129,7 +129,7 @@ // Config var/max_distance = 7 - var/windup = 6 DECISECONDS + var/windup = 7 DECISECONDS /datum/action/xeno_action/activable/oppressor_punch name = "Dislocate" From 92bf9a2f3bf72c3dd8bd1de6d4e6a62fa9501656 Mon Sep 17 00:00:00 2001 From: InsaneRed Date: Fri, 8 Dec 2023 22:05:10 +0300 Subject: [PATCH 7/7] thiscompilesatleast --- .../carbon/xenomorph/abilities/praetorian/praetorian_powers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm index 69cddf0808b5..1a0205862480 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm @@ -386,7 +386,7 @@ var/obj/limb/target_limb = target_carbon.get_limb(check_zone(oppressor_user.zone_selected)) if (ishuman(target_carbon) && (!target_limb || (target_limb.status & LIMB_DESTROYED))) - return + target_limb = target_carbon.get_limb("chest") if (!check_and_use_plasma_owner()) return