Skip to content

Commit

Permalink
Minions buffs (#428)
Browse files Browse the repository at this point in the history
* Allows minions to ride crushers (#16512)

* Removes the delay from mantis swipe + they can be given plasma now (#14694)

Co-authored-by: Yellow-Mushroom <[email protected]>

* beetle

---------

Co-authored-by: Lewdcifer <[email protected]>
Co-authored-by: ClosetedSkeletonGH <[email protected]>
Co-authored-by: Yellow-Mushroom <[email protected]>
  • Loading branch information
4 people authored Sep 25, 2024
1 parent 86c4bbb commit bc8ac78
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,12 @@
pull_speed = -2
life_value = 0
default_honor_value = 0

// ***************************************
// *********** Icon
// ***************************************
/mob/living/carbon/xenomorph/beetle/handle_special_state()
if(crest_defense)
icon_state = "[xeno_caste.caste_name] Crest"
return TRUE
return FALSE
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,22 @@
plasma_gain = 10

// *** Health *** //
max_health = 260
max_health = 250

// *** Flags *** //
caste_flags = CASTE_DO_NOT_ALERT_LOW_LIFE|CASTE_IS_A_MINION|CASTE_ACID_BLOOD
can_flags = CASTE_CAN_BE_QUEEN_HEALED
can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_RIDE_CRUSHER
caste_traits = null

// *** Defense *** //
soft_armor = list(MELEE = 30, BULLET = 30, LASER = 25, ENERGY = 20, BOMB = 20, BIO = 20, FIRE = 10, ACID = 20)
soft_armor = list(MELEE = 25, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 25, BIO = 25, FIRE = 25, ACID = 25)

minimap_icon = "xenominion"

crest_defense_armor = 20

actions = list(
/datum/action/ability/xeno_action/xeno_resting,
/datum/action/ability/activable/xeno/charge/forward_charge/unprecise,
/datum/action/ability/xeno_action/toggle_crest_defense,
)
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
/datum/action/ability/activable/xeno/ravage/slow
///How long is the windup before ravaging
var/windup_time = 0.5 SECONDS
cooldown_duration = 30 SECONDS

/datum/action/ability/activable/xeno/ravage/slow/use_ability(atom/A)
if(!do_after(owner, windup_time, IGNORE_HELD_ITEM, owner, BUSY_ICON_GENERIC, extra_checks = CALLBACK(src, PROC_REF(can_use_action), FALSE, ABILITY_USE_BUSY)))
return fail_activate()
return ..()

/datum/action/ability/activable/xeno/ravage/slow/ai_should_use(atom/target)
. = ..()
if(!.)
return
action_activate()
LAZYINCREMENT(owner.do_actions, target)
addtimer(CALLBACK(src, PROC_REF(decrease_do_action), target), windup_time)

///Decrease the do_actions of the owner
/datum/action/ability/activable/xeno/ravage/slow/proc/decrease_do_action(atom/target)
LAZYDECREMENT(owner.do_actions, target)
ability_cost = 250
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
speed = -0.6

// *** Plasma *** //
plasma_max = 600 //3 ravage
plasma_max = 500 //2 ravages
plasma_gain = 20

// *** Health *** //
max_health = 150

// *** Flags *** //
caste_flags = CASTE_DO_NOT_ALERT_LOW_LIFE|CASTE_IS_A_MINION|CASTE_ACID_BLOOD
can_flags = CASTE_CAN_BE_QUEEN_HEALED
can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_RIDE_CRUSHER
caste_traits = null

// *** Defense *** //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

// *** Flags *** //
caste_flags = CASTE_DO_NOT_ALERT_LOW_LIFE|CASTE_IS_A_MINION|CASTE_ACID_BLOOD
can_flags = CASTE_CAN_BE_QUEEN_HEALED
can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_RIDE_CRUSHER|CASTE_CAN_BE_GIVEN_PLASMA
caste_traits = null

// *** Defense *** //
Expand All @@ -41,4 +41,5 @@
actions = list(
/datum/action/ability/xeno_action/xeno_resting,
/datum/action/ability/activable/xeno/xeno_spit,
/datum/action/ability/activable/xeno/corrosive_acid/drone,
)
Binary file modified icons/Xeno/castes/beetle.dmi
Binary file not shown.

0 comments on commit bc8ac78

Please sign in to comment.