Merge pull request #42247 from granpawalton/fix/NOLIVER-not-handling-regeants

Xenos now have a liver and process reagents
This commit is contained in:
Jordie
2019-01-07 21:00:53 +11:00
committed by GitHub
3 changed files with 9 additions and 1 deletions
@@ -40,6 +40,7 @@
internal_organs += new /obj/item/organ/alien/hivenode
internal_organs += new /obj/item/organ/tongue/alien
internal_organs += new /obj/item/organ/eyes/night_vision/alien
internal_organs += new /obj/item/organ/liver/alien
internal_organs += new /obj/item/organ/ears
..()
+1 -1
View File
@@ -585,7 +585,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
/mob/living/carbon/proc/handle_liver()
var/obj/item/organ/liver/liver = getorganslot(ORGAN_SLOT_LIVER)
if((!dna && !liver) || (NOLIVER in dna.species.species_traits))
if((!dna || !liver) || (NOLIVER in dna.species.species_traits))
return
if(liver)
if(liver.damage >= liver.maxHealth)