Revert gersoon (#502)

* Revert "Изменено"

This reverts commit 985048acc6.

* fix naser

Resources/Prototypes/Decals/trim.yml

@@ -1,356 +0,0 @@
-- type: decal
-  id: TrimDarkBox
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_box
-
-- type: decal
-  id: TrimDarkCornerNe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_corner_ne
-
-- type: decal
-  id: TrimDarkCornerSe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_corner_se
-
-- type: decal
-  id: TrimDarkCornerNw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_corner_nw
-
-- type: decal
-  id: TrimDarkCornerSw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_corner_sw
-
-- type: decal
-  id: TrimDarkInnerNe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_inner_ne
-
-- type: decal
-  id: TrimDarkInnerSe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_inner_se
-
-- type: decal
-  id: TrimDarkInnerNw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_inner_nw
-
-- type: decal
-  id: TrimDarkInnerSw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_inner_sw
-
-- type: decal
-  id: TrimDarkEndN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_end_n
-
-- type: decal
-  id: TrimDarkEndE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_end_e
-
-- type: decal
-  id: TrimDarkEndS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_end_s
-
-- type: decal
-  id: TrimDarkEndW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_end_w
-
-- type: decal
-  id: TrimDarkLineN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_line_n
-
-- type: decal
-  id: TrimDarkLineE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_line_e
-
-- type: decal
-  id: TrimDarkLineS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_line_s
-
-- type: decal
-  id: TrimDarkLineW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: dark_line_w
-
-- type: decal
-  id: TrimSteelBox
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_box
-
-- type: decal
-  id: TrimSteelCornerNe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_corner_ne
-
-- type: decal
-  id: TrimSteelCornerSe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_corner_se
-
-- type: decal
-  id: TrimSteelCornerNw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_corner_nw
-
-- type: decal
-  id: TrimSteelCornerSw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_corner_sw
-
-- type: decal
-  id: TrimSteelInnerNe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_inner_ne
-
-- type: decal
-  id: TrimSteelInnerSe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_inner_se
-
-- type: decal
-  id: TrimSteelInnerNw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_inner_nw
-
-- type: decal
-  id: TrimSteelInnerSw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_inner_sw
-
-- type: decal
-  id: TrimSteelEndN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_end_n
-
-- type: decal
-  id: TrimSteelEndE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_end_e
-
-- type: decal
-  id: TrimSteelEndS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_end_s
-
-- type: decal
-  id: TrimSteelEndW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_end_w
-
-- type: decal
-  id: TrimSteelLineN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_line_n
-
-- type: decal
-  id: TrimSteelLineE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_line_e
-
-- type: decal
-  id: TrimSteelLineS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_line_s
-
-- type: decal
-  id: TrimSteelLineW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: steel_line_w
-
-- type: decal
-  id: TrimWhiteBox
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_box
-
-- type: decal
-  id: TrimWhiteCornerNe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_corner_ne
-
-- type: decal
-  id: TrimWhiteCornerSe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_corner_se
-
-- type: decal
-  id: TrimWhiteCornerNw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_corner_nw
-
-- type: decal
-  id: TrimWhiteCornerSw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_corner_sw
-
-- type: decal
-  id: TrimWhiteInnerNe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_inner_ne
-
-- type: decal
-  id: TrimWhiteInnerSe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_inner_se
-
-- type: decal
-  id: TrimWhiteInnerNw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_inner_nw
-
-- type: decal
-  id: TrimWhiteInnerSw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_inner_sw
-
-- type: decal
-  id: TrimWhiteEndN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_end_n
-
-- type: decal
-  id: TrimWhiteEndE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_end_e
-
-- type: decal
-  id: TrimWhiteEndS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_end_s
-
-- type: decal
-  id: TrimWhiteEndW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_end_w
-
-- type: decal
-  id: TrimWhiteLineN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_line_n
-
-- type: decal
-  id: TrimWhiteLineE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_line_e
-
-- type: decal
-  id: TrimWhiteLineS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_line_s
-
-- type: decal
-  id: TrimWhiteLineW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim.rsi
-    state: white_line_w

Resources/Prototypes/Decals/trim_markings.yml

@@ -1,255 +0,0 @@
-
-- type: decal
-  id: TrimWarnBox
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_box
-
-- type: decal
-  id: TrimWarnBoxGreyscale
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_box_greyscale
-
-- type: decal
-  id: TrimWarnCornerGreyscaleNE
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_greyscale_ne
-
-- type: decal
-  id: TrimWarnCornerGreyscaleNW
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_greyscale_nw
-
-- type: decal
-  id: TrimWarnCornerGreyscaleSE
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_greyscale_se
-
-- type: decal
-  id: TrimWarnCornerGreyscaleSW
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_greyscale_sw
-
-- type: decal
-  id: TrimWarnCornerNE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_ne
-
-- type: decal
-  id: TrimWarnCornerNW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_nw
-
-- type: decal
-  id: TrimWarnCornerSE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_se
-
-- type: decal
-  id: TrimWarnCornerSW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_sw
-
-- type: decal
-  id: TrimWarnCornerSmallGreyscaleNE
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_small_greyscale_ne
-
-- type: decal
-  id: TrimWarnCornerSmallGreyscaleNW
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_small_greyscale_nw
-
-- type: decal
-  id: TrimWarnCornerSmallGreyscaleSE
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_small_greyscale_se
-
-- type: decal
-  id: TrimWarnCornerSmallGreyscaleSW
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_small_greyscale_sw
-
-- type: decal
-  id: TrimWarnCornerSmallNE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_small_ne
-
-- type: decal
-  id: TrimWarnCornerSmallNW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_small_nw
-
-- type: decal
-  id: TrimWarnCornerSmallSE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_small_se
-
-- type: decal
-  id: TrimWarnCornerSmallSW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_corner_small_sw
-
-- type: decal
-  id: TrimWarnEndE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_end_e
-
-- type: decal
-  id: TrimWarnEndN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_end_n
-
-- type: decal
-  id: TrimWarnEndS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_end_s
-
-- type: decal
-  id: TrimWarnEndW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_end_w
-
-- type: decal
-  id: TrimWarnEndGreyscaleE
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_end_greyscale_e
-
-- type: decal
-  id: TrimWarnEndGreyscaleN
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_end_greyscale_n
-
-- type: decal
-  id: TrimWarnEndGreyscaleS
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_end_greyscale_s
-
-- type: decal
-  id: TrimWarnEndGreyscaleW
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_end_greyscale_w
-
-- type: decal
-  id: TrimWarnLineE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_line_e
-
-- type: decal
-  id: TrimWarnLineW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_line_n
-
-- type: decal
-  id: TrimWarnLineN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_line_s
-
-- type: decal
-  id: TrimWarnLineS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_line_w
-
-- type: decal
-  id: TrimWarnLineGreyscaleE
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_line_greyscale_e
-
-- type: decal
-  id: TrimWarnLineGreyscaleN
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_line_greyscale_n
-
-- type: decal
-  id: TrimWarnLineGreyscaleS
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_line_greyscale_s
-
-- type: decal
-  id: TrimWarnLineGreyscaleW
-  tags: ["station", "markings"]
-  defaultCustomColor: true
-  sprite:
-    sprite: Decals/trim_markings.rsi
-    state: warn_line_greyscale_w

Resources/Prototypes/Decals/window_frame.yml

@@ -1,237 +0,0 @@
-- type: decal
-  id: WindowFramekBox
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_box
-
-- type: decal
-  id: WindowFrameCornerNe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_corner_ne
-
-- type: decal
-  id: WindowFrameCornerSe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_corner_se
-
-- type: decal
-  id: WindowFrameCornerNw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_corner_nw
-
-- type: decal
-  id: WindowFrameCornerSw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_corner_sw
-
-- type: decal
-  id: WindowFrameInnerNe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_inner_ne
-
-- type: decal
-  id: WindowFrameInnerSe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_inner_se
-
-- type: decal
-  id: WindowFrameInnerNw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_inner_nw
-
-- type: decal
-  id: WindowFrameInnerSw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_inner_sw
-
-- type: decal
-  id: WindowFrameEndN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_end_n
-
-- type: decal
-  id: WindowFrameEndE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_end_e
-
-- type: decal
-  id: WindowFrameEndS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_end_s
-
-- type: decal
-  id: WindowFrameEndW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_end_w
-
-- type: decal
-  id: WindowFrameLineN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_line_n
-
-- type: decal
-  id: WindowFrameLineE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_line_e
-
-- type: decal
-  id: WindowFrameLineS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_line_s
-
-- type: decal
-  id: WindowFrameLineW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: frame_line_w
-
-- type: decal
-  id: WindowFrameGlassBox
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_box
-
-- type: decal
-  id: WindowFrameGlassCornerNe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_corner_ne
-
-- type: decal
-  id: WindowFrameGlassCornerSe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_corner_se
-
-- type: decal
-  id: WindowFrameGlassCornerNw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_corner_nw
-
-- type: decal
-  id: WindowFrameGlassCornerSw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_corner_sw
-
-- type: decal
-  id: WindowFrameGlassInnerNe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_inner_ne
-
-- type: decal
-  id: WindowFrameGlassInnerSe
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_inner_se
-
-- type: decal
-  id: WindowFrameGlassInnerNw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_inner_nw
-
-- type: decal
-  id: WindowFrameGlassInnerSw
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_inner_sw
-
-- type: decal
-  id: WindowFrameGlassEndN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_end_n
-
-- type: decal
-  id: WindowFrameGlassEndE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_end_e
-
-- type: decal
-  id: WindowFrameGlassEndS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_end_s
-
-- type: decal
-  id: WindowFrameGlassEndW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_end_w
-
-- type: decal
-  id: WindowFrameGlassLineN
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_line_n
-
-- type: decal
-  id: WindowFrameGlassLineE
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_line_e
-
-- type: decal
-  id: WindowFrameGlassLineS
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_line_s
-
-- type: decal
-  id: WindowFrameGlassLineW
-  tags: ["station", "markings"]
-  sprite:
-    sprite: Decals/window_frame.rsi
-    state: gframe_line_w

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

@@ -402,9 +402,9 @@
   id: FloorTileItemFreezer
   components:
   - type: Sprite
-    state: freezer
+    state: showroom
   - type: Item
-    heldPrefix: freezer
+    heldPrefix: showroom
   - type: FloorTile
     outputs:
       - Plating
@@ -1136,234 +1136,4 @@
     stackType: FloorTileWoodLarge
   - type: Construction
     graph: TileWoodLarge
-    node: woodtilelarge
+    node: woodtilelarge
-
-- type: entity
-  name: steel yellow tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemSteelYellow
-  components:
-  - type: Sprite
-    state: steel-yellow
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorSteelYellow
-
-- type: entity
-  name: steel red tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemSteelRed
-  components:
-  - type: Sprite
-    state: steel-red
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorSteelRed
-
-- type: entity
-  name: steel green tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemSteelGreen
-  components:
-  - type: Sprite
-    state: steel-green
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorSteelGreen
-
-- type: entity
-  name: steel blue tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemSteelBlue
-  components:
-  - type: Sprite
-    state: steel-blue
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorSteelBlue
-
-- type: entity
-  name: plastic yellow tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemPlasticYellow
-  components:
-  - type: Sprite
-    state: plastic-yellow
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorPlasticYellow
-
-- type: entity
-  name: plastic red tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemPlasticRed
-  components:
-  - type: Sprite
-    state: plastic-red
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorPlasticRed
-
-- type: entity
-  name: plastic green tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemPlasticGreen
-  components:
-  - type: Sprite
-    state: plastic-green
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorPlasticGreen
-
-- type: entity
-  name: plastic blue tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemPlasticBlue
-  components:
-  - type: Sprite
-    state: plastic-blue
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorPlasticBlue
-
-- type: entity
-  name: plastic dark tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemPlasticDark
-  components:
-  - type: Sprite
-    state: plastic-dark
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorDarkPlastic
-
-- type: entity
-  name: plastic grey tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemPlasticGrey
-  components:
-  - type: Sprite
-    state: plastic-grey
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorPlastic
-
-- type: entity
-  name: plastic white tile
-  parent: FloorTileItemSteel
-  id: FloorTileItemPlasticWhite
-  components:
-  - type: Sprite
-    state: plastic-white
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorWhitePlastic
-
-- type: entity
-  name: shielding floor
-  parent: FloorTileItemSteel
-  id: FloorTileItemShielding
-  components:
-  - type: Sprite
-    state: shielding
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorShielding
-
-- type: entity
-  name: shuttle syndie floor
-  parent: FloorTileItemSteel
-  id: FloorTileItemShuttleSyndie
-  components:
-  - type: Sprite
-    state: shuttlesyndie
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorShuttleSyndie
-
-- type: entity
-  name: sterile floor
-  parent: FloorTileItemSteel
-  id: FloorTileItemSterile
-  components:
-  - type: Sprite
-    state: sterile
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorSterile
-
-- type: entity
-  name: reinforced glass frame floor
-  parent: FloorTileItemSteel
-  id: FloorTileItemReinforcedGlassFrame
-  components:
-  - type: Sprite
-    state: rglass-frame
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorReinforcedGlassFrame
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 30
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 5
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: GlassBreak
-          params:
-            volume: -5
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-
-- type: entity
-  name: glass frame floor
-  parent: FloorTileItemSteel
-  id: FloorTileItemGlassFrame
-  components:
-  - type: Sprite
-    state: glass-frame
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorGlassFrame
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 30
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 5
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: GlassBreak
-          params:
-            volume: -5
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]

Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml

@@ -451,9 +451,9 @@
   description: Do not apply fire to this. Rumour says it burns easily.
   components:
   - type: Sprite
-    sprite: Structures/Furniture/Tables/wood.rsi
+    sprite: White/Structures/Furniture/Tables/wood.rsi
   - type: Icon
-    sprite: Structures/Furniture/Tables/wood.rsi
+    sprite: White/Structures/Furniture/Tables/wood.rsi
   - type: Damageable
     damageModifierSet: Wood
   - type: Destructible

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

@@ -5,7 +5,7 @@
   description: Mostly filled with books.
   components:
   - type: Sprite
-    sprite: Structures/Furniture/bookshelf.rsi
+    sprite: White/Structures/Furniture/bookshelf.rsi
     snapCardinals: true
     layers:
       - state: base

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

@@ -1,444 +0,0 @@
-- type: entity
-  name: cabinet
-  id: CabinetBase
-  parent: BaseStructure
-  abstract: true
-  description: Good for storing things. Has convenient surface on which you can put something. 
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: InteractionOutline
-  - type: PlaceableSurface
-  - type: Climbable
-  - type: Clickable
-  - type: Storage
-    maxItemSize: Huge
-    grid:
-    - 0,0,8,5
-  - type: Physics
-    bodyType: Dynamic
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        path:
-          "/Audio/Weapons/smash.ogg"
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.40,-0.40,0.40,0.40"
-        density: 100
-        mask:
-        - TableMask
-        layer:
-        - TableLayer
-  - type: Sprite
-    sprite: Structures/Furniture/chairs.rsi
-    noRot: true
-  - type: Pullable
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-  - type: StaticPrice
-    price: 10
-
-# Kitchen Furniture
-- type: entity
-  name: kitchen countertop
-  id: CabinetKitchenBase
-  abstract: true
-  parent: CabinetBase
-  description: Good for storing kitchen utensils. Has convenient surface on which you can put something. 
-  components:
-  - type: Physics
-    bodyType: Static
-  - type: Transform
-    anchored: true
-  - type: Storage
-    maxItemSize: Huge
-    grid:
-    - 0,0,8,5
-  - type: Clickable
-  - type: UserInterface
-    interfaces:
-    - key: enum.StorageUiKey.Key
-      type: StorageBoundUserInterface
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: [ ]
-  - type: Rotatable
-  - type: Sprite
-    state: wood_kitchen
-
-- type: entity
-  name: wood kitchen countertop
-  id: WoodCabinetKitchen
-  parent: CabinetKitchenBase
-  suffix: Base
-  components:
-  - type: Anchorable
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: wood_kitchen
-    noRot: true
-
-- type: entity
-  name: wood kitchen countertop
-  id: WoodCabinetKitchenMiddle
-  parent: CabinetKitchenBase
-  suffix: Middle
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: wood_kitchen_mid
-    noRot: true
-
-
-- type: entity
-  name: wood kitchen countertop
-  id: WoodCabinetKitchenLeft
-  parent: CabinetKitchenBase
-  suffix: Left
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: wood_kitchen_left
-    noRot: true
-
-- type: entity
-  name: wood kitchen countertop
-  id: WoodCabinetKitchenRight
-  parent: CabinetKitchenBase
-  suffix: Right
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: wood_kitchen_right
-    noRot: true
-
-- type: entity
-  name: steel kitchen countertop
-  id: SteelCabinetKitchen
-  parent: CabinetKitchenBase
-  suffix: Base
-  components:
-  - type: Anchorable
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: steel_kitchen
-    noRot: true
-
-- type: entity
-  name: steel kitchen countertop
-  id: SteelCabinetKitchenMiddle
-  parent: CabinetKitchenBase
-  suffix: Middle
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: steel_kitchen_mid
-    noRot: true
-
-- type: entity
-  name: steel kitchen countertop
-  id: SteelCabinetKitchenLeft
-  parent: CabinetKitchenBase
-  suffix: Left
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: steel_kitchen_left
-    noRot: true
-
-- type: entity
-  name: steel kitchen countertop
-  id: SteelCabinetKitchenRight
-  parent: CabinetKitchenBase
-  suffix: Right
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: steel_kitchen_right
-    noRot: true
-
-- type: entity
-  name: plastic kitchen countertop
-  id: PlasticCabinetKitchen
-  parent: CabinetKitchenBase
-  suffix: Base
-  components:
-  - type: Anchorable
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: plastic_kitchen
-    noRot: true
-
-- type: entity
-  name: plastic kitchen countertop
-  id: PlasticCabinetKitchenMiddle
-  parent: CabinetKitchenBase
-  suffix: Middle
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: plastic_kitchen_mid
-    noRot: true
-
-- type: entity
-  name: plastic kitchen countertop
-  id: PlasticCabinetKitchenLeft
-  parent: CabinetKitchenBase
-  suffix: Left
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: plastic_kitchen_left
-    noRot: true
-
-- type: entity
-  name: plastic kitchen countertop
-  id: PlasticCabinetKitchenRight
-  parent: CabinetKitchenBase
-  suffix: Right
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: plastic_kitchen_right
-    noRot: true
-
-# Furniture corner
-
-- type: entity
-  name: wood cabinet corner
-  id: WoodCabinetCorner
-  parent: CabinetBase
-  description: Has convenient surface on which you can put something.
-  suffix: Corner
-  components:
-  - type: Physics
-    bodyType: Static
-  - type: Transform
-    anchored: true
-  - type: Rotatable
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: wood_corner
-    noRot: true
-
-- type: entity
-  name: steel cabinet corner
-  id: SteelCabinetCorner
-  parent: CabinetBase
-  description: Has convenient surface on which you can put something.
-  suffix: Corner
-  components:
-  - type: Physics
-    bodyType: Static
-  - type: Transform
-    anchored: true
-  - type: Rotatable
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: steel_corner
-    noRot: true
-
-- type: entity
-  name: plastic cabinet corner
-  id: PlasticCabinetCorner
-  parent: CabinetBase
-  description: Has convenient surface on which you can put something.
-  suffix: Corner
-  components:
-  - type: Physics
-    bodyType: Static
-  - type: Transform
-    anchored: true
-  - type: Rotatable
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: plastic_corner
-    noRot: true
-
-# Dresser Furniture
-
-- type: entity
-  name: dresser
-  id: CabinetDresserBase
-  abstract: true
-  parent: CabinetBase
-  description: Good for storing things and clothes. Has convenient surface on which you can put something. 
-  components:
-  - type: Physics
-    bodyType: Static
-  - type: Storage
-    maxItemSize: Huge
-    grid:
-    - 0,0,8,5
-  - type: Clickable
-  - type: UserInterface
-    interfaces:
-    - key: enum.StorageUiKey.Key
-      type: StorageBoundUserInterface
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: [ ]
-  - type: Transform
-    anchored: true
-  - type: Rotatable
-  - type: Sprite
-    state: wood_dresser
-
-- type: entity
-  name: wood dresser
-  id: WoodCabinetDresser
-  parent: CabinetDresserBase
-  suffix: Base
-  components:
-  - type: Anchorable
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: wood_dresser
-    noRot: true
-
-- type: entity
-  name: wood dresser
-  id: WoodCabinetDresserLeft
-  parent: CabinetDresserBase
-  suffix: Left
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: wood_dresser_left
-    noRot: true
-
-- type: entity
-  name: wood dresser
-  id: WoodCabinetDresserRight
-  parent: CabinetDresserBase
-  suffix: Right
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: wood_dresser_right
-    noRot: true
-
-- type: entity
-  name: wood dresser
-  id: WoodCabinetDresserMiddle
-  parent: CabinetDresserBase
-  suffix: Middle
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: wood_dresser_mid
-    noRot: true
-
-- type: entity
-  name: steel dresser
-  id: SteelCabinetDresser
-  parent: CabinetDresserBase
-  suffix: Base
-  components:
-  - type: Anchorable
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: steel_dresser
-    noRot: true
-
-- type: entity
-  name: steel dresser
-  id: SteelCabinetDresserLeft
-  parent: CabinetDresserBase
-  suffix: Left
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: steel_dresser_left
-    noRot: true
-
-- type: entity
-  name: steel dresser
-  id: SteelCabinetDresserRight
-  parent: CabinetDresserBase
-  suffix: Right
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: steel_dresser_right
-    noRot: true
-
-- type: entity
-  name: steel dresser
-  id: SteelCabinetDresserMiddle
-  parent: CabinetDresserBase
-  suffix: Middle
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: steel_dresser_mid
-    noRot: true
-
-- type: entity
-  name: plastic dresser
-  id: PlasticCabinetDresser
-  parent: CabinetDresserBase
-  suffix: Base
-  components:
-  - type: Anchorable
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: plastic_dresser
-    noRot: true
-
-- type: entity
-  name: plastic dresser
-  id: PlasticCabinetDresserLeft
-  parent: CabinetDresserBase
-  suffix: Left
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: plastic_dresser_left
-    noRot: true
-
-- type: entity
-  name: plastic dresser
-  id: PlasticCabinetDresserRight
-  parent: CabinetDresserBase
-  suffix: Right
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: plastic_dresser_right
-    noRot: true
-
-- type: entity
-  name: plastic dresser
-  id: PlasticCabinetDresserMiddle
-  parent: CabinetDresserBase
-  suffix: Middle
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/cabinets.rsi
-    state: plastic_dresser_mid
-    noRot: true

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

@@ -1,551 +0,0 @@
-# Base
-
-- type: entity
-  id: RandomPottedPlantBase
-  parent: PottedPlantBase
-  abstract: true
-  components:
-  - type: SecretStash
-    secretPartName: secret-stash-part-plant
-    maxItemSize: Tiny
-  - type: Sprite
-    offset: "0.0,2.3"
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_1
-      map: [ "pot" ]
-    - state: plant_small_1
-      map: [ "plant" ]
-    - state: mask_null
-      map: [ "overlay" ]
-    - state: mask_null
-      map: [ "decor" ]
-
-- type: entity
-  name: random RANDOM potted plant spawner
-  id: RandomPottedPlantSpawner
-  parent: MarkerBase
-  components:
-    - type: Sprite
-      layers:
-      - state: green
-      - sprite: Structures/Furniture/random_potted_plants.rsi
-        state: icon_spawner
-    - type: RandomSpawner
-      prototypes:
-        - RandomPottedTinyPlant
-        - RandomPottedSmallPlant
-        - RandomPottedMediumPlant
-      offset: 0.0
-
-# Tiny
-
-- type: entity
-  parent: RandomPottedPlantBase
-  id: RandomPottedTinyPlant
-  name: Potted Plant
-  suffix: Tiny Base
-  components:
-  - type: Item
-    size: Small
-    storedOffset: 0,4
-  - type: SecretStash
-    secretPartName: secret-stash-part-plant
-    maxItemSize: Tiny
-  - type: InteractionOutline
-  - type: Sprite
-    offset: "0.0,2.3"
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_tiny_3
-      map: [ "pot" ]
-    - state: plant_tiny_3
-      map: [ "plant" ]
-    - state: mask_null
-      map: [ "overlay" ]
-    - state: mask_null
-      map: [ "decor" ]
-  - type: RandomSprite
-    available:
-      - pot:
-          pot_tiny_1: ""
-          pot_tiny_2: ""
-          pot_tiny_3: ""
-          pot_tiny_4: ""
-          pot_tiny_5: ""
-          pot_tiny_6: ""
-          pot_tiny_7: ""
-        plant:
-          plant_tiny_1: ""
-          plant_tiny_2: ""
-          plant_tiny_3: ""
-          plant_tiny_4: ""
-          plant_tiny_5: ""
-          plant_tiny_6: ""
-          plant_tiny_7: ""
-          plant_tiny_8: ""
-          plant_tiny_9: ""
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.15
-        density: 190
-        mask:
-        - Impassable
-
-# Pot variants
-
-- type: entity
-  parent: RandomPottedTinyPlant
-  id: RandomPottedTinyPlantPot1
-  name: Potted Plant
-  suffix: Tiny Pot 1
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_tiny_1
-    - state: icon_pot_tiny_1
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedTinyPlant
-  id: RandomPottedTinyPlantPot2
-  name: Potted Plant
-  suffix: Tiny Pot 2
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_tiny_2
-    - state: icon_pot_tiny_2
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedTinyPlant
-  id: RandomPottedTinyPlantPot3
-  name: Potted Plant
-  suffix: Tiny Pot 3
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_tiny_3
-    - state: icon_pot_tiny_3
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedTinyPlant
-  id: RandomPottedTinyPlantPot4
-  name: Potted Plant
-  suffix: Tiny Pot 4
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_tiny_4
-    - state: icon_pot_tiny_4
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedTinyPlant
-  id: RandomPottedTinyPlantPot5
-  name: Potted Plant
-  suffix: Tiny Pot 5
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_tiny_5
-    - state: icon_pot_tiny_5
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedTinyPlant
-  id: RandomPottedTinyPlantPot6
-  name: Potted Plant
-  suffix: Tiny Pot 6
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_tiny_6
-    - state: icon_pot_tiny_6
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedTinyPlant
-  id: RandomPottedTinyPlantPot7
-  name: Potted Plant
-  suffix: Tiny Pot 7
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_tiny_7
-    - state: icon_pot_tiny_7
-      map: [ "plant" ]
-
-# Small
-
-- type: entity
-  parent: RandomPottedPlantBase
-  id: RandomPottedSmallPlant
-  name: Potted Plant
-  suffix: Small Base
-  components:
-  - type: Item
-    storedOffset: 0,5
-    size: Normal
-  - type: SecretStash
-    secretPartName: secret-stash-part-plant
-    maxItemSize: Small
-  - type: InteractionOutline
-  - type: Sprite
-    offset: "0.0,2.3"
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_3
-      map: [ "pot" ]
-    - state: plant_small_15
-      map: [ "plant" ]
-    - state: mask_null
-      map: [ "overlay" ]
-    - state: mask_null
-      map: [ "decor" ]
-  - type: RandomSprite
-    available:
-      - pot:
-          pot_small_1: ""
-          pot_small_2: ""
-          pot_small_3: ""
-          pot_small_4: ""
-          pot_small_5: ""
-          pot_small_6: ""
-          pot_small_7: ""
-          pot_small_8: ""
-          pot_small_9: ""
-          pot_small_10: ""
-        plant:
-          plant_small_1: ""
-          plant_small_2: ""
-          plant_small_3: ""
-          plant_small_4: ""
-          plant_small_5: ""
-          plant_small_6: ""
-          plant_small_7: ""
-          plant_small_8: ""
-          plant_small_9: ""
-          plant_small_10: ""
-          plant_small_11: ""
-          plant_small_12: ""
-          plant_small_13: ""
-          plant_small_14: ""
-          plant_small_15: ""
-          plant_small_16: ""
-          plant_small_17: ""
-          plant_small_18: ""
-          plant_small_19: ""
-          plant_small_20: ""
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.2
-        density: 190
-        mask:
-        - Impassable
-
-# Pot variants
-
-- type: entity
-  parent: RandomPottedSmallPlant
-  id: RandomPottedSmallPlantPot1
-  name: Potted Plant
-  suffix: Small Pot 1
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_1
-    - state: icon_pot_small_1
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedSmallPlant
-  id: RandomPottedSmallPlantPot2
-  name: Potted Plant
-  suffix: Small Pot 2
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_2
-    - state: icon_pot_small_2
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedSmallPlant
-  id: RandomPottedSmallPlantPot3
-  name: Potted Plant
-  suffix: Small Pot 3
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_3
-    - state: icon_pot_small_3
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedSmallPlant
-  id: RandomPottedSmallPlantPot4
-  name: Potted Plant
-  suffix: Small Pot 4
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_4
-    - state: icon_pot_small_4
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedSmallPlant
-  id: RandomPottedSmallPlantPot5
-  name: Potted Plant
-  suffix: Small Pot 5
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_5
-    - state: icon_pot_small_5
-      map: [ "plant" ]
-    - state: mask_null
-      map: [ "overlay" ]
-    - state: mask_null
-      map: [ "decor" ]
-
-- type: entity
-  parent: RandomPottedSmallPlant
-  id: RandomPottedSmallPlantPot6
-  name: Potted Plant
-  suffix: Small Pot 6
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_6
-    - state: icon_pot_small_6
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedSmallPlant
-  id: RandomPottedSmallPlantPot7
-  name: Potted Plant
-  suffix: Small Pot 7
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_7
-    - state: icon_pot_small_7
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedSmallPlant
-  id: RandomPottedSmallPlantPot8
-  name: Potted Plant
-  suffix: Small Pot 8
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_8
-    - state: icon_pot_small_8
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedSmallPlant
-  id: RandomPottedSmallPlantPot9
-  name: Potted Plant
-  suffix: Small Pot 9
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_9
-    - state: icon_pot_small_9
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedSmallPlant
-  id: RandomPottedSmallPlantPot10
-  name: Potted Plant
-  suffix: Small Pot 10
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_small_10
-    - state: icon_pot_small_10
-      map: [ "plant" ]
-
-# Medium
-
-- type: entity
-  parent: RandomPottedPlantBase
-  id: RandomPottedMediumPlant
-  name: Potted Plant
-  suffix: Medium Base
-  components:
-  - type: SecretStash
-    secretPartName: secret-stash-part-plant
-    maxItemSize: Normal
-  - type: InteractionOutline
-  - type: Sprite
-    offset: "0.0,2.3"
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_medium_2
-      map: [ "pot" ]
-    - state: plant_medium_5
-      map: [ "plant" ]
-    - state: mask_null
-      map: [ "overlay" ]
-    - state: mask_null
-      map: [ "decor" ]
-  - type: RandomSprite
-    available:
-      - pot:
-          pot_medium_1: ""
-          pot_medium_2: ""
-          pot_medium_3: ""
-          pot_medium_4: ""
-          pot_medium_5: ""
-          pot_medium_6: ""
-          pot_medium_7: ""
-        plant:
-          plant_medium_1: ""
-          plant_medium_2: ""
-          plant_medium_3: ""
-          plant_medium_4: ""
-          plant_medium_5: ""
-          plant_medium_6: ""
-          plant_medium_7: ""
-          plant_medium_8: ""
-          plant_medium_9: ""
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.3
-        density: 190
-        mask:
-        - Impassable
-
-# Pot variants
-
-- type: entity
-  parent: RandomPottedMediumPlant
-  id: RandomPottedMediumPlantPot1
-  name: Potted Plant
-  suffix: Medium Pot 1
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_medium_1
-    - state: icon_pot_medium_1
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedMediumPlant
-  id: RandomPottedMediumPlantPot2
-  name: Potted Plant
-  suffix: Medium Pot 2
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_medium_2
-    - state: icon_pot_medium_2
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedMediumPlant
-  id: RandomPottedMediumPlantPot3
-  name: Potted Plant
-  suffix: Medium Pot 3
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_medium_3
-    - state: icon_pot_medium_3
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedMediumPlant
-  id: RandomPottedMediumPlantPot4
-  name: Potted Plant
-  suffix: Medium Pot 4
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_medium_4
-    - state: icon_pot_medium_4
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedMediumPlant
-  id: RandomPottedMediumPlantPot5
-  name: Potted Plant
-  suffix: Medium Pot 5
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_medium_5
-    - state: icon_pot_medium_5
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedMediumPlant
-  id: RandomPottedMediumPlantPot6
-  name: Potted Plant
-  suffix: Medium Pot 6
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_medium_6
-    - state: icon_pot_medium_6
-      map: [ "plant" ]
-
-- type: entity
-  parent: RandomPottedMediumPlant
-  id: RandomPottedMediumPlantPot7
-  name: Potted Plant
-  suffix: Medium Pot 7
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/random_potted_plants.rsi
-    layers:
-    - state: pot_medium_7
-    - state: icon_pot_medium_7
-      map: [ "plant" ]
-
-# Big
-
-# Pot variants
-
-# Huge
-
-# Pot variants

Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseMachinePowered
   id: FaxMachineBase
   name: long range fax machine
@@ -21,7 +21,7 @@
       fix1:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
+          bounds: "-0.25,-0.25,0.25,0.25"
         density: 25
         mask:
         - TabletopMachineMask

Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml

@@ -495,7 +495,7 @@
   - type: AccessReader
     access: [["Atmospherics"]]
 
-# button frames 1
+# button frames
 
 - type: entity
   id: ButtonFrame
@@ -514,7 +514,7 @@
     canCollide: false
   - type: Sprite
     drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f1.rsi
+    sprite: Structures/Wallmounts/switch_frame.rsi
     state: grey
   - type: Rotatable
   - type: Fixtures
@@ -522,443 +522,49 @@
 - type: entity
   id: ButtonFrameGrey
   parent: ButtonFrame
-  suffix: 1 grey
+  suffix: grey
   components:
   - type: Sprite
     drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f1.rsi
+    sprite: Structures/Wallmounts/switch_frame.rsi
     state: grey
 
 - type: entity
   id: ButtonFrameCaution
   parent: ButtonFrame
-  suffix: 1 caution
+  suffix: caution
   components:
   - type: Sprite
     drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f1.rsi
+    sprite: Structures/Wallmounts/switch_frame.rsi
     state: caution
 
 - type: entity
   id: ButtonFrameCautionSecurity
   parent: ButtonFrame
-  suffix: 1 caution
+  suffix: caution
   components:
   - type: Sprite
     drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f1.rsi
+    sprite: Structures/Wallmounts/switch_frame.rsi
     state: caution_security
 
 - type: entity
   id: ButtonFrameExit
   parent: ButtonFrame
-  suffix: 1 exit
+  suffix: exit
   components:
   - type: Sprite
     drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f1.rsi
+    sprite: Structures/Wallmounts/switch_frame.rsi
-    layers:
+    state: exit
-     - state: exit
-     - state: exit_glow
-       shader: unshaded
-
 
 - type: entity
   id: ButtonFrameJanitor
   parent: ButtonFrame
-  suffix: 1 janitor
+  suffix: janitor
   components:
   - type: Sprite
     drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f1.rsi
+    sprite: Structures/Wallmounts/switch_frame.rsi
-    state: janitor
-
-# button frames 2
-
-- type: entity
-  id: ButtonFrame2
-  name: button frame
-  noSpawn: true
-  description: It's a frame to help distinguish switches visually.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
-  components:
-  - type: Clickable
-  - type: WallMount
-    arc: 360
-  - type: Physics
-    canCollide: false
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f2.rsi
-    state: grey
-  - type: Rotatable
-  - type: Fixtures
-
-- type: entity
-  id: ButtonFrameGrey2
-  parent: ButtonFrame2
-  suffix: 2 grey
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f2.rsi
-    state: grey
-
-- type: entity
-  id: ButtonFrameCaution2
-  parent: ButtonFrame2
-  suffix: 2 caution
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f2.rsi
-    state: caution
-
-- type: entity
-  id: ButtonFrameCautionSecurity2
-  parent: ButtonFrame2
-  suffix: 2 caution
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f2.rsi
-    state: caution_security
-
-- type: entity
-  id: ButtonFrameExit2
-  parent: ButtonFrame2
-  suffix: 2 exit
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f2.rsi
-    layers:
-     - state: exit
-     - state: exit_glow
-       shader: unshaded
-
-
-- type: entity
-  id: ButtonFrameJanitor2
-  parent: ButtonFrame2
-  suffix: 2 janitor
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f2.rsi
-    state: janitor
-
-    # button frames 3
-
-- type: entity
-  id: ButtonFrame3
-  name: button frame
-  noSpawn: true
-  description: It's a frame to help distinguish switches visually.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
-  components:
-  - type: Clickable
-  - type: WallMount
-    arc: 360
-  - type: Physics
-    canCollide: false
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f3.rsi
-    state: grey
-  - type: Rotatable
-  - type: Fixtures
-
-- type: entity
-  id: ButtonFrameGrey3
-  parent: ButtonFrame3
-  suffix: 3 grey
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f3.rsi
-    state: grey
-
-- type: entity
-  id: ButtonFrameCaution3
-  parent: ButtonFrame3
-  suffix: 3 caution
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f3.rsi
-    state: caution
-
-- type: entity
-  id: ButtonFrameCautionSecurity3
-  parent: ButtonFrame3
-  suffix: 3 caution
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f3.rsi
-    state: caution_security
-
-- type: entity
-  id: ButtonFrameExit3
-  parent: ButtonFrame3
-  suffix: 3 exit
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f3.rsi
-    layers:
-     - state: exit
-     - state: exit_glow
-       shader: unshaded
-
-
-- type: entity
-  id: ButtonFrameJanitor3
-  parent: ButtonFrame3
-  suffix: 3 janitor
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f3.rsi
-    state: janitor
-
-    # button frames 4
-
-- type: entity
-  id: ButtonFrame4
-  name: button frame
-  noSpawn: true
-  description: It's a frame to help distinguish switches visually.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
-  components:
-  - type: Clickable
-  - type: WallMount
-    arc: 360
-  - type: Physics
-    canCollide: false
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f4.rsi
-    state: grey
-  - type: Rotatable
-  - type: Fixtures
-
-- type: entity
-  id: ButtonFrameGrey4
-  parent: ButtonFrame4
-  suffix: 4 grey
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f4.rsi
-    state: grey
-
-- type: entity
-  id: ButtonFrameCaution4
-  parent: ButtonFrame4
-  suffix: 4 caution
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f4.rsi
-    state: caution
-
-- type: entity
-  id: ButtonFrameCautionSecurity4
-  parent: ButtonFrame4
-  suffix: 4 caution
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f4.rsi
-    state: caution_security
-
-- type: entity
-  id: ButtonFrameExit4
-  parent: ButtonFrame4
-  suffix: 4 exit
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f4.rsi
-    layers:
-     - state: exit
-     - state: exit_glow
-       shader: unshaded
-
-
-- type: entity
-  id: ButtonFrameJanitor4
-  parent: ButtonFrame4
-  suffix: 4 janitor
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f4.rsi
-    state: janitor
-
-    # button frames 5
-
-- type: entity
-  id: ButtonFrame5
-  name: button frame
-  noSpawn: true
-  description: It's a frame to help distinguish switches visually.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
-  components:
-  - type: Clickable
-  - type: WallMount
-    arc: 360
-  - type: Physics
-    canCollide: false
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f5.rsi
-    state: grey
-  - type: Rotatable
-  - type: Fixtures
-
-- type: entity
-  id: ButtonFrameGrey5
-  parent: ButtonFrame5
-  suffix: 5 grey
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f5.rsi
-    state: grey
-
-- type: entity
-  id: ButtonFrameCaution5
-  parent: ButtonFrame5
-  suffix: 5 caution
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f5.rsi
-    state: caution
-
-- type: entity
-  id: ButtonFrameCautionSecurity5
-  parent: ButtonFrame5
-  suffix: 5 caution
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f5.rsi
-    state: caution_security
-
-- type: entity
-  id: ButtonFrameExit5
-  parent: ButtonFrame5
-  suffix: 5 exit
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f5.rsi
-    layers:
-     - state: exit
-     - state: exit_glow
-       shader: unshaded
-
-
-- type: entity
-  id: ButtonFrameJanitor5
-  parent: ButtonFrame5
-  suffix: 5 janitor
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f5.rsi
-    state: janitor
-
-    # button frames 6
-
-- type: entity
-  id: ButtonFrame6
-  name: button frame
-  noSpawn: true
-  description: It's a frame to help distinguish switches visually.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
-  components:
-  - type: Clickable
-  - type: WallMount
-    arc: 360
-  - type: Physics
-    canCollide: false
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f6.rsi
-    state: grey
-  - type: Rotatable
-  - type: Fixtures
-
-- type: entity
-  id: ButtonFrameGrey6
-  parent: ButtonFrame6
-  suffix: 6 grey
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f6.rsi
-    state: grey
-
-- type: entity
-  id: ButtonFrameCaution6
-  parent: ButtonFrame6
-  suffix: 6 caution
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f6.rsi
-    state: caution
-
-- type: entity
-  id: ButtonFrameCautionSecurity6
-  parent: ButtonFrame6
-  suffix: 6 caution
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f6.rsi
-    state: caution_security
-
-- type: entity
-  id: ButtonFrameExit6
-  parent: ButtonFrame6
-  suffix: 6 exit
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f6.rsi
-    layers:
-     - state: exit
-     - state: exit_glow
-       shader: unshaded
-
-
-- type: entity
-  id: ButtonFrameJanitor6
-  parent: ButtonFrame6
-  suffix: 6 janitor
-  components:
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch_frame/f6.rsi
     state: janitor

Resources/Prototypes/Palettes/white.yml

@@ -1,32 +0,0 @@
-- type: palette
-  id: wh
-  name: wh
-  colors:
-    blue: "#1861d5"
-    red: "#951710"
-    pink: "#d5188d"
-    brown: "#a05212"
-    green: "#0e7f1b"
-    cyan: "#18a2d5"
-    yellow: "#d58c18"
-
-- type: palette
-  id: whi
-  name: whi
-  colors:
-    black: "#1D1D21"
-    red: "#B02E26"
-    green: "#5E7C16"
-    brown: "#835432"
-    blue: "#3C44AA"
-    purple: "#8932B8"
-    cyan: "#169C9C"
-    "light gray": "#9D9D97"
-    gray: "#474F52"
-    pink: "#F38BAA"
-    lime: "#80C71F"
-    yellow: "#FED83D"
-    "light blue": "#3AB3DA"
-    magenta: "#C74EBD"
-    orange: "#F9801D"
-    white: "#F9FFFE"

Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml

@@ -120,4 +120,4 @@
             - material: WoodPlank
               amount: 2
     - node: woodtilelarge
-      entity: FloorTileItemWoodLarge
+      entity: FloorTileItemWoodLarge

Resources/Prototypes/Recipes/Crafting/tiles.yml

@@ -196,4 +196,4 @@
   category: construction-category-tiles
   description: "Four pieces of wooden station flooring."
   icon: { sprite: Objects/Tiles/tile.rsi, state: wood-large }
-  objectType: Item
+  objectType: Item

Resources/Prototypes/Tiles/floors.yml

@@ -116,12 +116,6 @@
   id: FloorSteelOffset
   name: tiles-steel-floor-offset
   sprite: /Textures/Tiles/steel_offset.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -248,7 +242,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepFloor
-  itemDrop: FloorTileItemPlasticGrey
+  itemDrop: FloorTileItemSteel
   heatCapacity: 10000
   tileRipResistance: 80
 
@@ -354,12 +348,6 @@
   name: tiles-white-floor-offset
   sprite: /Textures/Tiles/white_offset.png
   baseTurf: Plating
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   isSubfloor: false
   deconstructTools: [ Prying ]
   footstepSounds:
@@ -459,7 +447,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemPlasticWhite
+  itemDrop: FloorTileItemWhite
   heatCapacity: 10000
   tileRipResistance: 80
 
@@ -544,12 +532,6 @@
   name: tiles-dark-floor-offset
   sprite: /Textures/Tiles/dark_offset.png
   baseTurf: Plating
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   isSubfloor: false
   deconstructTools: [ Prying ]
   footstepSounds:
@@ -649,7 +631,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemPlasticDark
+  itemDrop: FloorTileItemDark
   heatCapacity: 10000
   tileRipResistance: 50
 
@@ -762,12 +744,6 @@
   name: tiles-blue-tile
   sprite: /Textures/Tiles/blue.png
   baseTurf: Plating
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   isSubfloor: false
   deconstructTools: [ Prying ]
   footstepSounds:
@@ -834,216 +810,12 @@
   heatCapacity: 10000
   tileRipResistance: 250
 
-- type: tile
-  id: FloorSteelYellow
-  name: tiles-steel-yellow-floor
-  sprite: /Textures/Tiles/steel_yellow.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemSteelYellow
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorSteelRed
-  name: tiles-steel-red-floor
-  sprite: /Textures/Tiles/steel_red.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemSteelRed
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorSteelGreen
-  name: tiles-steel-green-floor
-  sprite: /Textures/Tiles/steel_green.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemSteelGreen
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorSteelBlue
-  name: tiles-steel-blue-floor
-  sprite: /Textures/Tiles/steel_Blue.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemSteelBlue
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorPlasticYellow
-  name: tiles-plastic-yellow-floor
-  sprite: /Textures/Tiles/plastic_yellow.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemPlasticYellow
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorPlasticRed
-  name: tiles-plastic-red-floor
-  sprite: /Textures/Tiles/plastic_red.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemPlasticRed
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorPlasticGreen
-  name: tiles-plastic-green-floor
-  sprite: /Textures/Tiles/plastic_green.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemPlasticGreen
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorPlasticBlue
-  name: tiles-plastic-blue-floor
-  sprite: /Textures/Tiles/plastic_Blue.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemPlasticBlue
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorShielding
-  name: tiles-shielding-floor
-  sprite: /Textures/Tiles/shielding.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemShielding
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorReinforcedGlassFrame
-  name: tiles-reinforced-glass-frame-floor
-  sprite: /Textures/Tiles/rglass_frame.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemReinforcedGlassFrame
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorGlassFrame
-  name: tiles-glass-frame-floor
-  sprite: /Textures/Tiles/glass_frame.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemGlassFrame
-  heatCapacity: 10000
-
 # Departamental
 - type: tile
   id: FloorFreezer
   name: tiles-freezer
   sprite: /Textures/Tiles/freezer.png
   baseTurf: Plating
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   isSubfloor: false
   deconstructTools: [ Prying ]
   footstepSounds:
@@ -1053,9 +825,9 @@
   tileRipResistance: 100
 
 - type: tile
-  id: FloorSterile
+  id: FloorShowroom
-  name: tiles-sterile
+  name: tiles-showroom-floor
-  sprite: /Textures/Tiles/sterile.png
+  sprite: /Textures/Tiles/showroom.png
   baseTurf: Plating
   variants: 4
   placementVariants:
@@ -1065,32 +837,6 @@
   - 1.0
   isSubfloor: false
   deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepHull
-  itemDrop: FloorTileItemSterile
-  heatCapacity: 10000
-
-- type: tile
-  id: FloorShowroom
-  name: tiles-showroom-floor
-  sprite: /Textures/Tiles/showroom.png
-  baseTurf: Plating
-  variants: 12
-  placementVariants:
-    - 1.0
-    - 1.0
-    - 1.0
-    - 1.0
-    - 1.0
-    - 1.0
-    - 1.0
-    - 1.0
-    - 1.0
-    - 1.0
-    - 1.0
-    - 1.0
-  isSubfloor: false
-  deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepFloor
   itemDrop: FloorTileItemShowroom
@@ -1102,12 +848,6 @@
   name: tiles-hydro-floor
   sprite: /Textures/Tiles/hydro.png
   baseTurf: Plating
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   isSubfloor: false
   deconstructTools: [ Prying ]
   footstepSounds:
@@ -1140,16 +880,6 @@
   name: tiles-clown-floor
   sprite: /Textures/Tiles/clown.png
   baseTurf: Plating
-  variants: 8
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   isSubfloor: false
   deconstructTools: [ Prying ]
   footstepSounds:
@@ -1163,12 +893,6 @@
   name: tiles-mime-floor
   sprite: /Textures/Tiles/mime.png
   baseTurf: Plating
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   isSubfloor: false
   deconstructTools: [ Prying ]
   footstepSounds:
@@ -1182,12 +906,6 @@
   name: tiles-kitchen-floor
   sprite: /Textures/Tiles/kitchen.png
   baseTurf: Plating
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   isSubfloor: false
   deconstructTools: [ Prying ]
   footstepSounds:
@@ -1201,12 +919,6 @@
   name: tiles-laundry-floor
   sprite: /Textures/Tiles/laundry.png
   baseTurf: Plating
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   isSubfloor: false
   deconstructTools: [ Prying ]
   footstepSounds:
@@ -1219,16 +931,13 @@
   id: FloorSteelDamaged
   name: tiles-steel-floor
   sprite: /Textures/Tiles/steel_damaged.png
-  variants: 8
+  variants: 5
   placementVariants:
   - 1.0
   - 1.0
   - 1.0
   - 1.0
   - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1242,16 +951,10 @@
   id: FloorSteelBurnt
   name: tiles-steel-floor
   sprite: /Textures/Tiles/steel_burnt.png
-  variants: 8
+  variants: 2
   placementVariants:
   - 1.0
   - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1585,6 +1288,11 @@
   id: FloorShuttleWhite
   name: tiles-white-shuttle-floor
   sprite: /Textures/Tiles/shuttlewhite.png
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1598,6 +1306,12 @@
   id: FloorShuttleGrey
   name: tiles-grey-shuttle-floor
   sprite: /Textures/Tiles/shuttlegrey.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1611,6 +1325,12 @@
   id: FloorShuttleBlack
   name: tiles-black-shuttle-floor
   sprite: /Textures/Tiles/shuttleblack.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1624,6 +1344,11 @@
   id: FloorShuttleBlue
   name: tiles-blue-shuttle-floor
   sprite: /Textures/Tiles/shuttleblue.png
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1637,6 +1362,11 @@
   id: FloorShuttleOrange
   name: tiles-orange-shuttle-floor
   sprite: /Textures/Tiles/shuttleorange.png
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1650,6 +1380,11 @@
   id: FloorShuttlePurple
   name: tiles-purple-shuttle-floor
   sprite: /Textures/Tiles/shuttlepurple.png
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1663,6 +1398,11 @@
   id: FloorShuttleRed
   name: tiles-red-shuttle-floor
   sprite: /Textures/Tiles/shuttlered.png
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1672,18 +1412,6 @@
   heatCapacity: 10000
   tileRipResistance: 4500
 
-- type: tile
-  id: FloorShuttleSyndie
-  name: tiles-syndie-shuttle-floor
-  sprite: /Textures/Tiles/shuttlesyndie.png
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemShuttleSyndie
-  heatCapacity: 10000
-
 
 # Materials
 - type: tile
@@ -1716,12 +1444,6 @@
   id: FloorGlass
   name: tiles-glass-floor
   sprite: /Textures/Tiles/glass.png
-  variants: 4
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1906,7 +1628,7 @@
 
 - type: tile
   id: FloorAsteroidSandDug
-  name: tiles-asteroid-sand-dug
+  name: tiles-asteroid-sand
   sprite: /Textures/Tiles/Asteroid/asteroid_dug.png
   baseTurf: Space
   isSubfloor: true
@@ -2003,60 +1725,6 @@
   heatCapacity: 10000
   weather: true
 
-- type: tile
-  id: FloorAsteroidCoarse
-  name: tiles-asteroid-coarse
-  sprite: /Textures/Tiles/Asteroid/asteroid_coarse.png
-  variants: 6
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Space
-  isSubfloor: true
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-
-- type: tile
-  id: FloorAsteroidCoarseDug
-  name: tiles-asteroid-coarse-dug
-  sprite: /Textures/Tiles/Asteroid/asteroid_coarse_dug.png
-  variants: 6
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Space
-  isSubfloor: true
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-
-- type: tile
-  id: FloorAsteroidGravel
-  name: tiles-asteroid-gravel
-  sprite: /Textures/Tiles/Asteroid/asteroid_gravel.png
-  variants: 3
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: Space
-  isSubfloor: true
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-
 # Caves
 - type: tile
   id: FloorCave