- Abandoned ship, wizard's den, the shuttles east of the beach, DJ station, the syndicate shuttle and large parts of the derelict are now made from unsimulated turfs. This reduces air group processing by about a third and has the effect of noticeably reducing lag. The currently present downside is that you cannot interact with them. I'd like to give this a test because I believe the tradeoff is worth it as my tests have shown a massive reduction in lag.

Unsimulated turfs now hide wire nad pipes and such things under them,

- Moved all floors to code/game/turf.dm so they're all in one place (Other than asteroids I guess, those are still in mining.dm)

. Shuttle walls now look at unsimulated floors too when determining the underlay for diagonal wall pieces.

- Some areas around the station that were with air but were intended to be airless are now airless.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1628 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/KeelinsStuff.dm

@@ -428,10 +428,12 @@
 
 					var/old_dir1 = T.dir
 					var/old_icon_state1 = T.icon_state
+					var/old_icon1 = T.icon
 
 					var/turf/X = new T.type(B)
 					X.dir = old_dir1
 					X.icon_state = old_icon_state1
+					X.icon = old_icon1 //Shuttle floors are in shuttle.dmi while the defaults are floors.dmi
 
 					for(var/obj/O in T)
 						if(!istype(O,/obj)) continue

code/defines/turf.dm

@@ -59,38 +59,7 @@
 	var/to_be_destroyed = 0 //Used for fire, if a melting temperature was reached, it will be destroyed
 	var/max_fire_temperature_sustained = 0 //The max temperature of the fire which it was subjected to
 
-/turf/simulated/floor/engine
-	name = "reinforced floor"
-	icon_state = "engine"
-	thermal_conductivity = 0.025
-	heat_capacity = 325000
 
-/turf/simulated/floor/engine/vacuum
-	name = "vacuum floor"
-	icon_state = "engine"
-	oxygen = 0
-	nitrogen = 0.001
-	temperature = TCMB
-
-/turf/simulated/floor/plating
-	name = "plating"
-	icon_state = "plating"
-	floor_tile = null
-	intact = 0
-
-/turf/simulated/floor/plating/airless
-	name = "airless plating"
-	oxygen = 0.01
-	nitrogen = 0.01
-	temperature = TCMB
-
-	New()
-		..()
-		name = "plating"
-
-/turf/simulated/floor/grid
-	icon = 'floors.dmi'
-	icon_state = "circuit"
 
 /turf/simulated/wall/r_wall
 	name = "r wall"
@@ -132,6 +101,7 @@
 	icon_state = "floor"
 
 /turf/unsimulated
+	intact = 1
 	name = "command"
 	oxygen = MOLES_O2STANDARD
 	nitrogen = MOLES_N2STANDARD
@@ -174,19 +144,7 @@
 					L.Add(t)
 		return L
 
-/turf/simulated/floor/vault
-	icon_state = "rockvault"
 
-	New(location,type)
-		..()
-		icon_state = "[type]vault"
-
-/turf/simulated/wall/vault
-	icon_state = "rockvault"
-
-	New(location,type)
-		..()
-		icon_state = "[type]vault"
 
 /turf/simulated/wall/mineral
 	icon = 'mineral_walls.dmi'

code/game/smoothwall.dm

@@ -46,6 +46,12 @@
 			src.icon_state = "swall[junction]"
 		else //if it's diagonal, we need to figure out if we're using the floor diagonal or the space diagonal sprite
 			var/is_floor = 0
+			for(var/turf/unsimulated/floor/F in orange(src,1))
+				if(abs(src.x-F.x)-abs(src.y-F.y))
+					if((15-junction) & get_dir(src,F)) //if there's a floor in at least one of the empty space directions, return 1
+						is_floor = 1
+						newicon = F.icon
+						newiconstate = F.icon_state //we'll save these for later
 			for(var/turf/simulated/floor/F in orange(src,1))
 				if(abs(src.x-F.x)-abs(src.y-F.y))
 					if((15-junction) & get_dir(src,F)) //if there's a floor in at least one of the empty space directions, return 1

code/game/turf.dm

@@ -542,6 +542,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
 	var/obj/item/stack/tile/floor_tile = new/obj/item/stack/tile/steel
 
 	airless
+		icon_state = "floor"
 		name = "airless floor"
 		oxygen = 0.01
 		nitrogen = 0.01
@@ -581,7 +582,53 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
 						var/turf/simulated/floor/FF = get_step(src,direction)
 						FF.update_icon() //so siding get updated properly
 
+/turf/simulated/floor/vault
+	icon_state = "rockvault"
 
+	New(location,type)
+		..()
+		icon_state = "[type]vault"
+
+/turf/simulated/wall/vault
+	icon_state = "rockvault"
+
+	New(location,type)
+		..()
+		icon_state = "[type]vault"
+
+/turf/simulated/floor/engine
+	name = "reinforced floor"
+	icon_state = "engine"
+	thermal_conductivity = 0.025
+	heat_capacity = 325000
+
+/turf/simulated/floor/engine/vacuum
+	name = "vacuum floor"
+	icon_state = "engine"
+	oxygen = 0
+	nitrogen = 0.001
+	temperature = TCMB
+
+/turf/simulated/floor/plating
+	name = "plating"
+	icon_state = "plating"
+	floor_tile = null
+	intact = 0
+
+/turf/simulated/floor/plating/airless
+	icon_state = "plating"
+	name = "airless plating"
+	oxygen = 0.01
+	nitrogen = 0.01
+	temperature = TCMB
+
+	New()
+		..()
+		name = "plating"
+
+/turf/simulated/floor/grid
+	icon = 'floors.dmi'
+	icon_state = "circuit"
 
 /turf/simulated/floor/New()
 	..()

code/modules/power/cable.dm

@@ -84,7 +84,7 @@
 
 /obj/cable/hide(var/i)
 
-	if(level == 1 && istype(loc, /turf/simulated))
+	if(level == 1 && istype(loc, /turf))
 		invisibility = i ? 101 : 0
 	updateicon()