More tiles and some cleanup (#5608)

Resources/Maps/packedstation.yml

@@ -53094,7 +53094,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 5480
-  type: CarpetGay
+  type: CarpetPink
   components:
   - pos: 67.5,39.5
     parent: 0

Resources/Maps/saltern.yml

@@ -44521,28 +44521,28 @@ entities:
     parent: 853
     type: Transform
 - uid: 4129
-  type: CarpetGay
+  type: CarpetPink
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -29.5,-4.5
     parent: 853
     type: Transform
 - uid: 4130
-  type: CarpetGay
+  type: CarpetPink
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -29.5,-5.5
     parent: 853
     type: Transform
 - uid: 4131
-  type: CarpetGay
+  type: CarpetPink
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -28.5,-4.5
     parent: 853
     type: Transform
 - uid: 4132
-  type: CarpetGay
+  type: CarpetPink
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -28.5,-5.5

Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml

@@ -38,7 +38,7 @@
       - steel_3
   - type: FloorTile
     outputs:
-    - underplating
+    - plating
 
 - type: entity
   parent: SheetSteel

Resources/Prototypes/Entities/Objects/Misc/carpets.yml

@@ -0,0 +1,104 @@
+# TODO once tiles can be smoothed and carpets ported over to that, add them to the FloorTile outputs
+- type: entity
+  name: red carpet
+  parent: FloorTileItemBase
+  id: FloorCarpetItemRed
+  components:
+  - type: Sprite
+    state: carpet-red
+  - type: Item
+    HeldPrefix: carpet-red
+  - type: FloorTile
+    outputs:
+      - plating
+
+- type: entity
+  name: black carpet
+  parent: FloorTileItemBase
+  id: FloorCarpetItemBlack
+  components:
+  - type: Sprite
+    state: carpet-black
+  - type: Item
+    HeldPrefix: carpet-black
+  - type: FloorTile
+    outputs:
+      - plating
+
+- type: entity
+  name: blue carpet
+  parent: FloorTileItemBase
+  id: FloorCarpetItemBlue
+  components:
+  - type: Sprite
+    state: carpet-blue
+  - type: Item
+    HeldPrefix: carpet-blue
+  - type: FloorTile
+    outputs:
+      - plating
+
+- type: entity
+  name: green carpet
+  parent: FloorTileItemBase
+  id: FloorCarpetItemGreen
+  components:
+  - type: Sprite
+    state: carpet-green
+  - type: Item
+    HeldPrefix: carpet-green
+  - type: FloorTile
+    outputs:
+      - plating
+
+- type: entity
+  name: orange carpet
+  parent: FloorTileItemBase
+  id: FloorCarpetItemOrange
+  components:
+  - type: Sprite
+    state: carpet-orange
+  - type: Item
+    HeldPrefix: carpet-orange
+  - type: FloorTile
+    outputs:
+      - plating
+
+- type: entity
+  name: sky blue carpet
+  parent: FloorTileItemBase
+  id: FloorCarpetItemSkyBlue
+  components:
+  - type: Sprite
+    state: carpet-skyblue
+  - type: Item
+    HeldPrefix: carpet-skyblue
+  - type: FloorTile
+    outputs:
+      - plating
+
+- type: entity
+  name: purple carpet
+  parent: FloorTileItemBase
+  id: FloorCarpetItemPurple
+  components:
+  - type: Sprite
+    state: carpet-purple
+  - type: Item
+    HeldPrefix: carpet-purple
+  - type: FloorTile
+    outputs:
+      - plating
+
+- type: entity
+  name: pink carpet
+  parent: FloorTileItemBase
+  id: FloorCarpetItemPink
+  components:
+  - type: Sprite
+    state: carpet-pink
+  - type: Item
+    HeldPrefix: carpet-pink
+  - type: FloorTile
+    outputs:
+      - plating

Resources/Prototypes/Entities/Objects/Misc/tiles.yml

@@ -91,7 +91,7 @@
   id: FloorTileItemTechmaint
   components:
   - type: Sprite
-    state: dark_techfloor_grid
+    state: techfloor
   - type: Item
     HeldPrefix: dark
   - type: FloorTile
@@ -101,6 +101,115 @@
   - type: Stack
     stackType: FloorTileTechmaint
 
+- type: entity
+  name: reinforced tile
+  parent: FloorTileItemBase
+  id: FloorTileItemReinforced
+  components:
+  - type: Sprite
+    state: reinforced
+  - type: Item
+    HeldPrefix: reinforced
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_reinforced
+  - type: Stack
+    stackType: FloorTileReinforced
+
+# TODO add a catwalk tile item once tile smoothing is supported
+
+- type: entity
+  name: mono tile
+  parent: FloorTileItemBase
+  id: FloorTileItemMono
+  components:
+  - type: Sprite
+    state: monofloor
+  - type: Item
+    HeldPrefix: steel
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_mono
+  - type: Stack
+    stackType: FloorTileMono
+
+- type: entity
+  name: linoleum floor
+  parent: FloorTileItemBase
+  id: FloorTileItemLino
+  components:
+  - type: Sprite
+    state: lino
+  - type: Item
+    HeldPrefix: steel
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_lino
+  - type: Stack
+    stackType: FloorTileLino
+
+- type: entity
+  name: dirty tile
+  parent: FloorTileItemBase
+  id: FloorTileItemDirty
+  components:
+  - type: Sprite
+    state: dirty
+  - type: Item
+    HeldPrefix: dirty
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_steel_dirty
+  - type: Stack
+    stackType: FloorTileDirty
+
+- type: entity
+  name: elevator shaft tile
+  parent: FloorTileItemBase
+  id: FloorTileItemElevatorShaft
+  components:
+  - type: Sprite
+    state: dark
+  - type: Item
+    HeldPrefix: dark
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_elevator_shaft
+
+- type: entity
+  name: rock vault tile
+  parent: FloorTileItemBase
+  id: FloorTileItemRockVault
+  components:
+  - type: Sprite
+    state: rockvault
+  - type: Item
+    HeldPrefix: steel
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_rock_vault
+
+- type: entity
+  name: blue tile
+  parent: FloorTileItemBase
+  id: FloorTileItemBlue
+  components:
+  - type: Sprite
+    state: blue
+  - type: Item
+    HeldPrefix: carpet-blue
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_blue
+
+# Departamental
 - type: entity
   name: freezer tile
   parent: FloorTileItemBase
@@ -134,21 +243,92 @@
     stackType: FloorTileShowroom
 
 - type: entity
-  name: green-circuit floor
+  name: hydro tile
   parent: FloorTileItemBase
-  id: FloorTileItemGCircuit
+  id: FloorTileItemHydro
   components:
   - type: Sprite
-    state: gcircuit
+    state: hydro
   - type: Item
-    HeldPrefix: silver
+    HeldPrefix: hydro
   - type: FloorTile
     outputs:
       - plating
-      - floor_green_circuit
+      - floor_hydro
   - type: Stack
-    stackType: FloorTileGCircuit
+    stackType: FloorTileHydro
 
+- type: entity
+  name: bar tile
+  parent: FloorTileItemBase
+  id: FloorTileItemBar
+  components:
+  - type: Sprite
+    state: bar
+  - type: Item
+    HeldPrefix: steel
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_bar
+
+- type: entity
+  name: clown tile
+  parent: FloorTileItemBase
+  id: FloorTileItemClown
+  components:
+  - type: Sprite
+    state: clown
+  - type: Item
+    HeldPrefix: steel
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_clown
+
+- type: entity
+  name: mime tile
+  parent: FloorTileItemBase
+  id: FloorTileItemMime
+  components:
+  - type: Sprite
+    state: mime
+  - type: Item
+    HeldPrefix: steel
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_mime
+
+- type: entity
+  name: kitchen tile
+  parent: FloorTileItemBase
+  id: FloorTileItemKitchen
+  components:
+  - type: Sprite
+    state: kitchen
+  - type: Item
+    HeldPrefix: dark
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_kitchen
+
+- type: entity
+  name: laundry tile
+  parent: FloorTileItemBase
+  id: FloorTileItemLaundry
+  components:
+  - type: Sprite
+    state: laundry
+  - type: Item
+    HeldPrefix: steel
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_laundry
+
+# Materials
 - type: entity
   name: gold floor
   parent: FloorTileItemBase
@@ -166,81 +346,73 @@
     stackType: FloorTileGold
 
 - type: entity
-  name: reinforced tile
+  name: silver tile
   parent: FloorTileItemBase
-  id: FloorTileItemReinforced
+  id: FloorTileItemSilver
   components:
   - type: Sprite
-    state: reinforced
+    state: silver
   - type: Item
-    HeldPrefix: reinforced
+    HeldPrefix: silver
   - type: FloorTile
     outputs:
       - plating
-      - floor_reinforced
-  - type: Stack
-    stackType: FloorTileReinforced
+      - floor_silver
+
+# Circuits
+- type: entity
+  name: green circuit floor
+  parent: FloorTileItemBase
+  id: FloorTileItemGCircuit
+  components:
+  - type: Sprite
+    state: gcircuit
+  - type: Item
+    HeldPrefix: gcircuit
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_green_circuit
 
 - type: entity
-  name: mono tile
+  name: blue circuit floor
   parent: FloorTileItemBase
-  id: FloorTileItemMono
+  id: FloorTileItemBCircuit
   components:
   - type: Sprite
-    state: white_monofloor
+    state: bcircuit
   - type: Item
-    HeldPrefix: steel
+    HeldPrefix: bcircuit
   - type: FloorTile
     outputs:
       - plating
-      - floor_mono
-  - type: Stack
-    stackType: FloorTileMono
+      - floor_blue_circuit
+
+# Terrain
+- type: entity
+  name: grass tile
+  parent: FloorTileItemBase
+  id: FloorTileItemGrass
+  components:
+  - type: Sprite
+    state: grass
+  - type: Item
+    HeldPrefix: grass
+  - type: FloorTile
+    outputs:
+      - plating
+      - floor_grass
 
 - type: entity
-  name: linoleum floor
+  name: snow tile
   parent: FloorTileItemBase
-  id: FloorTileItemLino
+  id: FloorTileItemSnow
   components:
   - type: Sprite
-    state: white_monofloor
+    state: snow
   - type: Item
-    HeldPrefix: steel
+    HeldPrefix: snow
   - type: FloorTile
     outputs:
       - plating
-      - floor_lino
-  - type: Stack
-    stackType: FloorTileLino
-
-- type: entity
-  name: hydro tile
-  parent: FloorTileItemBase
-  id: FloorTileItemHydro
-  components:
-  - type: Sprite
-    state: hydro
-  - type: Item
-    HeldPrefix: hydro
-  - type: FloorTile
-    outputs:
-      - plating
-      - floor_hydro
-  - type: Stack
-    stackType: FloorTileHydro
-
-- type: entity
-  name: dirty tile
-  parent: FloorTileItemBase
-  id: FloorTileItemDirty
-  components:
-  - type: Sprite
-    state: dirty
-  - type: Item
-    HeldPrefix: brown
-  - type: FloorTile
-    outputs:
-      - plating
-      - floor_steel_dirty
-  - type: Stack
-    stackType: FloorTileDirty
+      - floor_snow

Resources/Prototypes/Entities/Structures/Furniture/carpets.yml

@@ -1,3 +1,4 @@
+# TODO move all of this to tiles once tile smoothing is supported
 - type: entity
   id: CarpetBase
   parent: BaseStructure
@@ -35,7 +36,7 @@
 - type: entity
   id: Carpet
   parent: CarpetBase
-  name: "carpet"
+  name: "red carpet"
   components:
   - type: Sprite
     sprite: Structures/Furniture/Carpets/red_carpet.rsi
@@ -54,15 +55,15 @@
     sprite: Structures/Furniture/Carpets/black_carpet.rsi
 
 - type: entity
-  id: CarpetGay
+  id: CarpetPink
   parent: CarpetBase
   name: "pink carpet"
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Structures/Furniture/Carpets/gay_carpet.rsi
+    sprite: Structures/Furniture/Carpets/pink_carpet.rsi
   - type: Icon
-    sprite: Structures/Furniture/Carpets/gay_carpet.rsi
+    sprite: Structures/Furniture/Carpets/pink_carpet.rsi
 
 - type: entity
   id: CarpetBlue
@@ -118,3 +119,37 @@
     sprite: Structures/Furniture/Carpets/purple_carpet.rsi
   - type: Icon
     sprite: Structures/Furniture/Carpets/purple_carpet.rsi
+
+# TODO nuke this once tiles support rotating sprites
+- type: entity
+  id: CarpetChapel
+  parent: BaseStructure
+  name: "chapel's carpet"
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Carpets/chapel_carpet.rsi
+    state: chapel
+    drawdepth: FloorTiles
+  - type: Icon
+    sprite: Structures/Furniture/Carpets/chapel_carpet.rsi
+    state: chapel
+  - type: Tag
+    tags: [ Carpet ]
+  - type: Physics
+    canCollide: false
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      layer:
+      - Passable
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 10
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]

Resources/Prototypes/Entities/Structures/catwalk.yml

@@ -1,3 +1,4 @@
+# TODO move this to tiles once tile smoothing is supported
 - type: entity
   id: Catwalk
   name: catwalk

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

Resources/Textures/Objects/Tiles/tile.rsi/meta.json

@@ -17,10 +17,58 @@
       "name": "gcircuit"
     },
     {
-      "name": "hydro"
+      "name": "bar"
     },
     {
-      "name": "plating"
+      "name": "blue"
+    },
+    {
+      "name": "clown"
+    },
+    {
+      "name": "grass"
+    },
+    {
+      "name": "kitchen"
+    },
+    {
+      "name": "laundry"
+    },
+    {
+      "name": "lino"
+    },
+    {
+      "name": "mime"
+    },
+    {
+      "name": "bcircuit"
+    },
+    {
+      "name": "carpet-black"
+    },
+    {
+      "name": "carpet-blue"
+    },
+    {
+      "name": "carpet-skyblue"
+    },
+    {
+      "name": "carpet-green"
+    },
+    {
+      "name": "carpet-orange"
+    },
+    {
+      "name": "carpet-purple"
+    },
+    {
+      "name": "carpet-red"
+    },
+    {
+      "name": "carpet-pink"
+    },
+    {
+      "name": "hydro"
     },
     {
       "name": "reinforced"
@@ -40,41 +88,115 @@
     {
       "name": "steel"
     },
-    {
-      "name": "steel_techfloor_grid"
-    },
     {
       "name": "silver"
     },
     {
-      "name": "dark_techfloor_grid"
+      "name": "techfloor"
     },
     {
       "name": "white"
     },
     {
-      "name": "white_monofloor"
+      "name": "monofloor"
     },
     {
       "name": "wood"
     },
     {
-      "name": "carpet"
-    },
-    {
-      "name": "brown-inhand-left",
+      "name": "bcircuit-inhand-left",
       "directions": 4
     },
     {
-      "name": "brown-inhand-right",
+      "name": "bcircuit-inhand-right",
       "directions": 4
     },
     {
-      "name": "carpet-inhand-left",
+      "name": "carpet-black-inhand-left",
       "directions": 4
     },
     {
-      "name": "carpet-inhand-right",
+      "name": "carpet-black-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "carpet-blue-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpet-blue-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "carpet-skyblue-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpet-skyblue-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "carpet-green-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpet-green-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "carpet-orange-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpet-orange-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "carpet-purple-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpet-purple-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "carpet-red-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpet-red-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "carpet-pink-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpet-pink-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "grass-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "grass-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "snow-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "snow-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "dirty-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "dirty-inhand-right",
       "directions": 4
     },
     {
@@ -142,11 +264,11 @@
       "directions": 4
     },
     {
-      "name": "inhand-right",
+      "name": "generic-inhand-right",
       "directions": 4
     },
     {
-      "name": "inhand-left",
+      "name": "generic-inhand-left",
       "directions": 4
     },
     {
@@ -164,6 +286,6 @@
     {
       "name": "hydro-inhand-left",
       "directions": 4
-    },
+    }
   ]
 }

Resources/Textures/Structures/Furniture/Carpets/chapel_carpet.rsi/meta.json

@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2303f6a892919abe3a11f9f53a02a8e1fea67442#diff-5928a46e62778e2e4e9c49608f2b1a2092e9af6840c1b1d09e1cb0cb5d7943b0",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "chapel",
+      "directions": 1
+    }
+  ]
+}

Resources/Textures/Tiles/copyright.txt

@@ -1,3 +1,7 @@
 Alright because tiles don't use RSIs (yet) I gotta write this out.
 
-floor_steel.png taken from CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2
+steel.png taken from CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2
+
+bar.png, laundry.png, mime.png, clown.png and kitchen.png are under CC-BY-SA-3.0
+snow.png taken from TG at commit 67a5373b4649937dd63dd94153e05e8506f40a5d
+grass.png taken from TG at commit 73a638214c94da9b8c485f1c75f615cb79770883