From 4912504b12be57c8fefeda56aad2c4c655ac2db1 Mon Sep 17 00:00:00 2001 From: Venuska1117 Date: Sat, 8 Aug 2026 12:27:29 +0200 Subject: [PATCH] Spitter changes --- .../living/carbon/xenomorph/castes/Spitter.dm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm b/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm index 4fe0425c410f0..55ce2c0e801c5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm @@ -68,21 +68,17 @@ skull = /obj/item/skull/spitter pelt = /obj/item/pelt/spitter -/datum/action/xeno_action/onclick/charge_spit/use_ability(atom/A) +/datum/action/xeno_action/onclick/charge_spit/use_ability(atom/target_atom) var/mob/living/carbon/xenomorph/zenomorf = owner - if (!action_cooldown_check()) + if(!istype(zenomorf)) return - if (!istype(zenomorf) || !zenomorf.check_state()) - return - - if (buffs_active) + if(buffs_active) to_chat(zenomorf, SPAN_XENOHIGHDANGER("We cannot stack this!")) return - if (!check_and_use_plasma_owner()) - return + XENO_ACTION_CHECK_USE_PLASMA(zenomorf) to_chat(zenomorf, SPAN_XENOHIGHDANGER("We accumulate acid in your glands. Our next spit will be stronger but shorter-ranged.")) to_chat(zenomorf, SPAN_XENOWARNING("Additionally, we are slightly faster and more armored for a small amount of time.")) @@ -115,7 +111,7 @@ /datum/action/xeno_action/onclick/charge_spit/proc/remove_effects() var/mob/living/carbon/xenomorph/zenomorf = owner - if (!istype(zenomorf)) + if(!istype(zenomorf)) return zenomorf.speed_modifier += speed_buff_amount @@ -126,7 +122,7 @@ disable_spatter() buffs_active = FALSE -/datum/action/xeno_action/activable/tail_stab/spitter/use_ability(atom/A) +/datum/action/xeno_action/activable/tail_stab/spitter/use_ability(atom/target_atom) var/target = ..() if(iscarbon(target)) var/mob/living/carbon/carbon_target = target