From 48a3df2a64f7da089a3aa5d12986d9255412e6c7 Mon Sep 17 00:00:00 2001 From: Lufferly <40921881+Lufferly@users.noreply.github.com> Date: Mon, 18 Dec 2023 08:14:05 -0700 Subject: [PATCH] Fixes ashwalker respawn + more (#80405) ## About The Pull Request Fixes #79678 Fixes #71965 Fixes silicons not being gibbed when sacrificed, instead they would just sit there while the tendril spewed text after dropping its parts. The tendril was trying to drop every item on the body, including the chest, which would gib the ashwalker. ## Why It's Good For The Game Fixes bugs ## Changelog :cl: Seven fix: Ashwalkers can respawn fellow ashwalkers by bringing them back to their tendril again. fix: Ashwalker tendrils no longer break hooded suits and modsuits. fix: Ashwalkers can sacrifice silicons, it wont give anything though. /:cl: --- .../mapfluff/ruins/objects_and_mobs/ash_walker_den.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm index ea55bfcf919..a1391f92ed3 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm @@ -50,12 +50,12 @@ if(offeredmob.loc == src) continue //Ashwalker Revive in Progress... if(offeredmob.stat) - for(var/obj/item/W in offeredmob) - if(!offeredmob.dropItemToGround(W)) - qdel(W) + offeredmob.unequip_everything() + if(issilicon(offeredmob)) //no advantage to sacrificing borgs... offeredmob.investigate_log("has been gibbed by the necropolis tendril.", INVESTIGATE_DEATHS) visible_message(span_notice("Serrated tendrils eagerly pull [offeredmob] apart, but find nothing of interest.")) + offeredmob.gib() return if(offeredmob.mind?.has_antag_datum(/datum/antagonist/ashwalker) && (offeredmob.ckey || offeredmob.get_ghost(FALSE, TRUE))) //special interactions for dead lava lizards with ghosts attached