From fcac5fa3c082a101d176e7b03ddac60038cf9b80 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 12 Sep 2021 20:40:25 -0700 Subject: [PATCH] Update recycler.dm --- code/game/machinery/recycler.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 2ffd556dc1..21ef8e2dcf 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -110,7 +110,7 @@ var/list/to_eat = AM0.GetAllContents() - var/living_detected = FALSE //technically includes silicons as well but eh + var/mob/living/living_detected //technically includes silicons as well but eh var/list/nom = list() var/list/crunchy_nom = list() //Mobs have to be handled differently so they get a different list instead of checking them multiple times. @@ -120,10 +120,10 @@ var/obj/item/bodypart/head/as_head = AM var/obj/item/mmi/as_mmi = AM if(istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /obj/item/dullahan_relay)) - living_detected = TRUE + living_detected = living_detected || AM nom += AM else if(isliving(AM)) - living_detected = TRUE + living_detected = living_detected || TRUE crunchy_nom += AM var/not_eaten = to_eat.len - nom.len - crunchy_nom.len if(living_detected) // First, check if we have any living beings detected. @@ -132,7 +132,7 @@ if(isliving(CRUNCH)) // MMIs and brains will get eaten like normal items crush_living(CRUNCH) else // Stop processing right now without eating anything. - emergency_stop() + emergency_stop(living_detected) return for(var/nommed in nom) recycle_item(nommed)