Merge pull request #5357 from tkdrg/attackoftheturfs

Floor refactor

code/modules/events/ninja.dm

@@ -623,7 +623,7 @@ spideros = text2num(return_to)//Maximum length here is 6. Use (return_to, X) to
 	var/mob/living/carbon/human/U = loc
 	if(candrain&&!draining)
 		var/turf/T = U.loc
-		if(isturf(T) && T.is_plating())
+		if(isturf(T) && istype(T, /turf/simulated/floor/plating)
 			attached = locate() in T
 			if(!attached)
 				U << "\red Warning: no exposed cable available."
@@ -2747,4 +2747,4 @@ proc/create_ninja_mind(key)
 	Mind.assigned_role = "MODE"
 	Mind.special_role = "Space Ninja"
 	ticker.mode.traitors |= Mind			//Adds them to current traitor list. Which is really the extra antagonist list.
-	return Mind
+	return Mind

code/modules/mining/mine_turfs.dm

@@ -490,6 +490,9 @@
 //	spawn(2)
 //O		updateMineralOverlays()
 
+/turf/simulated/floor/plating/asteroid/burn_tile()
+	return
+
 /turf/simulated/floor/plating/asteroid/ex_act(severity)
 	switch(severity)
 		if(3.0)

code/modules/recycling/disposal.dm

@@ -692,12 +692,10 @@
 
 	var/turf/target
 
-	if(istype(T, /turf/simulated/floor)) //intact floor, pop the tile
-		var/turf/simulated/floor/F = T
-		if(F.floor_tile)
-			F.floor_tile.loc = H //It took me a day to figure out this was the right way to do it.
-		F.floor_tile = null //So it doesn't get deleted in make_plating()
-		F.make_plating()
+	if(istype(T, /turf/simulated/floor) && !istype(T, /turf/simulated/floor/plating)) //intact floor, pop the tile
+		var/turf/simulated/floor/myturf = T
+		new myturf.floor_tile(T)
+		myturf.make_plating()
 
 	if(direction)		// direction is specified
 		if(istype(T, /turf/space)) // if ended in space, then range is unlimited