More tiles and some cleanup (#5608)

Resources/Prototypes/Tiles/floors.yml

@@ -1,6 +1,52 @@
 - type: tile
+  name: floor_steel
+  display_name: steel floor
+  texture: "steel"
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemSteel
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_wood
+  display_name: wood
+  texture: "wood"
+  base_turfs:
+  - space
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_wood
+  friction: 0.30
+  item_drop: FloorTileItemWood
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_white
+  display_name: white floor
+  texture: "white"
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.25
+  item_drop: FloorTileItemWhite
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
   name: floor_dark
-  display_name: Dark floor
+  display_name: dark floor
   texture: "dark"
   base_turfs:
   - plating
@@ -13,11 +59,10 @@
   thermalConductivity: 0.04
   heatCapacity: 10000
 
-
 - type: tile
-  name: floor_elevator_shaft
-  display_name: Elevator shaft
-  texture: "elevator_shaft"
+  name: floor_techmaint
+  display_name: techmaint floor
+  texture: "tech_maint"
   base_turfs:
   - plating
   is_subfloor: false
@@ -25,13 +70,14 @@
   footstep_sounds:
     collection: footstep_floor
   friction: 0.30
+  item_drop: FloorTileItemTechmaint
   thermalConductivity: 0.04
   heatCapacity: 10000
 
 - type: tile
-  name: floor_freezer
-  display_name: Freezer
-  texture: "freezer"
+  name: floor_reinforced
+  display_name: reinforced floor
+  texture: "reinforced"
   base_turfs:
   - plating
   is_subfloor: false
@@ -39,71 +85,13 @@
   footstep_sounds:
     collection: footstep_floor
   friction: 0.30
-  item_drop: FloorTileItemFreezer
-  thermalConductivity: 0.04
-  heatCapacity: 10000
-
-- type: tile
-  name: floor_hydro
-  display_name: Hydro floor
-  texture: "hydro"
-  base_turfs:
-  - plating
-  is_subfloor: false
-  can_crowbar: true
-  footstep_sounds:
-    collection: footstep_floor
-  friction: 0.30
-  thermalConductivity: 0.04
-  heatCapacity: 10000
-
-- type: tile
-  name: floor_green_circuit
-  display_name: Green circuit floor
-  texture: "green_circuit"
-  base_turfs:
-  - plating
-  is_subfloor: false
-  can_crowbar: true
-  footstep_sounds:
-    collection: footstep_floor
-  friction: 0.30
-  item_drop: FloorTileItemGCircuit
-  thermalConductivity: 0.04
-  heatCapacity: 10000
-
-- type: tile
-  name: floor_blue_circuit
-  display_name: Blue circuit floor
-  texture: "blue_circuit"
-  base_turfs:
-  - plating
-  is_subfloor: false
-  can_crowbar: true
-  footstep_sounds:
-    collection: footstep_floor
-  friction: 0.30
-  thermalConductivity: 0.04
-  heatCapacity: 10000
-
-- type: tile
-  name: floor_lino
-  display_name: Linoleum floor
-  texture: "lino"
-  base_turfs:
-  - plating
-  is_subfloor: false
-  can_crowbar: true
-  footstep_sounds:
-    collection: footstep_floor
-  friction: 0.30
-  item_drop: FloorTileItemLino
+  item_drop: FloorTileItemReinforced
   thermalConductivity: 0.04
   heatCapacity: 10000
 
 - type: tile
   name: floor_mono
-  display_name: Mono floor
+  display_name: mono floor
   texture: "mono"
   base_turfs:
   - plating
@@ -117,9 +105,9 @@
   heatCapacity: 10000
 
 - type: tile
-  name: floor_reinforced
-  display_name: Reinforced floor
-  texture: "reinforced"
+  name: floor_lino
+  display_name: linoleum floor
+  texture: "lino"
   base_turfs:
   - plating
   is_subfloor: false
@@ -127,7 +115,37 @@
   footstep_sounds:
     collection: footstep_floor
   friction: 0.30
-  item_drop: FloorTileItemReinforced
+  item_drop: FloorTileItemLino
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_steel_dirty
+  display_name: dirty steel floor
+  texture: "steel_dirty"
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemDirty
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_elevator_shaft
+  display_name: elevator shaft
+  texture: "elevator_shaft"
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemElevatorShaft
   thermalConductivity: 0.04
   heatCapacity: 10000
 
@@ -142,12 +160,43 @@
   footstep_sounds:
     collection: footstep_floor
   friction: 0.30
+  item_drop: FloorTileItemRockVault
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_blue
+  display_name: blue tile
+  texture: blue
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  item_drop: FloorTileItemBlue
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+# Departamental
+- type: tile
+  name: floor_freezer
+  display_name: freezer
+  texture: "freezer"
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemFreezer
   thermalConductivity: 0.04
   heatCapacity: 10000
 
 - type: tile
   name: floor_showroom
-  display_name: Showroom floor
+  display_name: showroom floor
   texture: "showroom"
   base_turfs:
   - plating
@@ -161,9 +210,9 @@
   heatCapacity: 10000
 
 - type: tile
-  name: floor_steel
-  display_name: Steel floor
-  texture: "steel"
+  name: floor_hydro
+  display_name: hydro floor
+  texture: "hydro"
   base_turfs:
   - plating
   is_subfloor: false
@@ -171,14 +220,14 @@
   footstep_sounds:
     collection: footstep_floor
   friction: 0.30
-  item_drop: FloorTileItemSteel
+  item_drop: FloorTileItemHydro
   thermalConductivity: 0.04
   heatCapacity: 10000
 
 - type: tile
-  name: floor_steel_dirty
-  display_name: Dirty steel floor
-  texture: "steel_dirty"
+  name: floor_bar
+  display_name: bar floor
+  texture: "bar"
   base_turfs:
   - plating
   is_subfloor: false
@@ -186,14 +235,14 @@
   footstep_sounds:
     collection: footstep_floor
   friction: 0.30
-  item_drop: FloorTileItemDirty
+  item_drop: FloorTileItemBar
   thermalConductivity: 0.04
   heatCapacity: 10000
 
 - type: tile
-  name: floor_techmaint
-  display_name: Techmaint Floor
-  texture: "tech_maint"
+  name: floor_clown
+  display_name: clown floor
+  texture: "clown"
   base_turfs:
   - plating
   is_subfloor: false
@@ -201,126 +250,59 @@
   footstep_sounds:
     collection: footstep_floor
   friction: 0.30
-  item_drop: FloorTileItemTechmaint
+  item_drop: FloorTileItemClown
   thermalConductivity: 0.04
   heatCapacity: 10000
 
 - type: tile
-  name: floor_white
-  display_name: White Floor
-  texture: "white"
+  name: floor_mime
+  display_name: mime floor
+  texture: "mime"
   base_turfs:
   - plating
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
     collection: footstep_floor
-  friction: 0.25
-  item_drop: FloorTileItemWhite
-  thermalConductivity: 0.04
-  heatCapacity: 10000
-
-- type: tile
-  name: floor_asteroid_sand
-  display_name: Asteroid Floor
-  texture: Asteroid/asteroid_sand
-  base_turfs:
-  - space
-  is_subfloor: false
-  can_crowbar: false
-  footstep_sounds:
-    collection: footstep_asteroid
   friction: 0.30
+  item_drop: FloorTileItemMime
   thermalConductivity: 0.04
   heatCapacity: 10000
 
 - type: tile
-  name: floor_asteroid_tile
-  display_name: Asteroid Tile
-  texture: Asteroid/asteroid_tile
+  name: floor_kitchen
+  display_name: kitchen floor
+  texture: "kitchen"
   base_turfs:
   - plating
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_asteroid
+    collection: footstep_floor
   friction: 0.30
+  item_drop: FloorTileItemKitchen
   thermalConductivity: 0.04
   heatCapacity: 10000
 
 - type: tile
-  name: floor_asteroid_coarse_sand0
-  display_name: Asteroid Coarse Sand 0
-  texture: Asteroid/asteroid_coarse_sand0
+  name: floor_laundry
+  display_name: laundry floor
+  texture: "laundry"
   base_turfs:
-  - space
+  - plating
   is_subfloor: false
-  can_crowbar: false
+  can_crowbar: true
   footstep_sounds:
-    collection: footstep_asteroid
-  friction: 0.30
-  thermalConductivity: 0.04
-  heatCapacity: 10000
-
-- type: tile
-  name: floor_asteroid_coarse_sand1
-  display_name: Asteroid Coarse Sand 1
-  texture: Asteroid/asteroid_coarse_sand1
-  base_turfs:
-  - space
-  is_subfloor: false
-  can_crowbar: false
-  footstep_sounds:
-    collection: footstep_asteroid
-  friction: 0.30
-  thermalConductivity: 0.04
-  heatCapacity: 10000
-
-- type: tile
-  name: floor_asteroid_coarse_sand2
-  display_name: Asteroid Coarse Sand 2
-  texture: Asteroid/asteroid_coarse_sand2
-  base_turfs:
-  - space
-  is_subfloor: false
-  can_crowbar: false
-  footstep_sounds:
-    collection: footstep_asteroid
-  friction: 0.30
-  thermalConductivity: 0.04
-  heatCapacity: 10000
-
-- type: tile
-  name: floor_asteroid_coarse_sand_dug
-  display_name: Asteroid Dug Coarse Sand
-  texture: Asteroid/asteroid_coarse_sand_dug
-  base_turfs:
-  - space
-  is_subfloor: false
-  can_crowbar: false
-  footstep_sounds:
-    collection: footstep_asteroid
-  friction: 0.30
-  thermalConductivity: 0.04
-  heatCapacity: 10000
-
-- type: tile
-  name: floor_snow
-  display_name: Snow
-  texture: snow
-  base_turfs:
-  - space
-  is_subfloor: false
-  can_crowbar: false
-  footstep_sounds:
-    collection: footstep_snow
+    collection: footstep_floor
   friction: 0.30
+  item_drop: FloorTileItemLaundry
   thermalConductivity: 0.04
   heatCapacity: 10000
 
+# Materials
 - type: tile
   name: floor_gold
-  display_name: Gold Tile
+  display_name: gold tile
   texture: gold
   base_turfs:
   - plating
@@ -335,7 +317,7 @@
 
 - type: tile
   name: floor_silver
-  display_name: Silver Tile
+  display_name: silver tile
   texture: silver
   base_turfs:
   - plating
@@ -344,6 +326,7 @@
   footstep_sounds:
     collection: footstep_floor
   friction: 0.30
+  item_drop: FloorTileItemSilver
   thermalConductivity: 0.04
   heatCapacity: 10000
 
@@ -377,10 +360,11 @@
   thermalConductivity: 0.04
   heatCapacity: 10000
 
+# Circuits
 - type: tile
-  name: floor_blue
-  display_name: Blue Tile
-  texture: blue
+  name: floor_green_circuit
+  display_name: green circuit floor
+  texture: "green_circuit"
   base_turfs:
   - plating
   is_subfloor: false
@@ -388,5 +372,137 @@
   footstep_sounds:
     collection: footstep_floor
   friction: 0.30
+  item_drop: FloorTileItemGCircuit
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_blue_circuit
+  display_name: blue circuit floor
+  texture: "blue_circuit"
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemBCircuit
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+# Terrain
+- type: tile
+  name: floor_snow
+  display_name: snow
+  texture: snow
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_snow
+  friction: 0.20
+  item_drop: FloorTileItemSnow
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_grass
+  display_name: grass floor
+  texture: "grass"
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemGrass
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+# Asteroid
+- type: tile
+  name: floor_asteroid_sand
+  display_name: asteroid floor
+  texture: Asteroid/asteroid_sand
+  base_turfs:
+  - space
+  is_subfloor: false
+  can_crowbar: false
+  footstep_sounds:
+    collection: footstep_asteroid
+  friction: 0.30
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_asteroid_tile
+  display_name: asteroid tile
+  texture: Asteroid/asteroid_tile
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_asteroid
+  friction: 0.30
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_asteroid_coarse_sand0
+  display_name: asteroid coarse sand 0
+  texture: Asteroid/asteroid_coarse_sand0
+  base_turfs:
+  - space
+  is_subfloor: false
+  can_crowbar: false
+  footstep_sounds:
+    collection: footstep_asteroid
+  friction: 0.30
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_asteroid_coarse_sand1
+  display_name: asteroid coarse sand 1
+  texture: Asteroid/asteroid_coarse_sand1
+  base_turfs:
+  - space
+  is_subfloor: false
+  can_crowbar: false
+  footstep_sounds:
+    collection: footstep_asteroid
+  friction: 0.30
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_asteroid_coarse_sand2
+  display_name: asteroid coarse sand 2
+  texture: Asteroid/asteroid_coarse_sand2
+  base_turfs:
+  - space
+  is_subfloor: false
+  can_crowbar: false
+  footstep_sounds:
+    collection: footstep_asteroid
+  friction: 0.30
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  name: floor_asteroid_coarse_sand_dug
+  display_name: asteroid dug coarse sand
+  texture: Asteroid/asteroid_coarse_sand_dug
+  base_turfs:
+  - space
+  is_subfloor: false
+  can_crowbar: false
+  footstep_sounds:
+    collection: footstep_asteroid
+  friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000

Resources/Prototypes/Tiles/plating.yml

@@ -1,13 +1,15 @@
 - type: tile
   name: plating
-  display_name: Plating
+  display_name: plating
   texture: plating
   base_turfs:
-  - underplating
+  - lattice
   is_subfloor: true
   footstep_sounds:
     collection: footstep_plating
   friction: 0.5
+  thermalConductivity: 0.04
+  heatCapacity: 10000
 
 - type: tile
   name: lattice
@@ -20,10 +22,13 @@
     collection: footstep_plating
   friction: 0.5
   is_space: true
+  thermalConductivity: 0.04
+  heatCapacity: 10000
 
+# TODO kill underplating and all its usages since it is deprecated
 - type: tile
   name: underplating
-  display_name: Underplating
+  display_name: underplating
   texture: underplating
   base_turfs:
   - lattice

Resources/Prototypes/Tiles/space.yml

@@ -1,6 +1,6 @@
 - type: tile
   name: space
-  display_name: Space
+  display_name: space
   texture: ""
   friction: 0
   is_subfloor: true

Resources/Prototypes/Tiles/wood.yml

@@ -1,13 +0,0 @@
-- type: tile
-  name: floor_wood
-  display_name: Wood
-  texture: "wood"
-  base_turfs:
-  - space
-  - plating
-  is_subfloor: false
-  can_crowbar: true
-  footstep_sounds:
-    collection: footstep_wood
-  friction: 0.30
-  item_drop: FloorTileItemWood