From af72122fe53aad5fd32ba50c508e16119aafe4b0 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Tue, 27 Feb 2024 01:05:49 +0000 Subject: [PATCH] Fixes acid pillars shooting captured humans (#5807) # About the pull request Fixes #5806 by making `/obj/effect/alien/resin/acid_pillar/proc/can_target()` check if the target is nested. This specifically only checks if they're nested and not if they've actually been hugged to avoid the same issue happening in the rare cases where both aren't true. # Explain why it's good for the game Acid pillars shouldn't be helping marines by killing captured people. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Fixed acid pillars shooting nested marines. /:cl: --- code/modules/cm_aliens/XenoStructures.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index ab38e59002d8..c014fbf9c211 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -578,6 +578,9 @@ if(current_mob.stat == DEAD) return FALSE + if(HAS_TRAIT(current_mob, TRAIT_NESTED)) + return FALSE + var/turf/current_turf var/turf/last_turf = loc var/atom/temp_atom = new acid_type()