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

Converts some xeno abilities to SECONDS #5241

Merged
merged 7 commits into from
Dec 21, 2023
Merged

Converts some xeno abilities to SECONDS #5241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a20847b
conversions
Dec 17, 2023
5a6670c
Merge branch 'master' into seconds
Red-byte3D Dec 17, 2023
98606f0
oops i forgor crusher
Dec 17, 2023
ef2baf9
Merge branch 'seconds' of https://github.com/InsaneRed/cmss13 into se…
Dec 17, 2023
b77af5c
fix
Dec 17, 2023
d6604b9
praes no longer have a 3 minute cooldown
Dec 21, 2023
458bc31
Merge branch 'master' into seconds
Red-byte3D Dec 21, 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
8 changes: 4 additions & 4 deletions code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
macro_path = /datum/action/xeno_action/verb/verb_acid_lance
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
xeno_cooldown = 190
xeno_cooldown = 19 SECONDS

// Config
var/stack_time = 10
Expand Down Expand Up @@ -96,7 +96,7 @@
macro_path = /datum/action/xeno_action/verb/verb_boiler_trap
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
xeno_cooldown = 205
xeno_cooldown = 20.5 SECONDS

/// Config
var/trap_ttl = 100
Expand All @@ -112,7 +112,7 @@
macro_path = /datum/action/xeno_action/verb/verb_acid_mine
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
xeno_cooldown = 55
xeno_cooldown = 5.5 SECONDS

var/empowered = FALSE

Expand All @@ -127,7 +127,7 @@
macro_path = /datum/action/xeno_action/verb/verb_acid_shotgun
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_3
xeno_cooldown = 130
xeno_cooldown = 13 SECONDS

var/ammo_type = /datum/ammo/xeno/acid_shotgun

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
macro_path = /datum/action/xeno_action/verb/verb_crusher_stomp
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
xeno_cooldown = 180
xeno_cooldown = 18 SECONDS
plasma_cost = 30

var/damage = 65
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
macro_path = /datum/action/xeno_action/verb/verb_headbutt
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
xeno_cooldown = 40
xeno_cooldown = 4 SECONDS

/datum/action/xeno_action/onclick/tail_sweep
name = "Tail Sweep"
Expand All @@ -28,7 +28,7 @@
action_type = XENO_ACTION_ACTIVATE
ability_primacy = XENO_PRIMARY_ACTION_3
plasma_cost = 10
xeno_cooldown = 110
xeno_cooldown = 11 SECONDS

/datum/action/xeno_action/activable/fortify
name = "Fortify"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
macro_path = /datum/action/xeno_action/verb/verb_pounce
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
xeno_cooldown = 30
xeno_cooldown = 3 SECONDS
plasma_cost = 0

// Config options
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
macro_path = /datum/action/xeno_action/verb/verb_pounce
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
xeno_cooldown = 60
xeno_cooldown = 6 SECONDS
plasma_cost = 20

// Config options
Expand Down Expand Up @@ -70,7 +70,7 @@
macro_path = /datum/action/xeno_action/verb/verb_crippling_strike
ability_primacy = XENO_PRIMARY_ACTION_3
action_type = XENO_ACTION_ACTIVATE
xeno_cooldown = 100
xeno_cooldown = 10 SECONDS
plasma_cost = 20

var/buff_duration = 50
Expand Down
22 changes: 11 additions & 11 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 @@ -25,7 +25,7 @@
macro_path = /datum/action/xeno_action/verb/verb_dash
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
xeno_cooldown = 110
xeno_cooldown = 11 SECONDS
plasma_cost = 50

// Config options
Expand All @@ -51,7 +51,7 @@
macro_path = /datum/action/xeno_action/verb/verb_cleave
ability_primacy = XENO_PRIMARY_ACTION_3
action_type = XENO_ACTION_CLICK
xeno_cooldown = 120
xeno_cooldown = 12 SECONDS

// Root config
var/root_duration_unbuffed = 1 SECONDS
Expand Down Expand Up @@ -138,7 +138,7 @@
macro_path = /datum/action/xeno_action/verb/verb_oppressor_punch
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
xeno_cooldown = 100
xeno_cooldown = 10 SECONDS
plasma_cost = 55

// Configurables
Expand All @@ -164,7 +164,7 @@
macro_path = /datum/action/xeno_action/verb/verb_crush
ability_primacy = XENO_PRIMARY_ACTION_3
action_type = XENO_ACTION_CLICK
xeno_cooldown = 130
xeno_cooldown = 13 SECONDS
plasma_cost = 80

// Config
Expand All @@ -180,7 +180,7 @@
macro_path = /datum/action/xeno_action/verb/verb_prae_impale
ability_primacy = XENO_PRIMARY_ACTION_1
action_type = XENO_ACTION_CLICK
xeno_cooldown = 130
xeno_cooldown = 13 SECONDS
plasma_cost = 80

/datum/action/xeno_action/onclick/prae_dodge
Expand All @@ -191,7 +191,7 @@
ability_primacy = XENO_PRIMARY_ACTION_2
action_type = XENO_ACTION_CLICK
plasma_cost = 200
xeno_cooldown = 190
xeno_cooldown = 19 SECONDS

// Config
var/duration = 70
Expand All @@ -204,7 +204,7 @@
macro_path = /datum/action/xeno_action/verb/verb_prae_tail_trip
ability_primacy = XENO_PRIMARY_ACTION_3
action_type = XENO_ACTION_CLICK
xeno_cooldown = 130
xeno_cooldown = 13 SECONDS
plasma_cost = 30

// Config
Expand All @@ -224,7 +224,7 @@
macro_path = /datum/action/xeno_action/verb/verb_dash
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
xeno_cooldown = 100
xeno_cooldown = 10 SECONDS
plasma_cost = 40

// Config options
Expand Down Expand Up @@ -255,7 +255,7 @@
ability_primacy = XENO_PRIMARY_ACTION_4

plasma_cost = 80
xeno_cooldown = 100
xeno_cooldown = 10 SECONDS

// Configurable options
spray_type = ACID_SPRAY_LINE
Expand All @@ -270,7 +270,7 @@
/datum/action/xeno_action/activable/spray_acid/prae_warden
ability_primacy = XENO_PRIMARY_ACTION_2
plasma_cost = 130
xeno_cooldown = 130
xeno_cooldown = 13 SECONDS


// Configurable options
Expand All @@ -288,7 +288,7 @@
// todo: macro
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_3
xeno_cooldown = 100
xeno_cooldown = 10 SECONDS
plasma_cost = 100

// Config
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
plasma_cost = 0
xeno_cooldown = 100
xeno_cooldown = 10 SECONDS

// Config
var/shard_cost = 75
Expand All @@ -150,7 +150,7 @@
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_3
plasma_cost = 0
xeno_cooldown = 300
xeno_cooldown = 30 SECONDS

// Config values
var/shard_cost = 50
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
macro_path = /datum/action/xeno_action/verb/verb_pounce
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
xeno_cooldown = 30
xeno_cooldown = 3 SECONDS
plasma_cost = 0

// Config options
Expand All @@ -28,7 +28,7 @@
macro_path = /datum/action/xeno_action/verb/verb_runner_bonespurs
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
xeno_cooldown = 110
xeno_cooldown = 11 SECONDS
plasma_cost = 0

var/ammo_type = /datum/ammo/xeno/bone_chips/spread/runner_skillshot
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
action_type = XENO_ACTION_CLICK

plasma_cost = 50
xeno_cooldown = 80
xeno_cooldown = 8 SECONDS

// Configurable options
spray_type = ACID_SPRAY_LINE // Enum for the shape of spray to do
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
macro_path = /datum/action/xeno_action/verb/verb_fling
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_3
xeno_cooldown = 60
xeno_cooldown = 6 SECONDS

// Configurables
var/fling_distance = 4
Expand All @@ -22,7 +22,7 @@
macro_path = /datum/action/xeno_action/verb/verb_lunge
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
xeno_cooldown = 100
xeno_cooldown = 10 SECONDS

// Configurables
var/grab_range = 4
Expand All @@ -36,7 +36,7 @@
macro_path = /datum/action/xeno_action/verb/verb_punch
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
xeno_cooldown = 45
xeno_cooldown = 4.5 SECONDS

// Configurables
var/base_damage = 25
Expand Down