Skip to content

Commit

Permalink
[MIRROR] Cult pylons won't convert floorless floors (#692) (#1762)
Browse files Browse the repository at this point in the history
* Cult pylons won't convert floorless floors (#81171)

## About The Pull Request

Cult pylons read from our existing list of "turfs which don't count as
floor despite being open turfs" instead of having its own one, which did
not include openspace turfs.
This prevents it from "papering over" things like stairwells and sealing
people inside their base.


![image](https://github.com/tgstation/tgstation/assets/7483112/f91ad4a3-8546-4861-9098-31817ea30821)

## Why It's Good For The Game

It's not supposed to do that, and fixing it this way is futureproof to a
greater degree.

## Changelog

:cl:
fix: Cult pylons will no longer cover up "open space" (or water) with
cult floors
/:cl:

* Cult pylons won't convert floorless floors

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Jacquerel <[email protected]>
  • Loading branch information
3 people authored Jan 31, 2024
1 parent b764aa5 commit 413b54a
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions code/modules/antagonists/cult/cult_structure_pylon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,9 @@
var/static/list/blacklisted_pylon_turfs = typecacheof(list(
/turf/closed,
/turf/open/floor/engine/cult,
/turf/open/space,
/turf/open/lava,
/turf/open/chasm,
/turf/open/misc/asteroid,
))
if(is_type_in_typecache(nearby_turf, blacklisted_pylon_turfs))
if(isgroundlessturf(nearby_turf) || is_type_in_typecache(nearby_turf, blacklisted_pylon_turfs))
continue
validturfs |= nearby_turf

Expand Down

0 comments on commit 413b54a

Please sign in to comment.