Skip to content

[REFACTOR] Updates Spitter code. #12875

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Venuska1117 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[REFACTOR] Updates Spitter code. #12875

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4912504
Spitter changes
Venuska1117 Aug 8, 2026
26865e9
Merge branch 'master' into nu2-spitter
Venuska1117 Aug 13, 2026
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
16 changes: 6 additions & 10 deletions code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."))
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down