Merge pull request #4949 from Nerezza/Floor-fixes

Flooring fixes

code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm

@@ -10,7 +10,7 @@
 
 /obj/fiftyspawner/wood/sif
 	name = "stack of alien wood"
-	type_to_spawn = /obj/item/stack/tile/sifwood
+	type_to_spawn = /obj/item/stack/tile/wood/sif
 
 /obj/fiftyspawner/carpet
 	name = "stack of carpet"

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -37,9 +37,6 @@
 	flags = 0
 	origin_tech = list(TECH_BIO = 1)
 	no_variants = FALSE
-
-/obj/item/stack/tile/grass/fifty
-	amount = 50
 /*
  * Wood
  */
@@ -55,23 +52,11 @@
 	flags = 0
 	no_variants = FALSE
 
-/obj/item/stack/tile/sifwood
+/obj/item/stack/tile/wood/sif
 	name = "alien wood tile"
 	singular_name = "alien wood tile"
 	desc = "An easy to fit wooden floor tile. It's blue!"
 	icon_state = "tile-sifwood"
-	force = 1.0
-	throwforce = 1.0
-	throw_speed = 5
-	throw_range = 20
-	flags = 0
-	no_variants = FALSE
-
-/obj/item/stack/tile/wood/fifty
-	amount = 50
-
-/obj/item/stack/tile/sifwood/fifty
-	amount = 50
 
 /obj/item/stack/tile/wood/cyborg
 	name = "wood floor tile synthesizer"

code/game/turfs/flooring/flooring.dm

@@ -1,5 +1,10 @@
 var/list/flooring_types
 
+/proc/populate_flooring_types()
+	flooring_types = list()
+	for (var/flooring_path in typesof(/decl/flooring))
+		flooring_types["[flooring_path]"] = new flooring_path
+
 /proc/get_flooring_data(var/flooring_path)
 	if(!flooring_types)
 		flooring_types = list()
@@ -270,7 +275,7 @@ var/list/flooring_types
 
 /decl/flooring/wood
 	name = "wooden floor"
-	desc = "Polished redwood planks."
+	desc = "Polished wooden planks."
 	icon = 'icons/turf/flooring/wood.dmi'
 	icon_base = "wood"
 	has_damage_range = 6
@@ -285,22 +290,12 @@ var/list/flooring_types
 		'sound/effects/footstep/wood4.ogg',
 		'sound/effects/footstep/wood5.ogg'))
 
-/decl/flooring/sifwood
+/decl/flooring/wood/sif
 	name = "alien wooden floor"
 	desc = "Polished alien wood planks."
 	icon = 'icons/turf/flooring/wood.dmi'
 	icon_base = "sifwood"
-	has_damage_range = 6
-	damage_temperature = T0C+200
-	descriptor = "planks"
-	build_type = /obj/item/stack/tile/sifwood
-	flags = TURF_CAN_BREAK | TURF_IS_FRAGILE | TURF_REMOVE_SCREWDRIVER
-	footstep_sounds = list("human" = list(
-		'sound/effects/footstep/wood1.ogg',
-		'sound/effects/footstep/wood2.ogg',
-		'sound/effects/footstep/wood3.ogg',
-		'sound/effects/footstep/wood4.ogg',
-		'sound/effects/footstep/wood5.ogg'))
+	build_type = /obj/item/stack/tile/wood/sif
 
 /decl/flooring/reinforced
 	name = "reinforced floor"

code/game/turfs/flooring/flooring_premade.dm

@@ -68,11 +68,11 @@
 	icon_state = "wood"
 	initial_flooring = /decl/flooring/wood
 
-/turf/simulated/floor/sifwood
+/turf/simulated/floor/wood/sif
 	name = "alien wooden floor"
 	icon = 'icons/turf/flooring/wood.dmi'
 	icon_state = "sifwood"
-	initial_flooring = /decl/flooring/sifwood
+	initial_flooring = /decl/flooring/wood/sif
 
 /turf/simulated/floor/grass
 	name = "grass patch"

code/modules/materials/material_recipes.dm

@@ -186,6 +186,6 @@
 
 /material/wood/sif/generate_recipes()
 	..()
-	recipes += new/datum/stack_recipe("alien wood floor tile", /obj/item/stack/tile/sifwood, 1, 4, 20)
+	recipes += new/datum/stack_recipe("alien wood floor tile", /obj/item/stack/tile/wood/sif, 1, 4, 20)
 	recipes -= new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20)
 	recipes -= new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood, 3, time = 10, one_per_turf = 1, on_floor = 1)

code/world.dm

@@ -111,6 +111,9 @@ var/global/datum/global_init/init = new ()
 	// Create frame types.
 	populate_frame_types()
 
+	// Create floor types.
+	populate_flooring_types()
+
 	// Create robolimbs for chargen.
 	populate_robolimb_list()
 
@@ -121,7 +124,7 @@ var/global/datum/global_init/init = new ()
 	processScheduler.setup()
 	Master.Initialize(10, FALSE)
 
-	spawn(1)		
+	spawn(1)
 		master_controller.setup()
 #if UNIT_TEST
 		initialize_unit_tests()