diff --git a/code/modules/mob/living/carbon/xenomorph/castes/beetle/beetle.dm b/code/modules/mob/living/carbon/xenomorph/castes/beetle/beetle.dm index e2ec208f763..226ca313536 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/beetle/beetle.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/beetle/beetle.dm @@ -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 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/beetle/castedatum_beetle.dm b/code/modules/mob/living/carbon/xenomorph/castes/beetle/castedatum_beetle.dm index 8b6076fc383..75f5a90da3b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/beetle/castedatum_beetle.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/beetle/castedatum_beetle.dm @@ -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, ) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/mantis/abilities_mantis.dm b/code/modules/mob/living/carbon/xenomorph/castes/mantis/abilities_mantis.dm index 0b712f283d1..e9172b38c58 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/mantis/abilities_mantis.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/mantis/abilities_mantis.dm @@ -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 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/mantis/castedatum_mantis.dm b/code/modules/mob/living/carbon/xenomorph/castes/mantis/castedatum_mantis.dm index a290486da3c..90f2bd519f2 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/mantis/castedatum_mantis.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/mantis/castedatum_mantis.dm @@ -17,7 +17,7 @@ speed = -0.6 // *** Plasma *** // - plasma_max = 600 //3 ravage + plasma_max = 500 //2 ravages plasma_gain = 20 // *** Health *** // @@ -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_BE_GIVEN_PLASMA|CASTE_CAN_RIDE_CRUSHER caste_traits = null // *** Defense *** // diff --git a/code/modules/mob/living/carbon/xenomorph/castes/scorpion/castedatum_scorpion.dm b/code/modules/mob/living/carbon/xenomorph/castes/scorpion/castedatum_scorpion.dm index 76718e42c09..7b23d204fbc 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/scorpion/castedatum_scorpion.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/scorpion/castedatum_scorpion.dm @@ -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 *** // @@ -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, ) diff --git a/icons/Xeno/castes/beetle.dmi b/icons/Xeno/castes/beetle.dmi index 727f00fa58d..1d5b884165e 100644 Binary files a/icons/Xeno/castes/beetle.dmi and b/icons/Xeno/castes/beetle.dmi differ