Skip to content

Commit

Permalink
Update _pain.dm
Browse files Browse the repository at this point in the history
Xenos allied to a faction won't kill them if they drag/devour while they are in crit
  • Loading branch information
SubjectD9341 committed Aug 26, 2024
1 parent 37cc136 commit 16fa96e
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion code/datums/pain/_pain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -286,15 +286,20 @@
/datum/pain/proc/oxyloss_drag(mob/living/source, mob/puller)
SIGNAL_HANDLER
if(isxeno(puller) && source.stat == UNCONSCIOUS)
var/mob/living/carbon/xenomorph/xeno_puller = puller
if(source.ally_of_hivenumber(xeno_puller.hivenumber))
return
if(source.get_species())
var/mob/living/carbon/human/H = source
if(H.species.flags & HAS_HARDCRIT)
source.apply_damage(20, OXY)

/datum/pain/proc/handle_devour(mob/living/source)
/datum/pain/proc/handle_devour(mob/living/source, mob/living/carbon/xenomorph/devourer)
SIGNAL_HANDLER
if(source.chestburst)
return
if(source.ally_of_hivenumber(devourer.hivenumber))
return
oxy_kill(source)
return COMPONENT_CANCEL_DEVOUR

Expand Down

0 comments on commit 16fa96e

Please sign in to comment.