From 35e0ccacb46cf8c16048d64241bd2d130ebb15b2 Mon Sep 17 00:00:00 2001
From: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Date: Fri, 19 Jun 2020 08:57:16 -0700
Subject: [PATCH] Removes singularity interaction with snow tiles (#51703)

* Removes singularity interaction with snow tiles

* Makes planetary defs simplier
---
 code/game/turfs/open/floor.dm                 | 33 ++++++++++---------
 .../revenant/revenant_abilities.dm            |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm
index 95e951c3254..f72567dfae5 100644
--- a/code/game/turfs/open/floor.dm
+++ b/code/game/turfs/open/floor.dm
@@ -207,23 +207,24 @@
 
 /turf/open/floor/singularity_pull(S, current_size)
 	..()
-	if(current_size == STAGE_THREE)
-		if(prob(30))
-			if(floor_tile)
-				new floor_tile(src)
-				make_plating(TRUE)
-	else if(current_size == STAGE_FOUR)
-		if(prob(50))
-			if(floor_tile)
-				new floor_tile(src)
-				make_plating(TRUE)
-	else if(current_size >= STAGE_FIVE)
-		if(floor_tile)
+	var/sheer = FALSE
+	switch(current_size)
+		if(STAGE_THREE)
+			if(prob(30))
+				sheer = TRUE
+		if(STAGE_FOUR)
+			if(prob(50))
+				sheer = TRUE
+		if(STAGE_FIVE to INFINITY)
 			if(prob(70))
-				new floor_tile(src)
-				make_plating(TRUE)
-		else if(prob(50))
-			ReplaceWithLattice()
+				sheer = TRUE
+			else if(prob(50) && (/turf/open/space in baseturfs))
+				ReplaceWithLattice()
+	if(sheer)
+		if(floor_tile)
+			make_plating(TRUE)
+			new floor_tile(src)
+
 
 /turf/open/floor/narsie_act(force, ignore_mobs, probability = 20)
 	. = ..()
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index 8c046970f43..2eb9365ee8d 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -248,7 +248,7 @@
 			new floor.floor_tile(floor)
 		floor.broken = 0
 		floor.burnt = 0
-		floor.make_plating(1)
+		floor.make_plating(TRUE)
 	if(T.type == /turf/closed/wall && prob(15))
 		new /obj/effect/temp_visual/revenant(T)
 		T.ChangeTurf(/turf/closed/wall/rust)