From 429543f4ae41bdaa97ba288dd750332148b4e6b6 Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Tue, 10 Oct 2017 21:21:02 +1300
Subject: [PATCH 1/2] Merge pull request #31492 from
 ShizCalev/sometimes-i-drink-a-glass-of-water-just-to-suprise-my-liver

Fixes xeno mass confusion
---
 code/modules/mob/living/carbon/life.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 8cd7dd5643..2bf605de9c 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -408,6 +408,8 @@
 
 /mob/living/carbon/proc/handle_liver()
 	var/obj/item/organ/liver/liver = getorganslot("liver")
+	if((!dna && !liver) || (NOLIVER in dna.species.species_traits))
+		return
 	if(liver)
 		if(liver.damage >= 100)
 			liver.failing = TRUE
@@ -415,8 +417,6 @@
 		else
 			liver.failing = FALSE
 	else
-		if((dna && dna.species && (NOLIVER in dna.species.species_traits)))
-			return
 		liver_failure()
 
 /mob/living/carbon/proc/undergoing_liver_failure()