Merge pull request #3752 from Woodratt/WR_Floor_type_change

Floor tile, type and carpet change

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

@@ -84,6 +84,24 @@
 	desc = "A piece of blue carpet. It is the same size as a normal floor tile!"
 	icon_state = "tile-bluecarpet"
 
+// VOREStation Edit
+// TODO - Add descriptions to these
+/obj/item/stack/tile/carpet/bcarpet
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/blucarpet
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/turcarpet
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/sblucarpet
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/gaycarpet
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/purcarpet
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/oracarpet
+	icon_state = "tile-carpet"
+// VOREStation Edit End
+
 /obj/item/stack/tile/floor
 	name = "floor tile"
 	singular_name = "floor tile"
@@ -96,37 +114,55 @@
 	throw_range = 20
 	flags = CONDUCT
 
-/obj/item/stack/tile/floor_red
+/obj/item/stack/tile/floor/red
 	name = "red floor tile"
 	singular_name = "red floor tile"
 	color = COLOR_RED_GRAY
 	icon_state = "tile_white"
 
-/obj/item/stack/tile/floor_steel
+// VOREStation Edit
+/obj/item/stack/tile/floor/techgrey
+	name = "grey techfloor tile"
+	singular_name = "grey techfloor tile"
+	icon_state = "techtile_grey"
+
+/obj/item/stack/tile/floor/techgrid
+	name = "grid techfloor tile"
+	singular_name = "grid techfloor tile"
+	icon_state = "techtile_grid"
+
+/obj/item/stack/tile/floor/steel_dirty
+	name = "steel floor tile"
+	singular_name = "steel floor tile"
+	icon_state = "tile_steel"
+	matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
+// VOREStation Edit End
+
+/obj/item/stack/tile/floor/steel
 	name = "steel floor tile"
 	singular_name = "steel floor tile"
 	icon_state = "tile_steel"
 	matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
 
-/obj/item/stack/tile/floor_white
+/obj/item/stack/tile/floor/white
 	name = "white floor tile"
 	singular_name = "white floor tile"
 	icon_state = "tile_white"
 	matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4)
 
-/obj/item/stack/tile/floor_yellow
+/obj/item/stack/tile/floor/yellow
 	name = "yellow floor tile"
 	singular_name = "yellow floor tile"
 	color = COLOR_BROWN
 	icon_state = "tile_white"
 
-/obj/item/stack/tile/floor_dark
+/obj/item/stack/tile/floor/dark
 	name = "dark floor tile"
 	singular_name = "dark floor tile"
 	icon_state = "fr_tile"
 	matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
 
-/obj/item/stack/tile/floor_freezer
+/obj/item/stack/tile/floor/freezer
 	name = "freezer floor tile"
 	singular_name = "freezer floor tile"
 	icon_state = "tile_freezer"

code/game/turfs/flooring/flooring.dm

@@ -18,7 +18,7 @@ var/list/flooring_types
 // [icon_base]_corners: directional overlays for non-edge corners.
 
 /decl/flooring
-	var/name
+	var/name = "floor"
 	var/desc
 	var/icon
 	var/icon_base
@@ -98,18 +98,49 @@ var/list/flooring_types
 		'sound/effects/footstep/carpet4.ogg',
 		'sound/effects/footstep/carpet5.ogg'))
 
-/decl/flooring/carpet/blue
-	name = "carpet"
+// VOREStation Edit - Eris Carpets
+/decl/flooring/carpet/bcarpet
+	name = "black carpet"
 	icon_base = "bcarpet"
-	build_type = /obj/item/stack/tile/carpet/blue
-	flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR
+	build_type = /obj/item/stack/tile/carpet/bcarpet
+
+/decl/flooring/carpet/blucarpet
+	name = "blue carpet"
+	icon_base = "blucarpet"
+	build_type = /obj/item/stack/tile/carpet/blucarpet
+
+/decl/flooring/carpet/turcarpet
+	name = "tur carpet"
+	icon_base = "turcarpet"
+	build_type = /obj/item/stack/tile/carpet/turcarpet
+
+/decl/flooring/carpet/sblucarpet
+	name = "silver blue carpet"
+	icon_base = "sblucarpet"
+	build_type = /obj/item/stack/tile/carpet/sblucarpet
+
+/decl/flooring/carpet/gaycarpet
+	name = "clown carpet"
+	icon_base = "gaycarpet"
+	build_type = /obj/item/stack/tile/carpet/gaycarpet
+
+/decl/flooring/carpet/purcarpet
+	name = "purple carpet"
+	icon_base = "purcarpet"
+	build_type = /obj/item/stack/tile/carpet/purcarpet
+
+/decl/flooring/carpet/oracarpet
+	name = "orange carpet"
+	icon_base = "oracarpet"
+	build_type = /obj/item/stack/tile/carpet/oracarpet
+// VOREStation Edit End
 
 /decl/flooring/tiling
 	name = "floor"
 	desc = "Scuffed from the passage of countless greyshirts."
-	icon = 'icons/turf/flooring/tiles.dmi'
-	icon_base = "steel"
-	has_damage_range = 4
+	icon = 'icons/turf/flooring/tiles.dmi' // VOREStation Edit - Eris floors
+	icon_base = "tiled" // VOREStation Edit - Eris floors
+	has_damage_range = 2 // VOREStation Edit - Eris floors
 	damage_temperature = T0C+1400
 	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK | TURF_CAN_BURN
 	build_type = /obj/item/stack/tile/floor
@@ -121,6 +152,45 @@ var/list/flooring_types
 		'sound/effects/footstep/floor4.ogg',
 		'sound/effects/footstep/floor5.ogg'))
 
+//VOREStation Edit for icons and extra types
+/decl/flooring/tiling/tech
+	desc = "Scuffed from the passage of countless greyshirts."
+	icon = 'icons/turf/flooring/techfloor.dmi'
+	icon_base = "techfloor_gray"
+	build_type = /obj/item/stack/tile/floor/techgrey
+	can_paint = null
+
+/decl/flooring/tiling/tech/grid
+	icon_base = "techfloor_grid"
+	build_type = /obj/item/stack/tile/floor/techgrid
+
+/decl/flooring/tiling/new_tile
+	name = "floor"
+	icon_base = "tile_full"
+	flags = TURF_CAN_BREAK | TURF_CAN_BURN | TURF_IS_FRAGILE
+	build_type = null
+
+/decl/flooring/tiling/new_tile/cargo_one
+	icon_base = "cargo_one_full"
+
+/decl/flooring/tiling/new_tile/kafel
+	icon_base = "kafel_full"
+
+/decl/flooring/tiling/new_tile/techmaint
+	icon_base = "techmaint"
+
+/decl/flooring/tiling/new_tile/monofloor
+	icon_base = "monofloor"
+
+/decl/flooring/tiling/new_tile/monotile
+	icon_base = "monotile"
+
+/decl/flooring/tiling/new_tile/steel_grid
+	icon_base = "steel_grid"
+
+/decl/flooring/tiling/new_tile/steel_ridged
+	icon_base = "steel_ridged"
+
 /decl/flooring/linoleum
 	name = "linoleum"
 	desc = "It's like the 2390's all over again."
@@ -135,36 +205,37 @@ var/list/flooring_types
 	icon_base = "white"
 	has_damage_range = null
 	flags = TURF_REMOVE_CROWBAR
-	build_type = /obj/item/stack/tile/floor_red
+	build_type = /obj/item/stack/tile/floor/red
 
 /decl/flooring/tiling/steel
+	name = "floor"
+	icon_base = "steel"
+	build_type = /obj/item/stack/tile/floor/steel
+
+/decl/flooring/tiling/steel_dirty
 	name = "floor"
 	icon_base = "steel_dirty"
-	has_damage_range = null
-	flags = TURF_REMOVE_CROWBAR
-	build_type = /obj/item/stack/tile/floor_steel
+	build_type = /obj/item/stack/tile/floor/steel_dirty
 
 /decl/flooring/tiling/asteroidfloor
 	name = "floor"
 	icon_base = "asteroidfloor"
 	has_damage_range = null
 	flags = TURF_REMOVE_CROWBAR
-	build_type = /obj/item/stack/tile/floor_steel
+	build_type = /obj/item/stack/tile/floor/steel
 
 /decl/flooring/tiling/white
 	name = "floor"
 	desc = "How sterile."
 	icon_base = "white"
-	has_damage_range = null
-	flags = TURF_REMOVE_CROWBAR
-	build_type = /obj/item/stack/tile/floor_white
+	build_type = /obj/item/stack/tile/floor/white
 
 /decl/flooring/tiling/yellow
 	name = "floor"
 	icon_base = "white"
 	has_damage_range = null
 	flags = TURF_REMOVE_CROWBAR
-	build_type = /obj/item/stack/tile/floor_yellow
+	build_type = /obj/item/stack/tile/floor/yellow
 
 /decl/flooring/tiling/dark
 	name = "floor"
@@ -172,29 +243,23 @@ var/list/flooring_types
 	icon_base = "dark"
 	has_damage_range = null
 	flags = TURF_REMOVE_CROWBAR
-	build_type = /obj/item/stack/tile/floor_dark
+	build_type = /obj/item/stack/tile/floor/dark
 
 /decl/flooring/tiling/hydro
 	name = "floor"
 	icon_base = "hydrofloor"
-	has_damage_range = null
-	flags = TURF_REMOVE_CROWBAR
-	build_type = /obj/item/stack/tile/floor_steel
+	build_type = /obj/item/stack/tile/floor/steel
 
 /decl/flooring/tiling/neutral
 	name = "floor"
 	icon_base = "neutral"
-	has_damage_range = null
-	flags = TURF_REMOVE_CROWBAR
-	build_type = /obj/item/stack/tile/floor_steel
+	build_type = /obj/item/stack/tile/floor/steel
 
 /decl/flooring/tiling/freezer
 	name = "floor"
 	desc = "Don't slip."
 	icon_base = "freezer"
-	has_damage_range = null
-	flags = TURF_REMOVE_CROWBAR
-	build_type = /obj/item/stack/tile/floor_freezer
+	build_type = /obj/item/stack/tile/floor/freezer
 
 /decl/flooring/wood
 	name = "wooden floor"

code/game/turfs/flooring/flooring_premade.dm

@@ -4,6 +4,47 @@
 	icon_state = "carpet"
 	initial_flooring = /decl/flooring/carpet
 
+/turf/simulated/floor/carpet/bcarpet
+	name = "black carpet"
+	icon_state = "bcarpet"
+	initial_flooring = /decl/flooring/carpet/bcarpet
+
+/turf/simulated/floor/carpet/blucarpet
+	name = "blue carpet"
+	icon_state = "blucarpet"
+	initial_flooring = /decl/flooring/carpet/blucarpet
+
+// Legacy support for existing paths for blue carpet
+/turf/simulated/floor/carpet/blue
+	name = "blue carpet"
+	icon_state = "blucarpet"
+	initial_flooring = /decl/flooring/carpet/blucarpet
+
+/turf/simulated/floor/carpet/turcarpet
+	name = "tur carpet"
+	icon_state = "turcarpet"
+	initial_flooring = /decl/flooring/carpet/turcarpet
+
+/turf/simulated/floor/carpet/sblucarpet
+	name = "sblue carpet"
+	icon_state = "sblucarpet"
+	initial_flooring = /decl/flooring/carpet/sblucarpet
+
+/turf/simulated/floor/carpet/gaycarpet
+	name = "clown carpet"
+	icon_state = "gaycarpet"
+	initial_flooring = /decl/flooring/carpet/gaycarpet
+
+/turf/simulated/floor/carpet/purcarpet
+	name = "purple carpet"
+	icon_state = "purcarpet"
+	initial_flooring = /decl/flooring/carpet/purcarpet
+
+/turf/simulated/floor/carpet/oracarpet
+	name = "orange carpet"
+	icon_state = "oracarpet"
+	initial_flooring = /decl/flooring/carpet/oracarpet
+
 /turf/simulated/floor/bluegrid
 	name = "mainframe floor"
 	icon = 'icons/turf/flooring/circuit.dmi'
@@ -28,17 +69,120 @@
 	icon_state = "grass0"
 	initial_flooring = /decl/flooring/grass
 
-/turf/simulated/floor/carpet/blue
-	name = "blue carpet"
-	icon_state = "bcarpet"
-	initial_flooring = /decl/flooring/carpet/blue
-
 /turf/simulated/floor/tiled
 	name = "floor"
 	icon = 'icons/turf/flooring/tiles.dmi'
-	icon_state = "steel"
+	icon_state = "tiled"
 	initial_flooring = /decl/flooring/tiling
 
+/turf/simulated/floor/tiled/techmaint
+	name = "floor"
+	icon = 'icons/turf/flooring/tiles.dmi'
+	icon_state = "techmaint"
+	initial_flooring = /decl/flooring/tiling/new_tile/techmaint
+
+/turf/simulated/floor/tiled/monofloor
+	name = "floor"
+	icon = 'icons/turf/flooring/tiles.dmi'
+	icon_state = "monofloor"
+	initial_flooring = /decl/flooring/tiling/new_tile/monofloor
+
+/turf/simulated/floor/tiled/techfloor
+	name = "floor"
+	icon = 'icons/turf/flooring/techfloor.dmi'
+	icon_state = "techfloor_gray"
+	initial_flooring = /decl/flooring/tiling/tech
+
+/turf/simulated/floor/tiled/monotile
+	name = "floor"
+	icon = 'icons/turf/flooring/tiles.dmi'
+	icon_state = "monotile"
+	initial_flooring = /decl/flooring/tiling/new_tile/monotile
+
+/turf/simulated/floor/tiled/steel_grid
+	name = "floor"
+	icon = 'icons/turf/flooring/tiles.dmi'
+	icon_state = "steel_grid"
+	initial_flooring = /decl/flooring/tiling/new_tile/steel_grid
+
+/turf/simulated/floor/tiled/steel_ridged
+	name = "floor"
+	icon = 'icons/turf/flooring/tiles.dmi'
+	icon_state = "steel_ridged"
+	initial_flooring = /decl/flooring/tiling/new_tile/steel_ridged
+
+/turf/simulated/floor/tiled/old_tile
+	name = "floor"
+	icon_state = "tile_full"
+	initial_flooring = /decl/flooring/tiling/new_tile
+/turf/simulated/floor/tiled/old_tile/white
+	color = "#d9d9d9"
+/turf/simulated/floor/tiled/old_tile/blue
+	color = "#8ba7ad"
+/turf/simulated/floor/tiled/old_tile/yellow
+	color = "#8c6d46"
+/turf/simulated/floor/tiled/old_tile/gray
+	color = "#687172"
+/turf/simulated/floor/tiled/old_tile/beige
+	color = "#385e60"
+/turf/simulated/floor/tiled/old_tile/red
+	color = "#964e51"
+/turf/simulated/floor/tiled/old_tile/purple
+	color = "#906987"
+/turf/simulated/floor/tiled/old_tile/green
+	color = "#46725c"
+
+
+
+/turf/simulated/floor/tiled/old_cargo
+	name = "floor"
+	icon_state = "cargo_one_full"
+	initial_flooring = /decl/flooring/tiling/new_tile/cargo_one
+/turf/simulated/floor/tiled/old_cargo/white
+	color = "#d9d9d9"
+/turf/simulated/floor/tiled/old_cargo/blue
+	color = "#8ba7ad"
+/turf/simulated/floor/tiled/old_cargo/yellow
+	color = "#8c6d46"
+/turf/simulated/floor/tiled/old_cargo/gray
+	color = "#687172"
+/turf/simulated/floor/tiled/old_cargo/beige
+	color = "#385e60"
+/turf/simulated/floor/tiled/old_cargo/red
+	color = "#964e51"
+/turf/simulated/floor/tiled/old_cargo/purple
+	color = "#906987"
+/turf/simulated/floor/tiled/old_cargo/green
+	color = "#46725c"
+
+
+/turf/simulated/floor/tiled/kafel_full
+	name = "floor"
+	icon_state = "kafel_full"
+	initial_flooring = /decl/flooring/tiling/new_tile/kafel
+/turf/simulated/floor/tiled/kafel_full/white
+	color = "#d9d9d9"
+/turf/simulated/floor/tiled/kafel_full/blue
+	color = "#8ba7ad"
+/turf/simulated/floor/tiled/kafel_full/yellow
+	color = "#8c6d46"
+/turf/simulated/floor/tiled/kafel_full/gray
+	color = "#687172"
+/turf/simulated/floor/tiled/kafel_full/beige
+	color = "#385e60"
+/turf/simulated/floor/tiled/kafel_full/red
+	color = "#964e51"
+/turf/simulated/floor/tiled/kafel_full/purple
+	color = "#906987"
+/turf/simulated/floor/tiled/kafel_full/green
+	color = "#46725c"
+
+
+/turf/simulated/floor/tiled/techfloor/grid
+	name = "floor"
+	icon_state = "techfloor_grid"
+	initial_flooring = /decl/flooring/tiling/tech/grid
+
 /turf/simulated/floor/reinforced
 	name = "reinforced floor"
 	icon = 'icons/turf/flooring/tiles.dmi'
@@ -113,9 +257,14 @@
 
 /turf/simulated/floor/tiled/steel
 	name = "steel floor"
-	icon_state = "steel_dirty"
+	icon_state = "steel"
 	initial_flooring = /decl/flooring/tiling/steel
 
+/turf/simulated/floor/tiled/steel_dirty
+	name = "steel floor"
+	icon_state = "steel_dirty"
+	initial_flooring = /decl/flooring/tiling/steel_dirty
+
 /turf/simulated/floor/tiled/steel/airless
 	oxygen = 0
 	nitrogen = 0

code/modules/materials/material_recipes.dm

@@ -95,7 +95,7 @@
 	recipes += new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1)
 	recipes += new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1)
 	recipes += new/datum/stack_recipe("knife grip", /obj/item/weapon/material/butterflyhandle, 4, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]")
-	recipes += new/datum/stack_recipe("dark floor tile", /obj/item/stack/tile/floor_dark, 1, 4, 20)
+	recipes += new/datum/stack_recipe("dark floor tile", /obj/item/stack/tile/floor/dark, 1, 4, 20)
 	recipes += new/datum/stack_recipe("roller bed", /obj/item/roller, 5, time = 30, on_floor = 1)
 	recipes += new/datum/stack_recipe("whetstone", /obj/item/weapon/whetstone, 2, time = 10)
 
@@ -111,8 +111,8 @@
 	recipes += new/datum/stack_recipe("reagent dispenser cartridge (large)", /obj/item/weapon/reagent_containers/chem_disp_cartridge,        5, on_floor=0) // 500u
 	recipes += new/datum/stack_recipe("reagent dispenser cartridge (med)",   /obj/item/weapon/reagent_containers/chem_disp_cartridge/medium, 3, on_floor=0) // 250u
 	recipes += new/datum/stack_recipe("reagent dispenser cartridge (small)", /obj/item/weapon/reagent_containers/chem_disp_cartridge/small,  1, on_floor=0) // 100u
-	recipes += new/datum/stack_recipe("white floor tile", /obj/item/stack/tile/floor_white, 1, 4, 20)
-	recipes += new/datum/stack_recipe("freezer floor tile", /obj/item/stack/tile/floor_freezer, 1, 4, 20)
+	recipes += new/datum/stack_recipe("white floor tile", /obj/item/stack/tile/floor/white, 1, 4, 20)
+	recipes += new/datum/stack_recipe("freezer floor tile", /obj/item/stack/tile/floor/freezer, 1, 4, 20)
 	recipes += new/datum/stack_recipe("shower curtain", /obj/structure/curtain, 4, time = 15, one_per_turf = 1, on_floor = 1)
 	recipes += new/datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 4, time = 25, one_per_turf = 1, on_floor = 1)
 	recipes += new/datum/stack_recipe("airtight plastic flaps", /obj/structure/plasticflaps/mining, 5, time = 25, one_per_turf = 1, on_floor = 1)

html/changelogs/Woodrat - Floor Tiles.yml

@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Woodrat
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Ported floor types and floor sprites (Techfloors) from Vorestation (who ported them from Eris). Brought our floortypes in line with how Vorestation has theirs set up."
+  - bugfix: "Missing Techfloor floor tile sprites added."
+  - wip: "Floor sprites from Vorestation not yet ported. To be done once we go to the new map."