Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Oppressor cooldown changes #5154

Merged
merged 11 commits into from
Dec 8, 2023
Merged

Oppressor cooldown changes #5154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
16920eb
number changes
Dec 7, 2023
de0f09a
Merge branch 'master' into master
Red-byte3D Dec 7, 2023
9676a4c
fixed for the cd reduction
Dec 7, 2023
c7e637f
Merge branch 'master' of https://github.com/InsaneRed/cmss13
Dec 7, 2023
47af0fe
Update code/modules/mob/living/carbon/xenomorph/abilities/praetorian/…
Red-byte3D Dec 7, 2023
2c1a4bd
Update code/modules/mob/living/carbon/xenomorph/abilities/praetorian/…
Red-byte3D Dec 7, 2023
df7d42c
2 decis
Dec 8, 2023
d889dac
Merge branch 'master' into master
Red-byte3D Dec 8, 2023
c183726
tweaks and a bug fix
Dec 8, 2023
92bf9a2
thiscompilesatleast
Dec 8, 2023
4c393aa
Merge branch 'master' into master
Red-byte3D Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 7 DECISECONDS

/datum/action/xeno_action/activable/oppressor_punch
name = "Dislocate"
Expand Down Expand Up @@ -169,7 +169,7 @@

// Config
var/fling_dist = 3
var/windup = 2
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
var/windup = 2 DECISECONDS

////////// Dancer Abilities

Expand Down
15 changes: 7 additions & 8 deletions code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ..()
Expand Down