Skip to content

Commit

Permalink
Merge pull request #20 from Paxilmaniac/deep-water-fix
Browse files Browse the repository at this point in the history
fixes deep water crashing the world sometimes
  • Loading branch information
Paxilmaniac authored Jun 29, 2024
2 parents d27155a + 022f98b commit ba1a142
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions code/modules/fantasystation_map_generation/turfs/water.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@

/turf/open/water/vintage/deep/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
. = ..()
// If the thing is a projectile, for the love of god leave it alone
if(isprojectile(arrived))
return
// If the thing is an effect then also leave it the hell alone
if(iseffect(arrived))
return
// If the thing is an abstract object, do we really need to worry about it?
if(arrived.invisibility == INVISIBILITY_ABSTRACT)
return
Expand Down

0 comments on commit ba1a142

Please sign in to comment.