Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

code/game/turfs/simulated/floor.dm

@@ -189,9 +189,12 @@
 		if(user && !silent)
 			to_chat(user, "<span class='notice'>You remove the floor tile.</span>")
 		if(floor_tile && make_tile)
-			new floor_tile(src)
+			spawn_tile()
 	return make_plating()
 
+/turf/open/floor/proc/spawn_tile()
+	new floor_tile(src)
+
 /turf/open/floor/singularity_pull(S, current_size)
 	. = ..()
 	switch(current_size)
@@ -205,7 +208,7 @@
 			if(floor_tile)
 				if(prob(70))
 					remove_tile()
-			else if(prob(50))
+			else if(prob(50) && (/turf/open/space in baseturfs))
 				ReplaceWithLattice()
 
 /turf/open/floor/narsie_act(force, ignore_mobs, probability = 20)
@@ -293,3 +296,13 @@
 			return TRUE
 
 	return FALSE
+
+/turf/open/floor/material
+	name = "floor"
+	icon_state = "materialfloor"
+	material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
+
+/turf/open/floor/material/spawn_tile()
+	for(var/i in custom_materials)
+		var/datum/material/M = i
+		new M.sheet_type(src, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1))

code/game/turfs/simulated/floor/fancy_floor.dm

@@ -157,7 +157,7 @@
 	planetary_atmos = TRUE
 	floor_tile = null
 	initial_gas_mix = FROZEN_ATMOS
-	slowdown = 1.5 //So digging it out paths are usefull.
+	slowdown = 1.5 //So digging it out paths are useful.
 	bullet_sizzle = TRUE
 	footstep = FOOTSTEP_SAND
 	barefootstep = FOOTSTEP_SAND

code/game/turfs/simulated/floor/plating.dm

@@ -76,11 +76,15 @@
 			var/obj/item/stack/tile/W = C
 			if(!W.use(1))
 				return
-			var/turf/open/floor/T = PlaceOnTop(W.turf_type, flags = CHANGETURF_INHERIT_AIR)
-			if(istype(W, /obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
-				var/obj/item/stack/tile/light/L = W
-				var/turf/open/floor/light/F = T
-				F.state = L.state
+			if(istype(W, /obj/item/stack/tile/material))
+				var/turf/newturf = PlaceOnTop(/turf/open/floor/material, flags = CHANGETURF_INHERIT_AIR)
+				newturf.set_custom_materials(W.custom_materials)
+			else if(W.turf_type)
+				var/turf/open/floor/T = PlaceOnTop(W.turf_type, flags = CHANGETURF_INHERIT_AIR)
+				if(istype(W, /obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
+					var/obj/item/stack/tile/light/L = W
+					var/turf/open/floor/light/F = T
+					F.state = L.state
 			playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
 		else
 			to_chat(user, "<span class='warning'>This section is too damaged to support a tile! Use a welder to fix the damage.</span>")

code/game/turfs/simulated/wall/material_walls.dm

@@ -0,0 +1,22 @@
+/turf/closed/wall/material
+	name = "wall"
+	desc = "A huge chunk of material used to separate rooms."
+	icon = 'icons/turf/walls/materialwall.dmi'
+	icon_state = "wall"
+	canSmoothWith = list(/turf/closed/wall/material)
+	smooth = SMOOTH_TRUE
+	material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
+
+/turf/closed/wall/material/break_wall()
+	for(var/i in custom_materials)
+		var/datum/material/M = i
+		new M.sheet_type(src, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1))
+	return new girder_type(src)
+
+/turf/closed/wall/material/devastate_wall()
+	for(var/i in custom_materials)
+		var/datum/material/M = i
+		new M.sheet_type(src, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1))
+
+/turf/closed/wall/material/mat_update_desc(mat)
+	desc = "A huge chunk of [mat] used to separate rooms."

code/game/turfs/turf.dm

@@ -85,6 +85,9 @@
 	if (opacity)
 		has_opaque_atom = TRUE
 
+	// apply materials properly from the default custom_materials value
+	set_custom_materials(custom_materials)
+
 	ComponentInitialize()
 
 	return INITIALIZE_HINT_NORMAL