From 16fa96e87853fa0207f38b396346aefc37f50e9d Mon Sep 17 00:00:00 2001
From: SubjectD9341 <115213778+SubjectD9341@users.noreply.github.com>
Date: Mon, 26 Aug 2024 21:26:34 +0200
Subject: [PATCH] Update _pain.dm

Xenos allied to a faction won't kill them if they drag/devour while they are in crit
---
 code/datums/pain/_pain.dm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/datums/pain/_pain.dm b/code/datums/pain/_pain.dm
index 826773504151..6c494fc65ed2 100644
--- a/code/datums/pain/_pain.dm
+++ b/code/datums/pain/_pain.dm
@@ -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