From 835fc75d1f8d2c0562fcb3e300f51e05253fef02 Mon Sep 17 00:00:00 2001 From: Rhials <28870487+Rhials@users.noreply.github.com> Date: Sun, 4 May 2025 17:24:57 -0400 Subject: [PATCH] Recycler ignores incorporeal mobs (#90977) ## About The Pull Request Incorporeal mobs do not interact with the recycler. ## Why It's Good For The Game Makes sense. Also you can run back and forth into one as revenant to make splat noises repeatedly. Now that is fixed. ## Changelog :cl: Rhials fix: Revenants can no longer be fake-eaten by the recycler. /:cl: --- code/game/machinery/recycler.dm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 2b32e30ac3d..30a63bf7199 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -196,11 +196,17 @@ if(living_detected) // First, check if we have any living beings detected. if(obj_flags & EMAGGED) for(var/CRUNCH in crunchy_nom) // Eat them and keep going because we don't care about safety. - if(isliving(CRUNCH)) // MMIs and brains will get eaten like normal items - if(!is_operational) //we ran out of power after recycling a large amount to living stuff, time to stop - break - crush_living(CRUNCH) - use_energy(active_power_usage) + if(!isliving(CRUNCH)) // MMIs and brains will get eaten like normal items + continue + + var/mob/living/living_mob = CRUNCH + if(living_mob.incorporeal_move) + continue + + if(!is_operational) //we ran out of power after recycling a large amount to living stuff, time to stop + break + crush_living(CRUNCH) + use_energy(active_power_usage) else // Stop processing right now without eating anything. emergency_stop() return