From 9092c186acb0da47ebcaba45776bc14a4a44d80f Mon Sep 17 00:00:00 2001 From: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> Date: Thu, 4 Jan 2024 08:59:52 -0800 Subject: [PATCH] fix ashwalker egg respawn (#25979) --- .../modules/ashwalkers/code/buildings/ash_tendril.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm b/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm index 18d3baa3b51..01056fa6c20 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm @@ -90,18 +90,16 @@ if(!viewable_living.stat) continue - for(var/obj/item/sacrifice_posession in viewable_living) - if(!viewable_living.dropItemToGround(sacrifice_posession)) - qdel(sacrifice_posession) + viewable_living.unequip_everything() if(issilicon(viewable_living)) //no advantage to sacrificing borgs... viewable_living.investigate_log("has been gibbed via ashwalker sacrifice as a borg.", INVESTIGATE_DEATHS) viewable_living.gib() - continue + return if(viewable_living.mind?.has_antag_datum(/datum/antagonist/ashwalker) && (viewable_living.ckey || viewable_living.get_ghost(FALSE, TRUE))) //special interactions for dead lava lizards with ghosts attached revive_ashwalker(viewable_living) - continue + return if(ismegafauna(viewable_living)) meat_counter += MEGAFAUNA_MEAT_AMOUNT