Skip to content

Commit

Permalink
Fixes acid pillars shooting captured humans (#5807)
Browse files Browse the repository at this point in the history
# 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
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Fixed acid pillars shooting nested marines.
/:cl:
  • Loading branch information
SabreML authored Feb 27, 2024
1 parent 1968270 commit 1889966
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions code/modules/cm_aliens/XenoStructures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 1889966

Please sign in to comment.