Skip to content

Commit

Permalink
reductant iscarbon / isliving? whatever, comments trumps it
Browse files Browse the repository at this point in the history
  • Loading branch information
Runian committed Sep 22, 2024
1 parent 9a4802f commit b19ef66
Showing 1 changed file with 5 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ GLOBAL_LIST_INIT(acid_spray_hit, typecacheof(list(/obj/structure/barricade, /obj
. = ..()

var/mob/living/carbon/xenomorph/xeno_owner = owner
if(!iscarbon(target_atom))
return
var/mob/living/carbon/living_target = target_atom
var/buffed = living_target.has_status_effect(STATUS_EFFECT_DANCER_TAGGED)
xeno_owner.visible_message(span_danger("\The [xeno_owner] violently slices [living_target] with its tail [buffed ? "twice" : ""]!"), \
Expand Down Expand Up @@ -364,6 +366,9 @@ GLOBAL_LIST_INIT(acid_spray_hit, typecacheof(list(/obj/structure/barricade, /obj

var/mob/living/carbon/xenomorph/xeno_owner = owner
var/mob/living/carbon/living_target = target_atom
if(!iscarbon(target_atom))
return

var/damage = (xeno_owner.xeno_caste.melee_damage * xeno_owner.xeno_melee_damage_modifier)
var/buffed = living_target.has_status_effect(STATUS_EFFECT_DANCER_TAGGED)

Expand Down

0 comments on commit b19ef66

Please sign in to comment.