wall and windowening (paradise walls and windows)

Reviewed-on: #1

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

@@ -6,9 +6,9 @@
   description: A sheet of glass, used often on the station in various applications.
   components:
   - type: Sprite
-    sprite: Objects/Materials/Sheets/glass.rsi
+    sprite: _TBD/Objects/stack_objects.rsi
   - type: Item
-    sprite: Objects/Materials/Sheets/glass.rsi
+    sprite: _TBD/Objects/stack_objects.rsi
     size: Normal
   - type: StaticPrice
     price: 0
@@ -62,16 +62,16 @@
     stackType: Glass
     baseLayer: base
     layerStates:
-    - glass
+    - sheet-glass_1
-    - glass_2
+    - sheet-glass_2
-    - glass_3
+    - sheet-glass_3
   - type: Sprite
-    state: glass_3
+    state: sheet-glass_3
     layers:
-    - state: glass_3
+    - state: sheet-glass_3
       map: ["base"]
   - type: Item
-    heldPrefix: glass
+    heldPrefix: sheet-glass_1
   - type: FloorTile
     outputs:
     - FloorGlass
@@ -93,7 +93,7 @@
   suffix: 10
   components:
   - type: Sprite
-    state: glass
+    state: sheet-glass_1
   - type: Stack
     stackType: Glass
     count: 10
@@ -104,7 +104,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: glass
+    state: sheet-glass_1
   - type: Stack
     stackType: Glass
     count: 1
@@ -123,16 +123,16 @@
     stackType: ReinforcedGlass
     baseLayer: base
     layerStates:
-    - rglass
+    - sheet-rglass_1
-    - rglass_2
+    - sheet-rglass_2
-    - rglass_3
+    - sheet-rglass_3
   - type: Sprite
-    state: rglass_3
+    state: sheet-rglass_3
     layers:
-    - state: rglass_3
+    - state: sheet-rglass_3
       map: ["base"]
   - type: Item
-    heldPrefix: rglass
+    heldPrefix: sheet-rglass_1
   - type: FloorTile
     outputs:
     - FloorRGlass
@@ -171,12 +171,12 @@
   suffix: Single
   components:
   - type: Sprite
-    state: rglass
+    state: sheet-rglass_1
   - type: Stack
     stackType: ReinforcedGlass
     count: 1
   - type: Extractable
-    grindableSolutionName: rglass
+    grindableSolutionName: sheet-rglass_1
   - type: SolutionContainerManager
     solutions:
       rglass:
@@ -203,16 +203,16 @@
     stackType: PlasmaGlass
     baseLayer: base
     layerStates:
-    - pglass
+    - sheet-pglass_1
-    - pglass_2
+    - sheet-pglass_2
-    - pglass_3
+    - sheet-pglass_3
   - type: Sprite
-    state: pglass_3
+    state: sheet-pglass_3
     layers:
-    - state: pglass_3
+    - state: sheet-pglass_3
       map: ["base"]
   - type: Item
-    heldPrefix: pglass
+    heldPrefix: sheet-pglass_1
   - type: Construction
     graph: Glass
     node: SheetPGlass
@@ -248,7 +248,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: pglass
+    state: sheet-pglass_1
   - type: Stack
     stackType: PlasmaGlass
     count: 1
@@ -278,16 +278,16 @@
     stackType: ReinforcedPlasmaGlass
     baseLayer: base
     layerStates:
-    - rpglass
+    - sheet-prglass_1
-    - rpglass_2
+    - sheet-prglass_2
-    - rpglass_3
+    - sheet-prglass_3
   - type: Sprite
-    state: rpglass_3
+    state: sheet-prglass_3
     layers:
-    - state: rpglass_3
+    - state: sheet-prglass_3
       map: ["base"]
   - type: Item
-    heldPrefix: rpglass
+    heldPrefix: sheet-prglass_1
   - type: Construction
     graph: Glass
     node: SheetRPGlass
@@ -314,7 +314,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: rpglass
+    state: sheet-prglass_1
   - type: Stack
     stackType: ReinforcedPlasmaGlass
     count: 1
@@ -333,16 +333,16 @@
     stackType: UraniumGlass
     baseLayer: base
     layerStates:
-    - uglass
+    - sheet-uglass_1
-    - uglass_2
+    - sheet-uglass_2
-    - uglass_3
+    - sheet-uglass_3
   - type: Sprite
-    state: uglass_3
+    state: sheet-uglass_3
     layers:
-    - state: uglass_3
+    - state: sheet-uglass_3
       map: ["base"]
   - type: Item
-    heldPrefix: uglass
+    heldPrefix: sheet-uglass_1
   - type: Construction
     graph: Glass
     node: SheetUGlass
@@ -389,7 +389,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: uglass
+    state: sheet-uglass_1
   - type: Stack
     stackType: UraniumGlass
     count: 1
@@ -407,16 +407,16 @@
     stackType: ReinforcedUraniumGlass
     baseLayer: base
     layerStates:
-    - ruglass
+    - sheet-urglass_1
-    - ruglass_2
+    - sheet-urglass_2
-    - ruglass_3
+    - sheet-urglass_3
   - type: Sprite
-    state: ruglass_3
+    state: sheet-urglass_3
     layers:
-    - state: ruglass_3
+    - state: sheet-urglass_3
       map: ["base"]
   - type: Item
-    heldPrefix: ruglass
+    heldPrefix: sheet-urglass
   - type: Construction
     graph: Glass
     node: SheetRUGlass
@@ -443,7 +443,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: ruglass
+    state: sheet-urglass_1
   - type: Stack
     stackType: ReinforcedUraniumGlass
     count: 1
@@ -466,6 +466,7 @@
     - cglass_2
     - cglass_3
   - type: Sprite
+    sprite: Objects/Materials/Sheets/glass.rsi
     state: cglass_3
     layers:
     - state: cglass_3
@@ -520,6 +521,7 @@
   suffix: Single
   components:
   - type: Sprite
+    sprite: Objects/Materials/Sheets/glass.rsi
     state: cglass
   - type: Stack
     stackType: ClockworkGlass

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

@@ -5,9 +5,9 @@
   description: A sheet of metal, used often on the station in various applications.
   components:
   - type: Sprite
-    sprite: Objects/Materials/Sheets/metal.rsi
+    sprite: _TBD/Objects/stack_objects.rsi
   - type: Item
-    sprite: Objects/Materials/Sheets/metal.rsi
+    sprite: _TBD/Objects/stack_objects.rsi
     size: Normal
   - type: StaticPrice
     price: 0
@@ -49,16 +49,16 @@
     stackType: Steel
     baseLayer: base
     layerStates:
-    - steel
+    - sheet-metal_1
-    - steel_2
+    - sheet-metal_2
-    - steel_3
+    - sheet-metal_3
   - type: Sprite
-    state: steel_3
+    state: sheet-metal_3
     layers:
-    - state: steel_3
+    - state: sheet-metal_3
       map: ["base"]
   - type: Item
-    heldPrefix: steel
+    heldPrefix: sheet-metal_1
   - type: Appearance
   - type: Extractable
     grindableSolutionName: steel
@@ -78,7 +78,7 @@
   suffix: 10
   components:
   - type: Sprite
-    state: steel
+    state: sheet-metal_1
   - type: Stack
     stackType: Steel
     count: 10
@@ -90,7 +90,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: steel
+    state: sheet-metal_1
   - type: Stack
     stackType: Steel
     count: 1
@@ -114,6 +114,7 @@
     - brass_2
     - brass_3
   - type: Sprite
+    sprite: Objects/Materials/Sheets/metal.rsi
     state: brass_3
     layers:
     - state: brass_3
@@ -142,6 +143,7 @@
   suffix: 10
   components:
   - type: Sprite
+    sprite: Objects/Materials/Sheets/metal.rsi
     state: brass
   - type: Stack
     stackType: Brass
@@ -154,6 +156,7 @@
   suffix: Single
   components:
   - type: Sprite
+    sprite: Objects/Materials/Sheets/metal.rsi
     state: brass
   - type: Stack
     stackType: Brass
@@ -173,13 +176,13 @@
     stackType: Plasteel
     baseLayer: base
     layerStates:
-    - plasteel
+    - sheet-plasteel_1
-    - plasteel_2
+    - sheet-plasteel_2
-    - plasteel_3
+    - sheet-plasteel_3
   - type: Sprite
-    state: plasteel_3
+    state: sheet-plasteel_3
     layers:
-    - state: plasteel_3
+    - state: sheet-plasteel_3
       map: ["base"]
   - type: Item
     heldPrefix: plasteel
@@ -205,7 +208,7 @@
   suffix: 10
   components:
   - type: Sprite
-    state: plasteel
+    state: sheet-plasteel_1
   - type: Stack
     stackType: Plasteel
     count: 10
@@ -217,7 +220,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: plasteel
+    state: sheet-plasteel_1
   - type: Stack
     stackType: Plasteel
     count: 1

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

@@ -5,9 +5,9 @@
   description: A sheet of material, used often on the station in various applications.
   components:
   - type: Sprite
-    sprite: Objects/Materials/Sheets/other.rsi
+    sprite: _TBD/Objects/stack_objects.rsi
   - type: Item
-    sprite: Objects/Materials/Sheets/other.rsi
+    sprite: _TBD/Objects/stack_objects.rsi
     size: Normal
   - type: Tag
     tags:
@@ -38,20 +38,20 @@
     stackType: Paper
     baseLayer: base
     layerStates:
-    - paper
+    - sheet-paper_1
-    - paper_2
+    - sheet-paper_2
-    - paper_3
+    - sheet-paper_3
   - type: Material
   - type: PhysicalComposition
     materialComposition:
       Paper: 100
   - type: Sprite
-    state: paper_3
+    state: sheet-paper_3
     layers:
-    - state: paper_3
+    - state: sheet-paper_3
       map: ["base"]
   - type: Item
-    heldPrefix: paper
+    heldPrefix: sheet-paper_1
   - type: Appearance
   - type: Extractable
     grindableSolutionName: paper
@@ -70,7 +70,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: paper
+    state: sheet-paper_1
   - type: Stack
     count: 1
 
@@ -88,16 +88,16 @@
     stackType: Plasma
     baseLayer: base
     layerStates:
-    - plasma
+    - sheet-plasma_1
-    - plasma_2
+    - sheet-plasma_2
-    - plasma_3
+    - sheet-plasma_3
   - type: Sprite
-    state: plasma_3
+    state: sheet-plasma_3
     layers:
-    - state: plasma_3
+    - state: sheet-plasma_3
       map: ["base"]
   - type: Item
-    heldPrefix: plasma
+    heldPrefix: sheet-plasma_1
   - type: Appearance
   - type: Extractable
     grindableSolutionName: plasma
@@ -115,7 +115,7 @@
   suffix: 10
   components:
   - type: Sprite
-    state: plasma
+    state: sheet-plasma_1
   - type: Stack
     count: 10
 
@@ -126,7 +126,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: plasma
+    state: sheet-plasma_1
   - type: Stack
     count: 1
 
@@ -149,16 +149,16 @@
     stackType: Plastic
     baseLayer: base
     layerStates:
-    - plastic
+    - sheet-plastic_1
-    - plastic_2
+    - sheet-plastic_2
-    - plastic_3
+    - sheet-plastic_3
   - type: Sprite
-    state: plastic_3
+    state: sheet-plastic_3
     layers:
-    - state: plastic_3
+    - state: sheet-plastic_3
       map: ["base"]
   - type: Item
-    heldPrefix: plastic
+    heldPrefix: sheet-plastic_1
   - type: Appearance
   - type: Extractable
     grindableSolutionName: plastic
@@ -179,7 +179,7 @@
   suffix: 10
   components:
   - type: Sprite
-    state: plastic
+    state: sheet-plastic_1
   - type: Stack
     count: 10
 
@@ -190,7 +190,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: plastic
+    state: sheet-plastic_1
   - type: Stack
     count: 1
 
@@ -211,17 +211,17 @@
     stackType: Uranium
     baseLayer: base
     layerStates:
-    - uranium
+    - sheet-uranium_1
-    - uranium_2
+    - sheet-uranium_2
-    - uranium_3
+    - sheet-uranium_3
   - type: Sprite
-    state: uranium_3
+    state: sheet-uranium_3
     layers:
-    - state: uranium_3
+    - state: sheet-uranium_3
       map: ["base"]
   - type: Appearance
   - type: Item
-    heldPrefix: uranium
+    heldPrefix: sheet-uranium_1
   - type: Extractable
     grindableSolutionName: food
   - type: SolutionContainerManager

Resources/Prototypes/Entities/Objects/Materials/ingots.yml

@@ -5,9 +5,9 @@
   description: A heavy metal ingot stamped with the Nanotrasen logo.
   components:
   - type: Sprite
-    sprite: Objects/Materials/ingots.rsi
+    sprite: _TBD/Objects/stack_objects.rsi
   - type: Item
-    sprite: Objects/Materials/ingots.rsi
+    sprite: _TBD/Objects/stack_objects.rsi
     size: Normal
   - type: StaticPrice
     price: 0
@@ -41,16 +41,16 @@
     stackType: Gold
     baseLayer: base
     layerStates:
-    - gold
+    - sheet-gold_1
-    - gold_2
+    - sheet-gold_2
-    - gold_3
+    - sheet-gold_3
   - type: Sprite
-    state: gold_3
+    state: sheet-gold_3
     layers:
-    - state: gold_3
+    - state: sheet-gold_3
       map: ["base"]
   - type: Item
-    heldPrefix: gold
+    heldPrefix: sheet-gold_1
   - type: Appearance
   - type: Extractable
     grindableSolutionName: gold
@@ -68,7 +68,7 @@
   suffix: Single
   components:
   - type: Sprite
-    state: gold
+    state: sheet-gold_1
   - type: Stack
     count: 1
 
@@ -86,16 +86,16 @@
     stackType: Silver
     baseLayer: base
     layerStates:
-    - silver
+    - sheet-silver_1
-    - silver_2
+    - sheet-silver_2
-    - silver_3
+    - sheet-silver_3
   - type: Sprite
     state: silver_3
     layers:
     - state: silver_3
       map: ["base"]
   - type: Item
-    heldPrefix: silver
+    heldPrefix: sheet-silver_1
   - type: Appearance
   - type: Extractable
     grindableSolutionName: gold
@@ -113,6 +113,6 @@
   suffix: Single
   components:
   - type: Sprite
-    state: silver
+    state: sheet-silver_1
   - type: Stack
     count: 1

Resources/Prototypes/Entities/Objects/Power/lights.yml

@@ -232,7 +232,7 @@
   description: A light fixture.
   components:
   - type: LightBulb
-    color: "#FFE4CE" # 5000K color temp
+    color: "#FFFFFF" # 5000K color temp
     lightEnergy: 0.8
     lightRadius: 10
     lightSoftness: 1

Resources/Prototypes/Entities/Objects/Tools/toolbox.yml

@@ -44,10 +44,10 @@
   description: A bright red toolbox, stocked with emergency tools.
   components:
   - type: Sprite
-    sprite: Objects/Tools/Toolboxes/toolbox_red.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_red.rsi
     state: icon
   - type: Item
-    sprite: Objects/Tools/Toolboxes/toolbox_red.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_red.rsi
 
 - type: entity
   name: mechanical toolbox
@@ -56,10 +56,10 @@
   description: A blue box, stocked with mechanical tools.
   components:
   - type: Sprite
-    sprite: Objects/Tools/Toolboxes/toolbox_blue.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_blue.rsi
     state: icon
   - type: Item
-    sprite: Objects/Tools/Toolboxes/toolbox_blue.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_blue.rsi
 
 - type: entity
   name: electrical toolbox
@@ -68,10 +68,10 @@
   description: A toolbox typically stocked with electrical gear.
   components:
   - type: Sprite
-    sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_yellow.rsi
     state: icon
   - type: Item
-    sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_yellow.rsi
 
 - type: entity
   name: electrical toolbox
@@ -111,10 +111,10 @@
   description: A toolbox typically stocked with artistic supplies.
   components:
   - type: Sprite
-    sprite: Objects/Tools/Toolboxes/toolbox_green.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_green.rsi
     state: icon
   - type: Item
-    sprite: Objects/Tools/Toolboxes/toolbox_green.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_green.rsi
 
 - type: entity
   name: suspicious toolbox
@@ -123,10 +123,10 @@
   description: A sinister looking toolbox filled with elite syndicate tools.
   components:
   - type: Sprite
-    sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_syn.rsi
     state: icon
   - type: Item
-    sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_syn.rsi
   - type: Storage
     maxItemSize: Huge
     grid:
@@ -143,7 +143,7 @@
   description: A solid gold toolbox. A rapper would kill for this.
   components:
   - type: Sprite
-    sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_gold.rsi
     state: icon
   - type: Item
-    sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi
+    sprite: _TBD/Objects/Tools/Toolboxes/toolbox_gold.rsi

Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml

@@ -32,7 +32,7 @@
       shader: unshaded
     state: base
   - type: PointLight
-    color: "#FFE4CE" # 5000K color temp
+    color: "#FFFFFF" # 5000K color temp
     energy: 0.8
     radius: 10
     softness: 1

Resources/Prototypes/Entities/Structures/Power/apc.yml

@@ -24,7 +24,8 @@
     access: [["Engineering"]]
   - type: Sprite
     drawdepth: WallMountedItems
-    sprite: Structures/Power/apc.rsi
+    sprite: _TBD/Structures/Power/apc.rsi
+    offset: 0, -0.15
     layers:
     - state: base
     - state: panel
@@ -73,7 +74,7 @@
     sourceNode: input
     loadNode: output
     collectionName: apc
-    sprite: Structures/Power/apc.rsi
+    sprite: _TBD/Structures/Power/apc.rsi
     state: static
   - type: BatteryCharger
     voltage: Medium
@@ -162,8 +163,9 @@
     mode: SnapgridCenter
   components:
   - type: Sprite
-    sprite: Structures/Power/apc.rsi
+    sprite: _TBD/Structures/Power/apc.rsi
     state: frame
+    offset: 0, -0.15
   - type: Construction
     graph: APC
     node: apcFrame

Resources/Prototypes/Entities/Structures/Walls/walls.yml

@@ -589,9 +589,9 @@
   name: reinforced wall
   components:
   - type: Sprite
-    sprite: Structures/Walls/solid.rsi
+    sprite: _TBD/Structures/Walls/solid.rsi
   - type: Icon
-    sprite: Structures/Walls/solid.rsi
+    sprite: _TBD/Structures/Walls/solid.rsi
     state: rgeneric
   - type: Construction
     graph: Girder
@@ -659,9 +659,9 @@
   suffix: rusted
   components:
   - type: Sprite
-    sprite: Structures/Walls/solid_rust.rsi
+    sprite: _TBD/Structures/Walls/solid_rust.rsi
   - type: Icon
-    sprite: Structures/Walls/solid_rust.rsi
+    sprite: _TBD/Structures/Walls/solid_rust.rsi
     state: rgeneric
   - type: Construction
     graph: Girder
@@ -699,10 +699,10 @@
   components:
   - type: Sprite
     drawdepth: Walls
-    sprite: Structures/Walls/reinforced_diagonal.rsi
+    sprite: _TBD/Structures/Walls/reinforced_diagonal.rsi
     state: state0
   - type: Icon
-    sprite: Structures/Walls/reinforced_diagonal.rsi
+    sprite: _TBD/Structures/Walls/reinforced_diagonal.rsi
     state: state0
   - type: Damageable
     damageContainer: StructuralInorganic
@@ -981,13 +981,13 @@
   name: solid wall
   components:
   - type: Sprite
-    sprite: Structures/Walls/solid.rsi
+    sprite: _TBD/Structures/Walls/solid.rsi
   - type: WallReplacementMarker
   - type: Construction
     graph: Girder
     node: wall
   - type: Icon
-    sprite: Structures/Walls/solid.rsi
+    sprite: _TBD/Structures/Walls/solid.rsi
   - type: RCDDeconstructable
     cost: 6
     delay: 8
@@ -1025,10 +1025,10 @@
   components:
   - type: Sprite
     drawdepth: Walls
-    sprite: Structures/Walls/solid_diagonal.rsi
+    sprite: _TBD/Structures/Walls/solid_diagonal.rsi
     state: state0
   - type: Icon
-    sprite: Structures/Walls/solid_diagonal.rsi
+    sprite: _TBD/Structures/Walls/solid_diagonal.rsi
     state: state0
   - type: Destructible
     thresholds:
@@ -1059,9 +1059,9 @@
   suffix: rusted
   components:
   - type: Sprite
-    sprite: Structures/Walls/solid_rust.rsi
+    sprite: _TBD/Structures/Walls/solid_rust.rsi
   - type: Icon
-    sprite: Structures/Walls/solid_rust.rsi
+    sprite: _TBD/Structures/Walls/solid_rust.rsi
     state: full
   - type: Construction
     graph: Girder

Resources/Prototypes/Entities/Structures/Windows/plasma.yml

@@ -5,9 +5,9 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/plasma_window.rsi
+    sprite: _TBD/Structures/Windows/plasma_window.rsi
   - type: Icon
-    sprite: Structures/Windows/plasma_window.rsi
+    sprite: _TBD/Structures/Windows/plasma_window.rsi
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: Glass
@@ -120,7 +120,7 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/plasma_diagonal.rsi
+    sprite: _TBD/Structures/Windows/plasma_diagonal.rsi
     state: state0
   - type: Tag
     tags:
@@ -128,10 +128,10 @@
     - Window
   - type: IconSmooth
     mode: Diagonal
-    key: windows
+    key: walls
     base: state
   - type: Icon
-    sprite: Structures/Windows/plasma_diagonal.rsi
+    sprite: _TBD/Structures/Windows/plasma_diagonal.rsi
     state: state0
   - type: Fixtures
     fixtures:

Resources/Prototypes/Entities/Structures/Windows/reinforced.yml

@@ -5,9 +5,9 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/reinforced_window.rsi
+    sprite: _TBD/Structures/Windows/reinforced_window.rsi
   - type: Icon
-    sprite: Structures/Windows/reinforced_window.rsi
+    sprite: _TBD/Structures/Windows/reinforced_window.rsi
   - type: Repairable
     fuelCost: 10
     doAfterDelay: 2
@@ -127,7 +127,7 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/reinforced_window_diagonal.rsi
+    sprite: _TBD/Structures/Windows/reinforced_window_diagonal.rsi
     state: state0
   - type: Tag
     tags:
@@ -135,10 +135,10 @@
     - Window
   - type: IconSmooth
     mode: Diagonal
-    key: windows
+    key: walls
     base: state
   - type: Icon
-    sprite: Structures/Windows/reinforced_window_diagonal.rsi
+    sprite: _TBD/Structures/Windows/reinforced_window_diagonal.rsi
     state: state0
   - type: Fixtures
     fixtures:

Resources/Prototypes/Entities/Structures/Windows/rplasma.yml

@@ -5,9 +5,9 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/reinforced_plasma_window.rsi
+    sprite: _TBD/Structures/Windows/reinforced_plasma_window.rsi
   - type: Icon
-    sprite: Structures/Windows/reinforced_plasma_window.rsi
+    sprite: _TBD/Structures/Windows/reinforced_plasma_window.rsi
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: RGlass
@@ -125,7 +125,7 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/reinforced_plasma_diagonal.rsi
+    sprite: _TBD/Structures/Windows/reinforced_plasma_diagonal.rsi
     state: state0
   - type: Tag
     tags:
@@ -133,10 +133,10 @@
     - Window
   - type: IconSmooth
     mode: Diagonal
-    key: windows
+    key: walls
     base: state
   - type: Icon
-    sprite: Structures/Windows/reinforced_plasma_diagonal.rsi
+    sprite: _TBD/Structures/Windows/reinforced_plasma_diagonal.rsi
     state: state0
   - type: Fixtures
     fixtures:

Resources/Prototypes/Entities/Structures/Windows/ruranium.yml

@@ -5,9 +5,9 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/reinforced_uranium_window.rsi
+    sprite: _TBD/Structures/Windows/reinforced_uranium_window.rsi
   - type: Icon
-    sprite: Structures/Windows/reinforced_uranium_window.rsi
+    sprite: _TBD/Structures/Windows/reinforced_uranium_window.rsi
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: RGlass
@@ -122,7 +122,7 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/reinforced_uranium_diagonal.rsi
+    sprite: _TBD/Structures/Windows/reinforced_uranium_diagonal.rsi
     state: state0
   - type: Tag
     tags:
@@ -130,10 +130,10 @@
     - Window
   - type: IconSmooth
     mode: Diagonal
-    key: windows
+    key: walls
     base: state
   - type: Icon
-    sprite: Structures/Windows/reinforced_uranium_diagonal.rsi
+    sprite: _TBD/Structures/Windows/reinforced_uranium_diagonal.rsi
     state: state0
   - type: Fixtures
     fixtures:

Resources/Prototypes/Entities/Structures/Windows/uranium.yml

@@ -5,9 +5,9 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/uranium_window.rsi
+    sprite: _TBD/Structures/Windows/uranium_window.rsi
   - type: Icon
-    sprite: Structures/Windows/uranium_window.rsi
+    sprite: _TBD/Structures/Windows/uranium_window.rsi
     state: full
   - type: Damageable
     damageContainer: StructuralInorganic
@@ -115,7 +115,7 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/uranium_window_diagonal.rsi
+    sprite: _TBD/Structures/Windows/uranium_window_diagonal.rsi
     state: state0
   - type: Tag
     tags:
@@ -123,10 +123,10 @@
     - Window
   - type: IconSmooth
     mode: Diagonal
-    key: windows
+    key: walls
     base: state
   - type: Icon
-    sprite: Structures/Windows/uranium_window_diagonal.rsi
+    sprite: _TBD/Structures/Windows/uranium_window_diagonal.rsi
     state: state0
   - type: Fixtures
     fixtures:

Resources/Prototypes/Entities/Structures/Windows/window.yml

@@ -24,9 +24,9 @@
       - Window
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/window.rsi
+    sprite: _TBD/Structures/Windows/window.rsi
   - type: Icon
-    sprite: Structures/Windows/window.rsi
+    sprite: _TBD/Structures/Windows/window.rsi
     state: full
   - type: Physics
     bodyType: Static
@@ -76,7 +76,7 @@
         acts: [ "Destruction" ]
   - type: Airtight
   - type: IconSmooth
-    key: windows
+    key: walls
     base: window
   - type: InteractionPopup
     interactSuccessString: comp-window-knock
@@ -104,9 +104,9 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/tinted_window.rsi
+    sprite: _TBD/Structures/Windows/tinted_window.rsi
   - type: Icon
-    sprite: Structures/Windows/tinted_window.rsi
+    sprite: _TBD/Structures/Windows/tinted_window.rsi
   - type: IconSmooth
     base: twindow
   - type: Construction
@@ -256,7 +256,7 @@
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Structures/Windows/window_diagonal.rsi
+    sprite: _TBD/Structures/Windows/window_diagonal.rsi
     state: state0
   - type: Tag
     tags:
@@ -264,10 +264,10 @@
     - Window
   - type: IconSmooth
     mode: Diagonal
-    key: windows
+    key: walls
     base: state
   - type: Icon
-    sprite: Structures/Windows/window_diagonal.rsi
+    sprite: _TBD/Structures/Windows/window_diagonal.rsi
     state: state0
   - type: Fixtures
     fixtures:

Resources/Prototypes/Parallaxes/default.yml

@@ -38,7 +38,7 @@
     - texture:
         !type:ImageParallaxTextureSource
         path: "/Textures/Parallaxes/Asteroids.png"
-      slowness: 0.998046875
+      slowness: 0.974352
       scale: "1, 1"
   layersLQ:
     - texture:

Resources/Prototypes/Stacks/Sheets/glass.yml

@@ -2,42 +2,42 @@
   parent: BaseSheetStack
   id: Glass
   name: stack-glass
-  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: glass }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-glass }
   spawn: SheetGlass1
 
 - type: stack
   parent: BaseSheetStack
   id: ReinforcedGlass
   name: stack-reinforced-glass
-  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rglass }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-rglass }
   spawn: SheetRGlass1
 
 - type: stack
   parent: BaseSheetStack
   id: PlasmaGlass
   name: stack-plasma-glass
-  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: pglass }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-pglass }
   spawn: SheetPGlass1
 
 - type: stack
   parent: BaseSheetStack
   id: ReinforcedPlasmaGlass
   name: stack-reinforced-plasma-glass
-  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rpglass }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-prglass }
   spawn: SheetRPGlass1
 
 - type: stack
   parent: BaseSheetStack
   id: UraniumGlass
   name: stack-uranium-glass
-  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: uglass }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-uglass }
   spawn: SheetUGlass1
 
 - type: stack
   parent: BaseSheetStack
   id: ReinforcedUraniumGlass
   name: stack-reinforced-uranium-glass
-  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: ruglass }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-urglass }
   spawn: SheetRUGlass1
 
 - type: stack

Resources/Prototypes/Stacks/Sheets/metal.yml

@@ -2,14 +2,14 @@
   parent: BaseSheetStack
   id: Steel
   name: stack-steel
-  icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: steel }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-metal }
   spawn: SheetSteel1
 
 - type: stack
   parent: BaseSheetStack
   id: Plasteel
   name: stack-plasteel
-  icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plasteel }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-plasteel }
   spawn: SheetPlasteel1
 
 - type: stack

Resources/Prototypes/Stacks/Sheets/other.yml

@@ -2,19 +2,19 @@
   parent: BaseSheetStack
   id: Plasma
   name: stack-plasma
-  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plasma }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-plasma }
   spawn: SheetPlasma1
 
 - type: stack
   parent: BaseSheetStack
   id: Plastic
   name: stack-plastic
-  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plastic }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-plastic }
   spawn: SheetPlastic1
 
 - type: stack
   parent: BaseSheetStack
   id: Uranium
   name: stack-uranium
-  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: uranium }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-uranium }
   spawn: SheetUranium1

Resources/Prototypes/Stacks/currency.yml

@@ -1,7 +1,7 @@
 - type: stack
   id: Telecrystal
   name: stack-telecrystal
-  icon: { sprite: /Textures/Objects/Specific/Syndicate/telecrystal.rsi, state: telecrystal }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: telecrystal }
   spawn: Telecrystal1
 
 - type: stack

Resources/Prototypes/Stacks/ore_refined.yml

@@ -4,14 +4,14 @@
   parent: BaseMediumStack
   id: Diamond
   name: stack-diamond
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-diamond }
   spawn: MaterialDiamond1
 
 - type: stack
   parent: BaseSmallStack
   id: Bananium
   name: stack-bananium
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-bananium }
   spawn: MaterialBananium1
 
 # Ingots
@@ -19,12 +19,12 @@
   parent: BaseMediumStack
   id: Gold
   name: stack-gold
-  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
+  icon: { sprite: "/Textures/_TBD/Objects/stack_objects.rsi", state: sheet-gold }
   spawn: IngotGold1
 
 - type: stack
   parent: BaseMediumStack
   id: Silver
   name: stack-silver
-  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
+  icon: { sprite: "/Textures/_TBD/Objects/stack_objects.rsi", state: sheet-silver }
   spawn: IngotSilver1

Resources/Prototypes/Stacks/organic.yml

@@ -11,7 +11,7 @@
   parent: BaseMediumStack
   id: WoodPlank
   name: stack-wood-plank
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
+  icon: { sprite: /Textures/_TBD/Objects/stack_objects.rsi, state: sheet-wood }
   spawn: MaterialWoodPlank1
 
 - type: stack

Resources/Prototypes/Tiles/floors.yml

@@ -663,7 +663,7 @@
 - type: tile
   id: FloorSteelDirty
   name: tiles-dirty-steel-floor
-  sprite: /Textures/Tiles/steel_dirty.png
+  sprite: /Textures/_TBD/Tiles/steel_dirty.png
   variants: 4
   placementVariants:
   - 1.0

Resources/Textures/_TBD/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+        "name": "icon-open"
+    }
+  ]
+}

Resources/Textures/_TBD/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json

@@ -0,0 +1,61 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon",
+      "delays": [
+        [
+          1,
+          0.1,
+          0.2,
+          0.1,
+          0.1,
+          0.1,
+          0.2,
+          0.1,
+          0.1,
+          0.2,
+          0.1,
+          0.1,
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "icon-open",
+      "delays": [
+        [
+          1,
+          0.1,
+          0.2,
+          0.1,
+          0.1,
+          0.1,
+          0.2,
+          0.1,
+          0.1,
+          0.2,
+          0.1,
+          0.1,
+          0.2,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/_TBD/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+        "name": "icon-open"
+    }
+  ]
+}

Resources/Textures/_TBD/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+        "name": "icon-open"
+    }
+  ]
+}

Resources/Textures/_TBD/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+        "name": "icon"
+    },
+    {
+        "name": "icon-open"
+    }
+  ]
+}

Resources/Textures/_TBD/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by TheShuEd(github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/_TBD/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+        "name": "icon-open"
+    }
+  ]
+}

Resources/Textures/_TBD/Objects/stack_objects.rsi/meta.json

@@ -0,0 +1,242 @@
+{
+  "version": 1,
+  "license": null,
+  "copyright": null,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "sheet-metal_1"
+    },
+    {
+      "name": "sheet-metal_2"
+    },
+    {
+      "name": "sheet-metal_3"
+    },
+    {
+      "name": "sheet-plasteel_1"
+    },
+    {
+      "name": "sheet-plasteel_2"
+    },
+    {
+      "name": "sheet-plasteel_3"
+    },
+    {
+      "name": "sheet-gold_1"
+    },
+    {
+      "name": "sheet-gold_2"
+    },
+    {
+      "name": "sheet-gold_3"
+    },
+    {
+      "name": "sheet-uranium_1"
+    },
+    {
+      "name": "sheet-uranium_2"
+    },
+    {
+      "name": "sheet-uranium_3"
+    },
+    {
+      "name": "sheet-silver_1"
+    },
+    {
+      "name": "sheet-silver_2"
+    },
+    {
+      "name": "sheet-silver_3"
+    },
+    {
+      "name": "sheet-bananium_1"
+    },
+    {
+      "name": "sheet-bananium_2"
+    },
+    {
+      "name": "sheet-bananium_3"
+    },
+    {
+      "name": "sheet-glass_1"
+    },
+    {
+      "name": "sheet-glass_2"
+    },
+    {
+      "name": "sheet-glass_3"
+    },
+    {
+      "name": "sheet-rglass_1"
+    },
+    {
+      "name": "sheet-rglass_2"
+    },
+    {
+      "name": "sheet-rglass_3"
+    },
+    {
+      "name": "sheet-pglass_1"
+    },
+    {
+      "name": "sheet-pglass_2"
+    },
+    {
+      "name": "sheet-pglass_3"
+    },
+    {
+      "name": "sheet-prglass_1"
+    },
+    {
+      "name": "sheet-prglass_2"
+    },
+    {
+      "name": "sheet-prglass_3"
+    },
+    {
+      "name": "sheet-plastic_1"
+    },
+    {
+      "name": "sheet-plastic_2"
+    },
+    {
+      "name": "sheet-plastic_3"
+    },
+    {
+      "name": "sheet-paper_1"
+    },
+    {
+      "name": "sheet-paper_2"
+    },
+    {
+      "name": "sheet-paper_3"
+    },
+    {
+      "name": "sheet-diamond_1"
+    },
+    {
+      "name": "sheet-diamond_2"
+    },
+    {
+      "name": "sheet-diamond_3"
+    },
+    {
+      "name": "bluespace_crystal_1"
+    },
+    {
+      "name": "polycrystal"
+    },
+    {
+      "name": "telecrystal_1"
+    },
+    {
+      "name": "telecrystal_2"
+    },
+    {
+      "name": "telecrystal_3"
+    },
+    {
+      "name": "sheet-plasma_1"
+    },
+    {
+      "name": "sheet-plasma_2"
+    },
+    {
+      "name": "sheet-plasma_3"
+    },
+    {
+      "name": "rods"
+    },
+    {
+      "name": "rods_1"
+    },
+    {
+      "name": "rods_2"
+    },
+    {
+      "name": "rods_3"
+    },
+    {
+      "name": "rods_4"
+    },
+    {
+      "name": "rods_5"
+    },
+    {
+      "name": "sheet-wood_1"
+    },
+    {
+      "name": "sheet-wood_2"
+    },
+    {
+      "name": "sheet-wood_3"
+    },
+    {
+      "name": "sheet-card_1"
+    },
+    {
+      "name": "sheet-card_2"
+    },
+    {
+      "name": "sheet-card_3"
+    },
+    {
+      "name": "sheet-cloth_1"
+    },
+    {
+      "name": "sheet-cloth_2"
+    },
+    {
+      "name": "sheet-cloth_3"
+    },
+    {
+      "name": "bone_1"
+    },
+    {
+      "name": "bone_2"
+    },
+    {
+      "name": "bone_3"
+    },
+    {
+      "name": "sheet-cotton_1"
+    },
+    {
+      "name": "sheet-cotton_2"
+    },
+    {
+      "name": "sheet-cotton_3"
+    },
+    {
+      "name": "sheet-durathread_1"
+    },
+    {
+      "name": "sheet-durathread_2"
+    },
+    {
+      "name": "sheet-durathread_3"
+    },
+    {
+      "name": "sheet-uglass_1"
+    },
+    {
+      "name": "sheet-uglass_2"
+    },
+    {
+      "name": "sheet-uglass_3"
+    },
+    {
+      "name": "sheet-urglass_1"
+    },
+    {
+      "name": "sheet-urglass_2"
+    },
+    {
+      "name": "sheet-urglass_3"
+    }
+  ]
+}