diff --git a/Resources/Prototypes/Entities/Structures/Decoration/floordecor.yml b/Resources/Prototypes/Entities/Structures/Decoration/floordecor.yml
new file mode 100644
index 00000000000..2ed9c186eeb
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Decoration/floordecor.yml
@@ -0,0 +1,720 @@
+- type: entity
+  id: DecorFloorBase
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/cave_decor.rsi
+    netsync: false
+    noRot: true
+    drawdepth: FloorObjects
+  - type: Damageable
+    damageModifierSet: Wood
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+    canCollide: false
+  - type: Clickable
+  - type: InteractionOutline
+# No fixture on this base, inherit from further down for fixture
+
+# Cave Decor
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard1
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_ns-1
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard2
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_ns-2
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard3
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_ns-3
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard4
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_ns-4
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard5
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_ns-5
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard6
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_ns-6
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard7
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_we-1
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard8
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_we-2
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard9
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_we-3
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard10
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_we-4
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard11
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_we-5
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard12
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_drought_we-6
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard13
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_ns-1
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard14
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_ns-2
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard15
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_ns-3
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard16
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_ns-4
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard17
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_ns-5
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard18
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_ns-6
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard19
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_we-1
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard20
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_we-2
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard21
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_we-3
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard22
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_we-4
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard23
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_we-5
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorBoard24
+  name: floor board
+  description: Keep the mud off your feet.
+  components:
+  - type: Sprite
+    state: boards_mammoth_we-6
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorStalagmite1
+  name: stalagmite
+  description: Pointy rocks! Mites go up, tites come...
+  components:
+  - type: Sprite
+    state: stalagmite
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+            radius: 0.20
+        density: 1000
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+
+- type: entity
+  parent: DecorStalagmite1
+  id: DecorStalagmite2
+  components:
+  - type: Sprite
+    state: stalagmite1
+
+- type: entity
+  parent: DecorStalagmite1
+  id: DecorStalagmite3
+  components:
+  - type: Sprite
+    state: stalagmite2
+
+- type: entity
+  parent: DecorStalagmite1
+  id: DecorStalagmite4
+  components:
+  - type: Sprite
+    state: stalagmite3
+
+- type: entity
+  parent: DecorStalagmite1
+  id: DecorStalagmite5
+  components:
+  - type: Sprite
+    state: stalagmite4
+
+- type: entity
+  parent: DecorStalagmite1
+  id: DecorStalagmite6
+  components:
+  - type: Sprite
+    state: stalagmite5
+
+- type: entity
+  parent: DecorStalagmite1
+  id: DecorMinecart
+  name: minecrart
+  description: It seems to have fallen over...
+  components:
+  - type: Sprite
+    state: minecart_fallen
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorSignLeftMine
+  name: sign
+  description: A sign, for a mine, pointing li...left
+  components:
+  - type: Sprite
+    state: sign_left
+
+- type: entity
+  parent: DecorFloorBase
+  id: DecorSignRightMine
+  name: sign
+  description: A sign, pointing right.
+  components:
+  - type: Sprite
+    state: sign_right
+
+# World Decor
+- type: entity
+  parent: DecorFloorBase
+  id: DecorFloorWorldBase
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/world.rsi
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorPaper
+  name: scattered paper
+  description: A mess of papers
+  suffix: 8 states
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/world.rsi
+    state: scattered_papers
+    # add destruction drop for materials
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorPaper1
+  suffix: 4 states
+  name: scattered paper
+  description: A mess of papers
+  components:
+  - type: Sprite
+    state: papers_1
+
+- type: entity
+  parent: DecorFloorPaper1
+  id: DecorFloorPaper2
+  components:
+  - type: Sprite
+    state: papers_2
+
+- type: entity
+  parent: DecorFloorPaper1
+  id: DecorFloorPaper3
+  components:
+  - type: Sprite
+    state: papers_3
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorScrapwood
+  name: wood scraps
+  description: wood scraps
+  suffix: 6 states
+  components:
+  - type: Sprite
+    state: woodscrap
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorBrickrubble
+  name: brick rubble
+  description: brick rubble
+  suffix: "6 states"
+  components:
+  - type: Sprite
+    state: brickrubble
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorCardboard
+  name: cardboard boxes
+  description: cardboard scrap boxes
+  suffix: "6 states"
+  components:
+  - type: Sprite
+    state: cardboard
+    # add destruction drop for materials
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorPallet
+  name: pallet
+  description: a wooden pallet.
+  suffix: "2 states"
+  components:
+  - type: Sprite
+    state: pallet
+        # add destruction drop for materials
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorPalletStack
+  name: pallet stack
+  description: a stack of wooden pallets
+  suffix: "2 states"
+  components:
+  - type: Sprite
+    state: pallet_stack
+        # add destruction drop for materials
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+            radius: 0.20
+        density: 1000
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+
+- type: entity
+  parent: DecorFloorPalletStack
+  id: DecorFloorBrickStack
+  name: brick stack
+  description: a neat stack of bricks
+  components:
+  - type: Sprite
+    state: brickpile
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorBookstack1
+  name: book stack
+  description: a stack of books
+  components:
+  - type: Sprite
+    state: bookstack_1
+        # add destruction drop for materials
+
+- type: entity
+  parent: DecorFloorBookstack1
+  id: DecorFloorBookstack2
+  components:
+  - type: Sprite
+    state: bookstack_2
+
+- type: entity
+  parent: DecorFloorBookstack1
+  id: DecorFloorBookstack3
+  components:
+  - type: Sprite
+    state: bookstack_3
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorBookPile1
+  name: book pile
+  description: a pile of books
+  components:
+  - type: Sprite
+    state: bookpile_1
+        # add destruction drop for materials
+
+- type: entity
+  parent: DecorFloorBookPile1
+  id: DecorFloorBookPile2
+  components:
+  - type: Sprite
+    state: bookpile_2
+
+- type: entity
+  parent: DecorFloorBookPile1
+  id: DecorFloorBookPile3
+  components:
+  - type: Sprite
+    state: bookpile_3
+
+- type: entity
+  parent: DecorFloorBookPile1
+  id: DecorFloorBookPile4
+  components:
+  - type: Sprite
+    state: bookpile_4
+
+- type: entity
+  parent: DecorFloorBookPile1
+  id: DecorFloorBookPile5
+  components:
+  - type: Sprite
+    state: bookpile_5
+
+- type: entity
+  parent: DecorFloorBookPile1
+  id: DecorFloorBookPile6
+  components:
+  - type: Sprite
+    state: bookpile_6
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorFood1
+  name: food stuff
+  description: some old food stuff
+  components:
+  - type: Sprite
+    state: foodstuff_1
+
+- type: entity
+  parent: DecorFloorFood1
+  id: DecorFloorFood2
+  components:
+  - type: Sprite
+    state: foodstuff_2
+
+- type: entity
+  parent: DecorFloorFood1
+  id: DecorFloorFood3
+  components:
+  - type: Sprite
+    state: foodstuff_3
+
+- type: entity
+  parent: DecorFloorFood1
+  id: DecorFloorFood4
+  components:
+  - type: Sprite
+    state: foodstuff_4
+
+- type: entity
+  parent: DecorFloorFood1
+  id: DecorFloorFood5
+  components:
+  - type: Sprite
+    state: foodstuff_5
+
+- type: entity
+  parent: DecorFloorFood1
+  id: DecorFloorFood6
+  components:
+  - type: Sprite
+    state: foodstuff_6
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorTrashbags1
+  name: trash bags
+  description: some old trash bags
+  components:
+  - type: Sprite
+    state: trashbags_1
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+            radius: 0.20
+        density: 1000
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+
+- type: entity
+  parent: DecorFloorTrashbags1
+  id: DecorFloorTrashbags2
+  components:
+  - type: Sprite
+    state: trashbags_2
+
+- type: entity
+  parent: DecorFloorTrashbags1
+  id: DecorFloorTrashbags3
+  components:
+  - type: Sprite
+    state: trashbags_3
+
+- type: entity
+  parent: DecorFloorTrashbags1
+  id: DecorFloorTrashbags4
+  components:
+  - type: Sprite
+    state: trashbags_4
+
+- type: entity
+  parent: DecorFloorTrashbags1
+  id: DecorFloorTrashbags5
+  components:
+  - type: Sprite
+    state: trashbags_5
+
+- type: entity
+  parent: DecorFloorTrashbags1
+  id: DecorFloorTrashbags6
+  components:
+  - type: Sprite
+    state: trashbags_6
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorGlass1
+  name: glass bottles
+  description: some old glass scraps
+  components:
+  - type: Sprite
+    state: glass_1
+    # add glass shard destruction
+
+- type: entity
+  parent: DecorFloorGlass1
+  id: DecorFloorGlass2
+  components:
+  - type: Sprite
+    state: glass_2
+
+- type: entity
+  parent: DecorFloorGlass1
+  id: DecorFloorGlass3
+  components:
+  - type: Sprite
+    state: glass_3
+
+- type: entity
+  parent: DecorFloorGlass1
+  id: DecorFloorGlass4
+  components:
+  - type: Sprite
+    state: glass_4
+
+- type: entity
+  parent: DecorFloorGlass1
+  id: DecorFloorGlass5
+  components:
+  - type: Sprite
+    state: glass_5
+
+- type: entity
+  parent: DecorFloorGlass1
+  id: DecorFloorGlass6
+  components:
+  - type: Sprite
+    state: glass_6
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorSignMines
+  name: mines
+  description: danger of mines and death...
+  components:
+  - type: Sprite
+    state: mine_sign
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorFloorSkeleton
+  name: skeleton
+  description: looks a little worse for wear
+  components:
+  - type: Sprite
+    state: skeleton
+
+- type: entity
+  parent: DecorFloorWorldBase
+  id: DecorBarrels
+  name: barrels
+  description: a bunch of old rusty barrels.
+  components:
+  - type: Sprite
+    layers:
+    - state: barrels1
+      map: [ "body" ]
+  - type: RandomSprite
+    available:
+      - body:
+          barrels1: ""
+          barrels2: ""
+          barrels3: ""
+          barrels4: ""
+          barrels5: ""
+          barrels6: ""
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+            radius: 0.3
+        density: 1000
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+
+- type: entity
+  parent: DecorFloorSkeleton
+  id: DecorFloorSkeletonOver
+  suffix: draws over objects
+  components:
+  - type: Sprite
+    drawdepth: Mobs
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/rails.yml b/Resources/Prototypes/Entities/Structures/Decoration/rails.yml
new file mode 100644
index 00000000000..a41b474622a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Decoration/rails.yml
@@ -0,0 +1,95 @@
+- type: entity
+  id: Rails
+  name: railway
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/rails64.rsi
+    state: rails
+    netsync: false
+    drawdepth: FloorObjects
+  - type: Damageable
+    damageModifierSet: Wood
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+    canCollide: false
+  - type: Clickable
+
+- type: entity
+  parent: Rails
+  id: RailsJunctionRightTop
+  suffix: junction right top
+  components:
+  - type: Sprite
+    state: junction-right-top
+
+- type: entity
+  parent: Rails
+  id: RailsJunctionLeftTop
+  suffix: junction left top
+  components:
+  - type: Sprite
+    state: junction-left-top
+
+- type: entity
+  parent: Rails
+  id: RailsJunctionRightBottom
+  suffix: junction right bottom
+  components:
+  - type: Sprite
+    state: junction-right-bottom
+
+- type: entity
+  parent: Rails
+  id: RailsJunctionLeftBottom
+  suffix: junction left bottom
+  components:
+  - type: Sprite
+    state: junction-left-bottom
+
+- type: entity
+  parent: Rails
+  id: RailsTurnWS
+  suffix: turn west-south
+  components:
+  - type: Sprite
+    state: turn-WS
+
+- type: entity
+  parent: Rails
+  id: RailsTurnNW
+  suffix: turn north-west
+  components:
+  - type: Sprite
+    state: turn-NW
+
+- type: entity
+  parent: Rails
+  id: RailsTurnNE
+  suffix: turn north-east
+  components:
+  - type: Sprite
+    state: turn-NE
+
+- type: entity
+  parent: Rails
+  id: RailsTurnSE
+  suffix: turn south-east
+  components:
+  - type: Sprite
+    state: turn-SE
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/torches.yml b/Resources/Prototypes/Entities/Structures/Decoration/torches.yml
new file mode 100644
index 00000000000..1646ec9f707
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Decoration/torches.yml
@@ -0,0 +1,73 @@
+- type: entity
+  id: Torch2
+  name: torch
+  suffix: floor
+  description: A flaming torch for lighting an area.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+    canCollide: false
+  - type: Sprite
+    netsync: false
+    noRot: true
+    sprite: Structures/Decoration/torches.rsi
+    state: torch_unlit
+  - type: Appearance
+  - type: Reactive
+    groups:
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+  - type: ExtinguishOnInteract
+    extinguishAttemptSound:
+      path: /Audio/Items/candle_blowing.ogg
+      params:
+        variation: 0.05
+        volume: 10
+  - type: UseDelay
+  - type: Flammable
+    fireSpread: false
+    canResistFire: false
+    alwaysCombustible: true
+    canExtinguish: true
+    firestacksOnIgnite: 3.0
+    firestackFade: -0.01
+    damage:
+      types:
+        Heat: 0.1
+  - type: FireVisuals
+    sprite: Structures/Decoration/torches.rsi
+    normalState: torch_lit
+  - type: Damageable
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: ToggleableLightVisuals
+    spriteLayer: null
+  - type: PointLight
+    color: "#e39c40"
+    radius: 5
+    power: 16
+
+- type: entity
+  parent: Torch2
+  id: TorchWall
+  suffix: wall
+  components:
+  - type: Sprite
+    noRot: false
+    state: wall_torch_unlit
+  - type: FireVisuals
+    sprite: Structures/Decoration/torches.rsi
+    normalState: wall_torch_lit
diff --git a/Resources/Prototypes/Entities/Structures/Storage/barrels.yml b/Resources/Prototypes/Entities/Structures/Storage/barrels.yml
new file mode 100644
index 00000000000..0cbbb2ede8b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/barrels.yml
@@ -0,0 +1,287 @@
+# Barrels
+# Base
+- type: entity
+  parent: BaseStructureDynamic
+  id: BaseBarrel
+  name: barrel
+  description: This barrel looks like it could contain something.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: blue-closed
+    netsync: false
+    noRot: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+            bounds: "-0.2,-0.2,0.2,0.45"
+        density: 50
+        mask:
+        - MachineMask
+        layer:
+        - WallLayer
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 5
+      behaviors:
+      - !type:SolutionExplosionBehavior
+        solution: barrel
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Piercing
+        damage: 5
+      behaviors:
+      - !type:SolutionExplosionBehavior
+        solution: barrel
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:SpillBehavior
+        solution: barrel
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
+# Base Open
+- type: entity
+  parent: BaseBarrel
+  id: BaseBarrelOpen
+  suffix: open
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      barrel:
+        maxVol: 500
+  - type: DrainableSolution
+    solution: barrel
+  - type: ReagentTank
+
+# Closed
+- type: entity
+  parent: BaseBarrel
+  id: BlackBarrel
+  name: black barrel
+  description: A worn out black barrel. The label is torn off.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: black-closed
+
+- type: entity
+  parent: BaseBarrel
+  id: BlueBarrel
+  name: blue barrel
+  description: A blue barrel with a warning sign of. Maybe it contains water?
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: blue-closed
+
+- type: entity
+  parent: BaseBarrel
+  id: RedBarrel
+  name: red barrel
+  description: A red barrel with an explosive warning sign on. Better be careful.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: red-closed
+  - type: Explosive
+    explosionType: Default
+    totalIntensity: 120 # ~ 5 tile radius
+
+- type: entity
+  parent: BaseBarrel
+  id: YellowBarrel
+  name: yellow barrel
+  description: A yellow barrel with a radiation warning sign on. Better be careful.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: yellow-closed
+  - type: RadiationSource
+    intensity: 2
+    slope: 1
+
+# Open
+- type: entity
+  parent: BaseBarrelOpen
+  id: BlackBarrelOpen
+  suffix: open
+  name: black barrel
+  description: A worn out black barrel. The label is torn off. The lid is off and you can see inside.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: black-open
+
+- type: entity
+  parent: BaseBarrelOpen
+  id: BlueBarrelOpen
+  suffix: open
+  name: blue barrel
+  description: A blue barrel with a warning sign of. The lid is off and you can see inside.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: blue-open
+
+- type: entity
+  parent: BaseBarrelOpen
+  id: RedBarrelOpen
+  suffix: open
+  name: red barrel
+  description: A red barrel with an explosive warning sign on. The lid is off and you can see inside.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: red-open
+
+- type: entity
+  parent: BaseBarrelOpen
+  id: YellowBarrelOpen
+  suffix: open
+  name: yellow barrel
+  description: A yellow barrel with a radiation warning sign on. The lid is off and you can see inside but it still makes you twitch.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: yellow-open
+  - type: RadiationSource
+    intensity: 1
+    slope: 1
+
+# Full barrels
+- type: entity
+  parent: BlackBarrelOpen
+  id: BlackBarrelFull
+  suffix: full
+  description: A worn out black barrel. This one looks full of some dark liquid.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: black-full
+    # TODO - fill with some sort of waste product? Maybe just dirty water.
+
+- type: entity
+  parent: RedBarrelOpen
+  id: RedBarrelFull
+  suffix: full
+  description: A red barrel with an explosive warning sign on. It has a golden liquid inside.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: red-full
+  - type: SolutionContainerManager
+    solutions:
+      barrel:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 500
+  - type: DamageOnToolInteract
+    tools:
+    - Welding
+    weldingDamage:
+      types:
+        Heat: 10
+  - type: Explosive
+    explosionType: Default
+    totalIntensity: 120 # ~ 5 tile radius
+
+- type: entity
+  parent: YellowBarrelOpen
+  id: YellowBarrelFull
+  suffix: full
+  description: A yellow barrel with a radiation warning sign on. You can see the glowing goo bubble.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/barrels.rsi
+    state: yellow-full
+  - type: RadiationSource
+    intensity: 3
+    slope: 1
+  - type: PointLight
+    netsync: false
+    radius: 1.5
+    energy: 1.6
+    color: "#3db83b"
+    castShadows: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1000
+      behaviors:
+      - !type:SpillBehavior
+        solution: barrel
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+    # TODO - fill with some sort of radioactive waste reagent.
+
+# Burning Barrels
+- type: entity
+  parent: BaseStructureDynamic
+  id: BurningBarrel
+  name: burnt barrel
+  description: This barrel looks like it once contained a fire.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/burningbarrel.rsi
+    state: burnbarrel
+    netsync: false
+    noRot: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+            radius: 0.2
+        density: 50
+        mask:
+        - MachineMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+
+- type: entity
+  parent: BurningBarrel
+  id: BurningBarrelLit
+  name: burning barrel
+  description: This barrel is smoldering. Toasty
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/burningbarrel.rsi
+    state: burnbarrel_lit
+    netsync: false
+  - type: PointLight
+    color: "#E25822"
+    radius: 1.0
+    energy: 5.0
+    netsync: false
+  - type: LightBehaviour
+    behaviours:
+      - !type:RandomizeBehaviour # immediately make it bright and flickery
+        id: burnbarrel_lit
+        interpolate: Nearest
+        minDuration: 0.02
+        maxDuration: 0.06
+        startValue: 6.0
+        endValue: 9.0
+        property: Energy
+        isLooped: true
diff --git a/Resources/Prototypes/Entities/Structures/Storage/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/closets.yml
new file mode 100644
index 00000000000..394840caf48
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/closets.yml
@@ -0,0 +1,228 @@
+# TODO:RESET:TIMEDSTORAGEFILL
+
+# Metal Closets
+- type: entity
+  parent: ClosetBase
+  id: ClosetBase2
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Closets/closet.rsi
+    layers:
+    - state: closet
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closet_door
+      map: ["enum.StorageVisualLayers.Door"]
+  - type: EntityStorageVisuals
+    stateBaseClosed: closet
+    stateDoorOpen: closet_open
+    stateDoorClosed: closet_door
+  - type: Transform
+    anchored: true
+    noRot: true
+  - type: Physics
+    bodyType: Static
+  - type: Anchorable # Makes the anchoring near impossible due to high time requirement
+    delay: 3600
+
+- type: entity
+  parent: ClosetBase2
+  id: ClosetBaseW
+  name: closet
+  description: A basic closet for storing things.
+  components:
+  - type: Weldable
+  - type: Sprite
+    noRot: true
+    netsync: false
+    sprite: Structures/Storage/Closets/closet.rsi
+    layers:
+    - state: closet
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closet_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+  - type: EntityStorageVisuals
+    stateBaseClosed: closet
+    stateDoorOpen: closet_open
+    stateDoorClosed: closet_door
+
+
+- type: entity
+  parent: ClosetBaseW
+  id: ClosetGrey1
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Closets/closetgrey.rsi
+  - type: Weldable
+
+- type: entity
+  id: ClosetGrey2
+  parent: ClosetBaseW
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Closets/closetgrey2.rsi
+
+- type: entity
+  parent: ClosetBaseW
+  id: ClosetRusty
+  name: rusty closet
+  description: A rusty old closet for storing things.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Closets/closetold.rsi
+
+- type: entity
+  parent: ClosetBaseW
+  id: ClosetGunCabinet
+  name: gun cabinet
+  description: A secure cabinet for storing guns.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Closets/guncabinet.rsi
+
+- type: entity
+  parent: ClosetBaseW
+  id: ClosetFridgeDirty
+  name: fridge
+  description: A dirty old fridge for keeping food fresh
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Closets/fridgedirty.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.90
+  - type: AntiRottingContainer
+
+- type: entity
+  parent: ClosetBaseW
+  id: ClosetFridgeWideDirty
+  name: fridge
+  description: A dirty old fridge for keeping food fresh
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Closets/fridgewidedirty.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.90
+  - type: AntiRottingContainer
+
+- type: entity
+  parent: ClosetBaseW
+  id: ClosetDouble
+  name: double closet
+  description: A double closet for holding twice the things.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Closets/doublecloset.rsi
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+            bounds: "-0.15,-0.45,0.45,0.45"
+        density: 145
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+
+# Wooden Closets
+
+- type: entity
+  parent: ClosetBase2
+  id: ClosetCabinetWood
+  name: cabinet
+  description: An old pre-war wooden cabinet.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Closets/cabinet.rsi
+  - type: Damageable
+    damageModifierSet: Wood
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 30
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 0
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Wooden
+
+- type: entity
+  parent: ClosetBaseW
+  id: ClosetGeneric
+  suffix: generic roller
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Closets/closetgeneric.rsi
+
+# Wallmounted Closets
+- type: entity
+  id: ClosetWallMedicabinet
+  placement:
+    mode: SnapgridCenter
+  name: medicabinet
+  description: A medicabinet mounted on the wall.
+  components:
+  - type: InteractionOutline
+  - type: Clickable
+  - type: ResistLocker
+  - type: Weldable
+  - type: WallMount
+    arc: 180
+  - type: Transform
+    noRot: false
+  - type: Sprite
+    drawdepth: WallMountedItems
+    netsync: false
+    noRot: false
+    sprite: Structures/Storage/Closets/medicabinet.rsi
+    layers:
+    - state: closet
+    - state: closet_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+  - type: EntityStorage
+    isCollidableWhenOpen: true
+    enteringOffset: 0, -0.75
+    closeSound:
+      path: /Audio/Items/deconstruct.ogg
+    openSound:
+      path: /Audio/Items/deconstruct.ogg
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+        ents: []
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
diff --git a/Resources/Prototypes/Entities/Structures/Storage/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/crates.yml
new file mode 100644
index 00000000000..e6292912b09
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/crates.yml
@@ -0,0 +1,227 @@
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateFootlocker
+  name: footlocker
+  description: A footlocker for someones equipment.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/footlocker.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/footlocker.rsi
+  - type: Reflect
+    reflects:
+    - Energy
+    reflectProb: 0.2
+    spread: 90
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateAluminium
+  name: aluminium crate
+  description: An aluminium crate for storing stuff.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/aluminiumcrate.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/aluminiumcrate.rsi
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateArmy
+  name: army crate
+  description: A crate with a US Army star on.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/armycrate.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/armycrate.rsi
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateMedical2
+  name: medical crate
+  description: A metal crate for storing medical equipment.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/medicalcrate.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/medicalcrate.rsi
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateRed
+  name: red crate
+  description: A faded red crate for storing stuff.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/redcrate.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/redcrate.rsi
+
+- type: entity
+  parent: CrateGeneric
+  id: Trashbin
+  name: trash bin
+  description: A trash bin for putting rubbish in.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/trashbin.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/trashbin.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+
+- type: entity
+  parent: CrateFootlocker
+  id: CrateTrashcart
+  name: trash cart
+  description: A trash cart for transporting waste.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/trashcart.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/trashcart.rsi
+  - type: TileFrictionModifier
+    modifier: 0.4
+
+- type: entity
+  parent: CrateGeneric
+  id: CrateFreezer2
+  name: freezer
+  description: A freezer for keeping things cool.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/freezer.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/freezer.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+  - type: AntiRottingContainer
+
+# Wooden
+- type: entity
+  parent: CrateGeneric
+  id: CrateWooden
+  name: wooden crate
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/cratewooden.rsi
+    state: icon
+  - type: Sprite
+    sprite: Structures/Storage/Crates/cratewooden.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.29"
+        density: 50
+        mask:
+        - SmallMobMask #this is so they can go under plastic flaps
+        layer:
+        - MachineLayer
+
+- type: entity
+  parent: CrateWooden
+  id: CrateMilitary
+  name: military crate
+  description: An old wooden crate. Looks like it might have some supplies in.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/cratemilitary.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/cratemilitary.rsi
+
+# Breakable Crates (deconstruct or destroy)
+- type: entity
+  parent: BaseStructureDynamic
+  id: CrateBreakBase
+  name: wooden crate
+  description: A wooden crate for storage.
+  abstract: true
+  components:
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 75
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 0
+            max: 1
+      - !type:EmptyAllContainersBehaviour
+  - type: Sprite
+    sprite: Structures/Storage/Crates/woodencrates.rsi
+  - type: Storage
+    grid:
+    - 0,0,6,3
+    maxItemSize: Huge
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+
+- type: entity
+  parent: CrateBreakBase
+  id: CrateBreakWood
+  suffix: wood
+  components:
+  - type: Sprite
+    state: wood_crate
+
+- type: entity
+  parent: CrateBreakBase
+  id: CrateBreakPlain
+  suffix: plain
+  components:
+  - type: Sprite
+    state: plain_crate
+
+- type: entity
+  parent: CrateBreakBase
+  id: CrateBreakPlainDamaged
+  suffix: plain damaged
+  components:
+  - type: Sprite
+    state: plain_crate-1 # TODO: Make this random between states -1, -2 and -3
+
+- type: entity
+  parent: CrateBreakBase
+  id: CrateBreakArmy
+  name: army crate
+  components:
+  - type: Sprite
+    state: army_crate
+
+- type: entity
+  parent: CrateBreakArmy
+  id: CrateBreakArmyDamaged
+  suffix: damaged
+  components:
+  - type: Sprite
+    state: army_crate-1 # TODO: Make this random between states -1 and -2
diff --git a/Resources/Prototypes/Entities/Structures/Storage/furniture.yml b/Resources/Prototypes/Entities/Structures/Storage/furniture.yml
new file mode 100644
index 00000000000..6ea2a5e5649
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/furniture.yml
@@ -0,0 +1,49 @@
+# Washing Machines
+- type: entity
+  parent: ClosetBase
+  id: FurnitureWashingmachine
+  name: washing machine
+  description: wishy washy.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Furniture/washingmachine.rsi
+    layers:
+    - state: generic
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: generic_door
+      map: ["enum.StorageVisualLayers.Door"]
+  - type: EntityStorageVisuals
+    stateBaseClosed: generic
+    stateDoorOpen: generic_open
+    stateDoorClosed: generic_door
+  - type: Transform
+    anchored: true
+    noRot: false
+  - type: Physics
+    bodyType: Static
+
+- type: entity
+  parent: FurnitureWashingmachine
+  id: FurnitureWashingmachineIndustrial
+  suffix: Industrial
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Furniture/washingmachine_industrial.rsi
+
+# Safes
+- type: entity
+  parent: ClosetBaseW
+  id: ClosetSafe
+  name: safe
+  description: Might be filled with valuables.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Furniture/safe.rsi
+
+- type: entity
+  parent: ClosetSafe
+  id: ClosetSafeSpinner
+  suffix: spinner
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Furniture/safespinner.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Storage/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/tanks.yml
new file mode 100644
index 00000000000..41038fb74d1
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/tanks.yml
@@ -0,0 +1,182 @@
+# :TODO: Add the destroyed versions of these as a destruction spawn.
+
+- type: entity
+  parent: BaseStructure
+  id: StorageTankBase
+  name: storage tank
+  description: A liquids storage tank.
+  abstract: true
+  components:
+  - type: Sprite
+    noRot: true
+  - type: InteractionOutline
+  - type: Physics
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 5
+      behaviors:
+      - !type:SolutionExplosionBehavior
+        solution: tank
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Piercing
+        damage: 5
+      behaviors:
+      - !type:SolutionExplosionBehavior
+        solution: tank
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:SpillBehavior
+        solution: tank
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        maxVol: 1500
+  - type: DrainableSolution
+    solution: tank
+  - type: ReagentTank
+  - type: Transform
+    noRot: true
+
+# In use
+- type: entity
+  id: StorageTankWide
+  parent: StorageTankBase
+  name: fuel tank
+  description: A fuel tank. It's used to store high amounts of fuel.
+  suffix: Empty
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/tanksx64.rsi
+    layers:
+      - state: chemical_container
+      # - state: chemical_container
+        # map: ["enum.SolutionContainerLayers.Fill"]
+        # visible: false
+  - type: Appearance
+  # - type: SolutionContainerVisuals
+    # maxFillLevels: 3
+    # fillBaseName: fueltank-2-
+  - type: ExaminableSolution
+    solution: tank
+  - type: ReagentTank
+    tankType: Fuel
+  - type: DamageOnToolInteract
+    tools:
+    - Welding
+    weldingDamage:
+      types:
+        Heat: 10
+  - type: PacifismDangerousAttack
+  - type: Explosive
+    explosionType: Default
+    totalIntensity: 120 # ~ 5 tile radius
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.9,-0.5,0.9,0.2"
+        density: 155
+        mask:
+        - MachineMask
+        layer:
+        - WallLayer
+
+- type: entity
+  parent: StorageTankWide
+  id: StorageTankWideFullFuel
+  suffix: Full
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 2000
+
+
+- type: entity
+  parent: StorageTankWide
+  id: StorageTank2
+  suffix: Empty
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/tanksx64.rsi
+    layers:
+      - state: largetank_chemical
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.9,-0.7,-0.1,0.4"
+        density: 155
+        mask:
+        - MachineMask
+        layer:
+        - WallLayer
+
+- type: entity
+  id: StorageTankFullFuel
+  parent: StorageTank2
+  suffix: Full
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 1500
+
+- type: entity
+  id: StorageTankHuge
+  parent: StorageTankWide
+  suffix: Empty
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/tanksx64.rsi
+    layers:
+      - state: largetank_chemical_huge
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.7,-0.7,0.2,0.6"
+        density: 155
+        mask:
+        - MachineMask
+        layer:
+        - WallLayer
+
+- type: entity
+  id: StorageTankHugeFullFuel
+  parent: StorageTankHuge
+  suffix: Full
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 2000
diff --git a/Resources/Prototypes/Entities/Structures/Wallmount/adverts.yml b/Resources/Prototypes/Entities/Structures/Wallmount/adverts.yml
new file mode 100644
index 00000000000..53c2cb05f3c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmount/adverts.yml
@@ -0,0 +1,19 @@
+- type: entity
+  parent: BaseSign
+  id: SignBase # for non directional signs otherwise remove snapCardinals: true
+  abstract: true
+  components:
+  - type: WallMount
+    arc: 360
+  - type: Sprite
+    drawdepth: Overdoors
+    sprite: Structures/Wallmounts/signs_32x32.rsi
+    state: bar
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Structures/Wallmount/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Wallmount/base_lighting.yml
new file mode 100644
index 00000000000..bdbce362f42
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmount/base_lighting.yml
@@ -0,0 +1,43 @@
+#Small lights
+- type: entity
+  parent: SmallLight
+  id: LightSmallAlwayson
+  name: small light
+  suffix: Always on
+  description: "An always powered light."
+  components:
+  - type: Sprite
+    sprite: Structures/Wallmounts/lightbulbcaged.rsi
+    state: base
+    drawdepth: Overdoors
+    offset: 0, 1 # 0.75 is better but breaks for east west placement
+  - type: PointLight
+    energy: 1.0
+    radius: 6
+    softness: 1.1
+    enabled: true
+  - type: WallMount
+
+- type: entity
+  parent: PoweredSmallLightEmpty
+  id: LightSmallEmpty
+  name: small light
+  description: "A light fixture. Draws power and produces light when equipped with a light bulb."
+  suffix: Empty
+  components:
+  - type: Sprite
+    sprite: Structures/Wallmounts/lightbulbcaged.rsi
+    state: empty
+    offset: 0, 1
+  - type: WallMount
+
+- type: entity
+  parent: PoweredSmallLight
+  id: LightSmall
+  suffix: ""
+  components:
+  - type: Sprite
+    sprite: Structures/Wallmounts/lightbulbcaged.rsi
+    state: base
+    offset: 0, 1
+  - type: WallMount
diff --git a/Resources/Prototypes/Entities/Structures/Wallmount/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmount/monitors_televisions.yml
new file mode 100644
index 00000000000..6cda440adae
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmount/monitors_televisions.yml
@@ -0,0 +1,54 @@
+- type: entity
+  parent: BaseComputer
+  id: ComputerVDU
+  name: VDU
+  description: A wall mounted video display unit.
+  components:
+  - type: Sprite
+    drawdepth: Overdoors
+    sprite: Structures/Wallmounts/vdu.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: VDU
+      - map: ["computerLayerKeyboard"]
+        state: keyboard
+      - map: ["computerLayerScreen"]
+        state: screen
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.20,-0.10,0.25,0.35"
+        density: 250
+        mask:
+          - FullTileMask
+        layer:
+          - WallLayer
+  - type: WallMount
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors: #excess damage, don't spawn entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Transform
+    anchored: true
+
+# See terminals for more wall mounted versions
diff --git a/Resources/Prototypes/Entities/Structures/Wallmount/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmount/noticeboard.yml
new file mode 100644
index 00000000000..c02f56e249c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmount/noticeboard.yml
@@ -0,0 +1,63 @@
+- type: entity
+  id: NoticeBoard2
+  name: notice board
+  description: Something important to post?
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: WallMount
+  - type: Sprite
+    sprite: Structures/Wallmounts/noticeboard.rsi
+    layers:
+      - state: noticeboard
+      - state: notice-0
+      - map: ["enum.StorageFillLayers.Fill"]
+  - type: StorageFillVisualizer
+    maxFillLevels: 6
+    fillBaseName: notice
+  - type: Appearance
+  - type: InteractionOutline
+  - type: Clickable
+  - type: Transform
+    anchored: true
+  - type: Damageable
+    damageModifierSet: Wood
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 30
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,4,3
+    maxItemSize: Small
+    whitelist:
+      tags:
+        - Folder
+        - Document
+        - Write
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: Tag
+    tags:
+    - Wooden
+  - type: Construction
+    graph: NoticeBoard
+    node: noticeBoard
diff --git a/Resources/Prototypes/Entities/Structures/Wallmount/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmount/signs.yml
new file mode 100644
index 00000000000..b7ea2004a67
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmount/signs.yml
@@ -0,0 +1,154 @@
+# see adverts for sign base
+# see street_furniture for floor signs
+
+# 32x32
+- type: entity
+  parent: SignBase
+  id: SignBar2
+  name: bar sign
+  description: Bar! Get drunk here.
+  components:
+  - type: Sprite
+    sprite: Structures/Wallmounts/signs_32x32.rsi
+    state: bar
+
+- type: entity
+  parent: SignBar2
+  id: SignClinic
+  name: clinic sign
+  description: A clinic sign. Hopefully they have meds.
+  components:
+  - type: Sprite
+    state: clinic
+  - type: PointLight
+    radius: 3
+    energy: 1
+    color: '#00ff00'
+
+- type: entity
+  parent: SignBar2
+  id: SignOpen1
+  name: open sign
+  description: Open for business. Maybe.
+  components:
+  - type: Sprite
+    state: open
+  - type: PointLight
+    radius: 3
+    energy: 1
+    color: '#ff0000'
+
+- type: entity
+  parent: SignOpen1
+  id: SignOpen2
+  components:
+  - type: Sprite
+    state: open_bar
+
+- type: entity
+  parent: SignOpen1
+  id: SignOpenOn1
+  components:
+  - type: Sprite
+    state: open_on
+
+- type: entity
+  parent: SignOpen1
+  id: SignOpenOn2
+  components:
+  - type: Sprite
+    state: open_bar_on
+
+- type: entity
+  parent: SignBase
+  id: SignForRent
+  name: for rent sign
+  description: A sign advertising a place for rent.
+  components:
+  - type: Sprite
+    sprite: Structures/Wallmounts/signs_32x32.rsi
+    state: rent
+
+- type: entity
+  parent: SignBase
+  id: SignNotice
+  name: notice sign
+  description: NOTICE!
+  components:
+  - type: Sprite
+    sprite: Structures/Wallmounts/walldecor.rsi
+    state: notice_sign
+
+- type: entity
+  parent: SignNotice
+  id: SignDanger2
+  name: danger sign
+  description: Danger.
+  components:
+  - type: Sprite
+    state: danger_sign
+
+- type: entity
+  parent: SignNotice
+  id: WallDecorExitsign
+  name: exit sign
+  description: A sign that says EXIT. I wonder what it means.
+  components:
+  - type: Sprite
+    state: exit
+    noRot: true
+
+# 64x32
+- type: entity
+  parent: SignBar2
+  id: SignBazaarOn
+  name: bazaar sign
+  description: A sign for a bazaar. How bizarre.
+  components:
+  - type: Sprite
+    sprite: Structures/Wallmounts/signs_64x32.rsi
+    state: bazaar_on
+  - type: PointLight
+    radius: 2
+    energy: 1
+    color: '#ff8000'
+
+- type: entity
+  parent: SignBazaarOn
+  id: SignHotel
+  name: hotel sign
+  description: A sign for a hotel. Get a room!
+  components:
+  - type: Sprite
+    state: hotel
+
+- type: entity
+  parent: SignBazaarOn
+  id: SignPrivateProperty
+  name: private property sign
+  description: A private property sign.
+  components:
+  - type: Sprite
+    state: private
+
+- type: entity
+  parent: SignBazaarOn
+  id: SignOpenBig
+  name: open sign
+  description: We are open sign. I hope so.
+  components:
+  - type: Sprite
+    state: we_open_open
+  - type: PointLight
+    radius: 2
+    energy: 1
+    color: '#ff0000'
+
+- type: entity
+  parent: SignBazaarOn
+  id: SignWorkersOnly
+  name: workers only sign
+  description: No tresspassing!
+  components:
+  - type: Sprite
+    state: workers
diff --git a/Resources/Prototypes/Entities/Structures/Wallmount/wallmounts.yml b/Resources/Prototypes/Entities/Structures/Wallmount/wallmounts.yml
new file mode 100644
index 00000000000..9946e6b2db5
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmount/wallmounts.yml
@@ -0,0 +1,45 @@
+# For wallmount things that don't fit in any other file.
+
+# Safes
+
+# Vents
+- type: entity
+  parent: BaseSign
+  id: WallmountVent
+  name: vent
+  description: An airvent. Could be a good stash.
+  components:
+  - type: WallMount
+    arc: 360
+  - type: Sprite
+    drawdepth: Overdoors
+    sprite: Structures/Storage/storage.rsi
+    state: vent
+  - type: SecretStash
+    secretPartName: secret-stash-part-vent
+    maxItemSize: Normal
+  - type: ContainerContainer
+    containers:
+      stash: !type:ContainerSlot {}
+  - type: PottedPlantHide # TODO: This needs changed to be generic stash hide?
+
+- type: entity
+  parent: WallmountVent
+  id: WallmountVentDamaged
+  suffix: damaged
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/storage.rsi
+    state: vent-damaged
+
+- type: entity
+  parent: WallmountVent
+  id: WallmountVentOpen
+  suffix: open
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/storage.rsi
+    state: vent-open
+
+
+# First Aid
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/.png b/Resources/Textures/Structures/Decoration/barrels.rsi/.png
new file mode 100644
index 00000000000..d035f711348
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/double_grey_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/double_grey_1.png
new file mode 100644
index 00000000000..9ef80fe7193
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/double_grey_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/double_grey_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/double_grey_2.png
new file mode 100644
index 00000000000..dbeaea2709e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/double_grey_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/double_red_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/double_red_1.png
new file mode 100644
index 00000000000..b9a9973b956
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/double_red_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/double_red_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/double_red_2.png
new file mode 100644
index 00000000000..3271703d5c5
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/double_red_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/double_toxic_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/double_toxic_1.png
new file mode 100644
index 00000000000..b8c450f4e74
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/double_toxic_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/double_waste_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/double_waste_1.png
new file mode 100644
index 00000000000..ac2f37c5581
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/double_waste_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/double_waste_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/double_waste_2.png
new file mode 100644
index 00000000000..5feb377a9be
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/double_waste_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/double_yellow_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/double_yellow_1.png
new file mode 100644
index 00000000000..541ea0fe2fa
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/double_yellow_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/double_yellow_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/double_yellow_2.png
new file mode 100644
index 00000000000..7c4cbc32af6
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/double_yellow_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/flammable_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/flammable_1.png
new file mode 100644
index 00000000000..611825a8ea8
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/flammable_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/flammable_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/flammable_2.png
new file mode 100644
index 00000000000..91a37aa9e32
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/flammable_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/flammable_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/flammable_3.png
new file mode 100644
index 00000000000..fb6c2378a45
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/flammable_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/grey_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/grey_1.png
new file mode 100644
index 00000000000..9b31672d30e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/grey_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/grey_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/grey_2.png
new file mode 100644
index 00000000000..d361fe16d9e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/grey_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/grey_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/grey_3.png
new file mode 100644
index 00000000000..3fcbd116538
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/grey_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/hazard_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/hazard_1.png
new file mode 100644
index 00000000000..31ff5dfa903
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/hazard_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/hazard_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/hazard_2.png
new file mode 100644
index 00000000000..292232c6ee6
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/hazard_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/hazard_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/hazard_3.png
new file mode 100644
index 00000000000..b93a353892a
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/hazard_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/label_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/label_1.png
new file mode 100644
index 00000000000..33a1a76025f
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/label_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/label_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/label_2.png
new file mode 100644
index 00000000000..c81974e8f15
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/label_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/label_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/label_3.png
new file mode 100644
index 00000000000..23559f19289
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/label_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/meta.json b/Resources/Textures/Structures/Decoration/barrels.rsi/meta.json
new file mode 100644
index 00000000000..91a7049c538
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/barrels.rsi/meta.json
@@ -0,0 +1,191 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Created by INFRARED_BARON for MS13",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": ""
+    },
+    {
+      "name": "grey_1"
+    },
+    {
+      "name": "grey_2"
+    },
+    {
+      "name": "grey_3"
+    },
+    {
+      "name": "red_1"
+    },
+    {
+      "name": "red_2"
+    },
+    {
+      "name": "red_3"
+    },
+    {
+      "name": "yellow_1"
+    },
+    {
+      "name": "yellow_2"
+    },
+    {
+      "name": "yellow_3"
+    },
+    {
+      "name": "label_1"
+    },
+    {
+      "name": "label_2"
+    },
+    {
+      "name": "label_3"
+    },
+    {
+      "name": "hazard_1"
+    },
+    {
+      "name": "hazard_2"
+    },
+    {
+      "name": "hazard_3"
+    },
+    {
+      "name": "red_alt_1"
+    },
+    {
+      "name": "red_alt_2"
+    },
+    {
+      "name": "red_alt_3"
+    },
+    {
+      "name": "toxic_1"
+    },
+    {
+      "name": "toxic_2"
+    },
+    {
+      "name": "toxic_3"
+    },
+    {
+      "name": "toxic_4"
+    },
+    {
+      "name": "waste_1"
+    },
+    {
+      "name": "waste_2"
+    },
+    {
+      "name": "waste_3"
+    },
+    {
+      "name": "flammable_1"
+    },
+    {
+      "name": "flammable_2"
+    },
+    {
+      "name": "flammable_3"
+    },
+    {
+      "name": "warning_1"
+    },
+    {
+      "name": "warning_2"
+    },
+    {
+      "name": "warning_3"
+    },
+    {
+      "name": "double_grey_1"
+    },
+    {
+      "name": "double_grey_2"
+    },
+    {
+      "name": "triple_grey_1"
+    },
+    {
+      "name": "triple_grey_2"
+    },
+    {
+      "name": "triple_grey_3"
+    },
+    {
+      "name": "quad_grey_1"
+    },
+    {
+      "name": "double_red_1"
+    },
+    {
+      "name": "double_red_2"
+    },
+    {
+      "name": "triple_red_1"
+    },
+    {
+      "name": "triple_red_2"
+    },
+    {
+      "name": "quad_red_1"
+    },
+    {
+      "name": "quad_red_2"
+    },
+    {
+      "name": "double_yellow_1"
+    },
+    {
+      "name": "double_yellow_2"
+    },
+    {
+      "name": "triple_yellow_1"
+    },
+    {
+      "name": "triple_yellow_2"
+    },
+    {
+      "name": "triple_yellow_3"
+    },
+    {
+      "name": "quad_yellow_1"
+    },
+    {
+      "name": "double_toxic_1"
+    },
+    {
+      "name": "triple_toxic_1"
+    },
+    {
+      "name": "triple_toxic_2"
+    },
+    {
+      "name": "quad_toxic_1"
+    },
+    {
+      "name": "double_waste_1"
+    },
+    {
+      "name": "double_waste_2"
+    },
+    {
+      "name": "triple_waste_1"
+    },
+    {
+      "name": "triple_waste_2"
+    },
+    {
+      "name": "triple_waste_3"
+    },
+    {
+      "name": "quad_waste_1"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/quad_grey_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_grey_1.png
new file mode 100644
index 00000000000..c7c2a390421
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_grey_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/quad_red_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_red_1.png
new file mode 100644
index 00000000000..c3719d30b1e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_red_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/quad_red_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_red_2.png
new file mode 100644
index 00000000000..d7af6fdd68e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_red_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/quad_toxic_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_toxic_1.png
new file mode 100644
index 00000000000..c9efa16cfcb
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_toxic_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/quad_waste_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_waste_1.png
new file mode 100644
index 00000000000..90e3185ba32
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_waste_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/quad_yellow_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_yellow_1.png
new file mode 100644
index 00000000000..56806f2f2bd
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/quad_yellow_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/red_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/red_1.png
new file mode 100644
index 00000000000..a04fa07857b
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/red_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/red_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/red_2.png
new file mode 100644
index 00000000000..472c50553d0
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/red_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/red_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/red_3.png
new file mode 100644
index 00000000000..dd414145a0b
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/red_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/red_alt_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/red_alt_1.png
new file mode 100644
index 00000000000..b4c5d20b982
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/red_alt_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/red_alt_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/red_alt_2.png
new file mode 100644
index 00000000000..d3d145a9c1b
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/red_alt_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/red_alt_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/red_alt_3.png
new file mode 100644
index 00000000000..f46f38a3f92
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/red_alt_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_1.png
new file mode 100644
index 00000000000..05f1f433c80
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_2.png
new file mode 100644
index 00000000000..d1fb0c25f68
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_3.png
new file mode 100644
index 00000000000..4ec1d182233
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_4.png b/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_4.png
new file mode 100644
index 00000000000..b8a915a817f
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/toxic_4.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_grey_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_grey_1.png
new file mode 100644
index 00000000000..9b562466a7d
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_grey_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_grey_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_grey_2.png
new file mode 100644
index 00000000000..37ea181edc6
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_grey_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_grey_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_grey_3.png
new file mode 100644
index 00000000000..12d10fc5334
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_grey_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_red_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_red_1.png
new file mode 100644
index 00000000000..b2cc0cbaafc
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_red_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_red_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_red_2.png
new file mode 100644
index 00000000000..4eb8bd45a6a
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_red_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_toxic_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_toxic_1.png
new file mode 100644
index 00000000000..a3f603bfee6
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_toxic_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_toxic_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_toxic_2.png
new file mode 100644
index 00000000000..3afd5eacc3a
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_toxic_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_waste_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_waste_1.png
new file mode 100644
index 00000000000..50c40b137ba
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_waste_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_waste_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_waste_2.png
new file mode 100644
index 00000000000..a8d79361c64
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_waste_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_waste_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_waste_3.png
new file mode 100644
index 00000000000..9e255067d24
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_waste_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_yellow_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_yellow_1.png
new file mode 100644
index 00000000000..8b6e6efd856
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_yellow_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_yellow_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_yellow_2.png
new file mode 100644
index 00000000000..1c3ffcdb6e8
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_yellow_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/triple_yellow_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_yellow_3.png
new file mode 100644
index 00000000000..80b4b915fe8
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/triple_yellow_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/warning_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/warning_1.png
new file mode 100644
index 00000000000..2b6b4bc60a5
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/warning_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/warning_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/warning_2.png
new file mode 100644
index 00000000000..2e4814a838e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/warning_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/warning_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/warning_3.png
new file mode 100644
index 00000000000..1d788499313
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/warning_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/waste_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/waste_1.png
new file mode 100644
index 00000000000..88f24bf8f6a
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/waste_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/waste_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/waste_2.png
new file mode 100644
index 00000000000..0b59a07ca93
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/waste_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/waste_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/waste_3.png
new file mode 100644
index 00000000000..08da97f26df
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/waste_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/yellow_1.png b/Resources/Textures/Structures/Decoration/barrels.rsi/yellow_1.png
new file mode 100644
index 00000000000..c14dd3aaf00
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/yellow_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/yellow_2.png b/Resources/Textures/Structures/Decoration/barrels.rsi/yellow_2.png
new file mode 100644
index 00000000000..09240c27c23
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/yellow_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/barrels.rsi/yellow_3.png b/Resources/Textures/Structures/Decoration/barrels.rsi/yellow_3.png
new file mode 100644
index 00000000000..395922b8cb0
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/barrels.rsi/yellow_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-1.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-1.png
new file mode 100644
index 00000000000..2115cd96548
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-1.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-2.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-2.png
new file mode 100644
index 00000000000..947f783128b
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-2.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-3.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-3.png
new file mode 100644
index 00000000000..1d06908207d
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-3.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-4.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-4.png
new file mode 100644
index 00000000000..04460cdeeda
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-4.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-5.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-5.png
new file mode 100644
index 00000000000..70effbf9c9e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-5.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-6.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-6.png
new file mode 100644
index 00000000000..8eded936f9a
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_ns-6.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-1.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-1.png
new file mode 100644
index 00000000000..1b937ad6381
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-1.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-2.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-2.png
new file mode 100644
index 00000000000..8eade32e2bd
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-2.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-3.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-3.png
new file mode 100644
index 00000000000..6d6d9277e94
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-3.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-4.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-4.png
new file mode 100644
index 00000000000..096bd817288
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-4.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-5.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-5.png
new file mode 100644
index 00000000000..8df1d053507
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-5.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-6.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-6.png
new file mode 100644
index 00000000000..6926dfc3a39
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_drought_we-6.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-1.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-1.png
new file mode 100644
index 00000000000..3f627352d5f
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-1.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-2.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-2.png
new file mode 100644
index 00000000000..319f8266278
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-2.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-3.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-3.png
new file mode 100644
index 00000000000..08f725999fc
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-3.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-4.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-4.png
new file mode 100644
index 00000000000..d13ab2e0784
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-4.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-5.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-5.png
new file mode 100644
index 00000000000..8a10f9ebd97
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-5.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-6.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-6.png
new file mode 100644
index 00000000000..b42dd106c68
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_ns-6.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-1.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-1.png
new file mode 100644
index 00000000000..5ae42e48fca
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-1.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-2.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-2.png
new file mode 100644
index 00000000000..9408c3f76b1
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-2.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-3.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-3.png
new file mode 100644
index 00000000000..d0363b61413
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-3.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-4.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-4.png
new file mode 100644
index 00000000000..ad6847efdf0
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-4.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-5.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-5.png
new file mode 100644
index 00000000000..ae4b6c6bec5
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-5.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-6.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-6.png
new file mode 100644
index 00000000000..5d25c6018e3
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/boards_mammoth_we-6.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/meta.json b/Resources/Textures/Structures/Decoration/cave_decor.rsi/meta.json
new file mode 100644
index 00000000000..39934426339
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/cave_decor.rsi/meta.json
@@ -0,0 +1,122 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/0cbeda29e69293cd3a637fe67576b30b7693d5f6/mojave/icons/structure/cave_decor.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "stalagmite"
+    },
+    {
+      "name": "stalagmite1"
+    },
+    {
+      "name": "stalagmite2"
+    },
+    {
+      "name": "stalagmite3"
+    },
+    {
+      "name": "stalagmite4"
+    },
+    {
+      "name": "stalagmite5"
+    },
+    {
+      "name": "minecart_fallen"
+    },
+    {
+      "name": "sign_left"
+    },
+    {
+      "name": "sign_right"
+    },
+    {
+      "name": "boards_drought_ns-1"
+    },
+    {
+      "name": "boards_drought_ns-2"
+    },
+    {
+      "name": "boards_drought_ns-3"
+    },
+    {
+      "name": "boards_drought_ns-4"
+    },
+    {
+      "name": "boards_drought_ns-5"
+    },
+    {
+      "name": "boards_drought_ns-6"
+    },
+    {
+      "name": "boards_drought_we-1"
+    },
+    {
+      "name": "boards_drought_we-2"
+    },
+    {
+      "name": "boards_drought_we-3"
+    },
+    {
+      "name": "boards_drought_we-4"
+    },
+    {
+      "name": "boards_drought_we-5"
+    },
+    {
+      "name": "boards_drought_we-6"
+    },
+    {
+      "name": "boards_mammoth_ns-1"
+    },
+    {
+      "name": "boards_mammoth_ns-2"
+    },
+    {
+      "name": "boards_mammoth_ns-3"
+    },
+    {
+      "name": "boards_mammoth_ns-4"
+    },
+    {
+      "name": "boards_mammoth_ns-5"
+    },
+    {
+      "name": "boards_mammoth_ns-6"
+    },
+    {
+      "name": "boards_mammoth_we-1"
+    },
+    {
+      "name": "boards_mammoth_we-2"
+    },
+    {
+      "name": "boards_mammoth_we-3"
+    },
+    {
+      "name": "boards_mammoth_we-4"
+    },
+    {
+      "name": "boards_mammoth_we-5"
+    },
+    {
+      "name": "boards_mammoth_we-6"
+    },
+    {
+      "name": "support"
+    },
+    {
+      "name": "support_beams"
+    },
+    {
+      "name": "support_wall"
+    },
+    {
+      "name": "support_wall_broken"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/minecart_fallen.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/minecart_fallen.png
new file mode 100644
index 00000000000..b452f212f58
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/minecart_fallen.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/sign_left.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/sign_left.png
new file mode 100644
index 00000000000..6b188d94500
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/sign_left.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/sign_right.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/sign_right.png
new file mode 100644
index 00000000000..61929ae8786
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/sign_right.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite.png
new file mode 100644
index 00000000000..c0a0fd2a259
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite1.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite1.png
new file mode 100644
index 00000000000..ffcf3155c8d
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite1.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite2.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite2.png
new file mode 100644
index 00000000000..07591aefa47
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite2.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite3.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite3.png
new file mode 100644
index 00000000000..c54eb93cbf9
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite3.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite4.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite4.png
new file mode 100644
index 00000000000..7a0b84050f3
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite4.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite5.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite5.png
new file mode 100644
index 00000000000..1b766541908
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/stalagmite5.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/support.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/support.png
new file mode 100644
index 00000000000..7670149e573
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/support.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/support_beams.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/support_beams.png
new file mode 100644
index 00000000000..a3d6e3b2d29
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/support_beams.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/support_wall.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/support_wall.png
new file mode 100644
index 00000000000..001c3604dba
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/support_wall.png differ
diff --git a/Resources/Textures/Structures/Decoration/cave_decor.rsi/support_wall_broken.png b/Resources/Textures/Structures/Decoration/cave_decor.rsi/support_wall_broken.png
new file mode 100644
index 00000000000..0ab5916b2d9
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cave_decor.rsi/support_wall_broken.png differ
diff --git a/Resources/Textures/Structures/Decoration/rails64.rsi/junction-left-bottom.png b/Resources/Textures/Structures/Decoration/rails64.rsi/junction-left-bottom.png
new file mode 100644
index 00000000000..7238770a79d
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/rails64.rsi/junction-left-bottom.png differ
diff --git a/Resources/Textures/Structures/Decoration/rails64.rsi/junction-left-top.png b/Resources/Textures/Structures/Decoration/rails64.rsi/junction-left-top.png
new file mode 100644
index 00000000000..ec6e93b6273
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/rails64.rsi/junction-left-top.png differ
diff --git a/Resources/Textures/Structures/Decoration/rails64.rsi/junction-right-bottom.png b/Resources/Textures/Structures/Decoration/rails64.rsi/junction-right-bottom.png
new file mode 100644
index 00000000000..7dd8f8fcbb8
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/rails64.rsi/junction-right-bottom.png differ
diff --git a/Resources/Textures/Structures/Decoration/rails64.rsi/junction-right-top.png b/Resources/Textures/Structures/Decoration/rails64.rsi/junction-right-top.png
new file mode 100644
index 00000000000..793db233c39
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/rails64.rsi/junction-right-top.png differ
diff --git a/Resources/Textures/Structures/Decoration/rails64.rsi/meta.json b/Resources/Textures/Structures/Decoration/rails64.rsi/meta.json
new file mode 100644
index 00000000000..813b89a53c7
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/rails64.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Created by INFRARED_BARON for MS13",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "junction-right-top"
+    },
+    {
+      "name": "turn-WS"
+    },
+    {
+      "name": "junction-right-bottom"
+    },
+    {
+      "name": "turn-NW"
+    },
+    {
+      "name": "junction-left-bottom"
+    },
+    {
+      "name": "turn-NE"
+    },
+    {
+      "name": "junction-left-top"
+    },
+    {
+      "name": "turn-SE"
+    },
+    {
+      "name": "rails",
+	  "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Decoration/rails64.rsi/rails.png b/Resources/Textures/Structures/Decoration/rails64.rsi/rails.png
new file mode 100644
index 00000000000..96028b3149c
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/rails64.rsi/rails.png differ
diff --git a/Resources/Textures/Structures/Decoration/rails64.rsi/turn-NE.png b/Resources/Textures/Structures/Decoration/rails64.rsi/turn-NE.png
new file mode 100644
index 00000000000..c90bd0e1810
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/rails64.rsi/turn-NE.png differ
diff --git a/Resources/Textures/Structures/Decoration/rails64.rsi/turn-NW.png b/Resources/Textures/Structures/Decoration/rails64.rsi/turn-NW.png
new file mode 100644
index 00000000000..67197f64e41
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/rails64.rsi/turn-NW.png differ
diff --git a/Resources/Textures/Structures/Decoration/rails64.rsi/turn-SE.png b/Resources/Textures/Structures/Decoration/rails64.rsi/turn-SE.png
new file mode 100644
index 00000000000..c9ae45f2633
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/rails64.rsi/turn-SE.png differ
diff --git a/Resources/Textures/Structures/Decoration/rails64.rsi/turn-WS.png b/Resources/Textures/Structures/Decoration/rails64.rsi/turn-WS.png
new file mode 100644
index 00000000000..1099423275f
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/rails64.rsi/turn-WS.png differ
diff --git a/Resources/Textures/Structures/Decoration/signs_64x64.rsi/bazaar.png b/Resources/Textures/Structures/Decoration/signs_64x64.rsi/bazaar.png
new file mode 100644
index 00000000000..9a0c08957a5
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/signs_64x64.rsi/bazaar.png differ
diff --git a/Resources/Textures/Structures/Decoration/signs_64x64.rsi/meta.json b/Resources/Textures/Structures/Decoration/signs_64x64.rsi/meta.json
new file mode 100644
index 00000000000..7ab03e564e8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/signs_64x64.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/6fde5cf64e584727ce66d92d81352801670e172f",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "we_open"
+    },
+    {
+      "name": "bazaar"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Decoration/signs_64x64.rsi/we_open.png b/Resources/Textures/Structures/Decoration/signs_64x64.rsi/we_open.png
new file mode 100644
index 00000000000..141a97768a0
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/signs_64x64.rsi/we_open.png differ
diff --git a/Resources/Textures/Structures/Decoration/tires.rsi/junktire1.png b/Resources/Textures/Structures/Decoration/tires.rsi/junktire1.png
new file mode 100644
index 00000000000..5ff478ac179
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/tires.rsi/junktire1.png differ
diff --git a/Resources/Textures/Structures/Decoration/tires.rsi/junktire2.png b/Resources/Textures/Structures/Decoration/tires.rsi/junktire2.png
new file mode 100644
index 00000000000..a8b346516b2
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/tires.rsi/junktire2.png differ
diff --git a/Resources/Textures/Structures/Decoration/tires.rsi/junktire3.png b/Resources/Textures/Structures/Decoration/tires.rsi/junktire3.png
new file mode 100644
index 00000000000..cb9e52edf37
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/tires.rsi/junktire3.png differ
diff --git a/Resources/Textures/Structures/Decoration/tires.rsi/junktire4.png b/Resources/Textures/Structures/Decoration/tires.rsi/junktire4.png
new file mode 100644
index 00000000000..09ad4bbcd41
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/tires.rsi/junktire4.png differ
diff --git a/Resources/Textures/Structures/Decoration/tires.rsi/junktire5.png b/Resources/Textures/Structures/Decoration/tires.rsi/junktire5.png
new file mode 100644
index 00000000000..1c9fd3e3324
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/tires.rsi/junktire5.png differ
diff --git a/Resources/Textures/Structures/Decoration/tires.rsi/meta.json b/Resources/Textures/Structures/Decoration/tires.rsi/meta.json
new file mode 100644
index 00000000000..67900194216
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/tires.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Created by ladyayla and MaxxOrion for ",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "junktire1",
+      "directions": 4
+    },
+    {
+      "name": "junktire2",
+      "directions": 4
+    },
+    {
+      "name": "junktire3",
+      "directions": 4
+    },
+    {
+      "name": "junktire4",
+      "directions": 4
+    },
+    {
+      "name": "junktire5",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/torches.rsi/meta.json b/Resources/Textures/Structures/Decoration/torches.rsi/meta.json
new file mode 100644
index 00000000000..caa105acab9
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/torches.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Ported from Nukapop-13",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "torch_unlit"
+    },
+    {
+      "name": "torch_lit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "wall_torch_unlit",
+      "directions": 4
+    },
+    {
+      "name": "wall_torch_lit",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Decoration/torches.rsi/torch_lit.png b/Resources/Textures/Structures/Decoration/torches.rsi/torch_lit.png
new file mode 100644
index 00000000000..4fdd6e03232
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/torches.rsi/torch_lit.png differ
diff --git a/Resources/Textures/Structures/Decoration/torches.rsi/torch_unlit.png b/Resources/Textures/Structures/Decoration/torches.rsi/torch_unlit.png
new file mode 100644
index 00000000000..f946d282242
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/torches.rsi/torch_unlit.png differ
diff --git a/Resources/Textures/Structures/Decoration/torches.rsi/wall_torch_lit.png b/Resources/Textures/Structures/Decoration/torches.rsi/wall_torch_lit.png
new file mode 100644
index 00000000000..d629bc00eb5
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/torches.rsi/wall_torch_lit.png differ
diff --git a/Resources/Textures/Structures/Decoration/torches.rsi/wall_torch_unlit.png b/Resources/Textures/Structures/Decoration/torches.rsi/wall_torch_unlit.png
new file mode 100644
index 00000000000..c508a54ebd4
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/torches.rsi/wall_torch_unlit.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/barrels1.png b/Resources/Textures/Structures/Decoration/world.rsi/barrels1.png
new file mode 100644
index 00000000000..323811e137e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/barrels1.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/barrels2.png b/Resources/Textures/Structures/Decoration/world.rsi/barrels2.png
new file mode 100644
index 00000000000..1bff24bd4ac
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/barrels2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/barrels3.png b/Resources/Textures/Structures/Decoration/world.rsi/barrels3.png
new file mode 100644
index 00000000000..20d914ac188
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/barrels3.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/barrels4.png b/Resources/Textures/Structures/Decoration/world.rsi/barrels4.png
new file mode 100644
index 00000000000..8d8bea4b031
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/barrels4.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/barrels5.png b/Resources/Textures/Structures/Decoration/world.rsi/barrels5.png
new file mode 100644
index 00000000000..da1078bd146
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/barrels5.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/barrels6.png b/Resources/Textures/Structures/Decoration/world.rsi/barrels6.png
new file mode 100644
index 00000000000..513795e8961
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/barrels6.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/bookpile_1.png b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_1.png
new file mode 100644
index 00000000000..a2cd2612a93
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/bookpile_2.png b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_2.png
new file mode 100644
index 00000000000..3afcd2e1e26
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/bookpile_3.png b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_3.png
new file mode 100644
index 00000000000..33ec1b6d49d
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/bookpile_4.png b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_4.png
new file mode 100644
index 00000000000..33c0400bc23
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_4.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/bookpile_5.png b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_5.png
new file mode 100644
index 00000000000..fe6dd9648c6
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_5.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/bookpile_6.png b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_6.png
new file mode 100644
index 00000000000..29a07811b95
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/bookpile_6.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/bookstack_1.png b/Resources/Textures/Structures/Decoration/world.rsi/bookstack_1.png
new file mode 100644
index 00000000000..1ba11dea14d
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/bookstack_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/bookstack_2.png b/Resources/Textures/Structures/Decoration/world.rsi/bookstack_2.png
new file mode 100644
index 00000000000..c2e8d731635
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/bookstack_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/bookstack_3.png b/Resources/Textures/Structures/Decoration/world.rsi/bookstack_3.png
new file mode 100644
index 00000000000..762f4164a32
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/bookstack_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/brickpile.png b/Resources/Textures/Structures/Decoration/world.rsi/brickpile.png
new file mode 100644
index 00000000000..5f9bff64e6c
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/brickpile.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/brickrubble.png b/Resources/Textures/Structures/Decoration/world.rsi/brickrubble.png
new file mode 100644
index 00000000000..e6608f1928f
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/brickrubble.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/cardboard.png b/Resources/Textures/Structures/Decoration/world.rsi/cardboard.png
new file mode 100644
index 00000000000..502c9091c87
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/cardboard.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier.png b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier.png
new file mode 100644
index 00000000000..adc809dd334
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_1.png b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_1.png
new file mode 100644
index 00000000000..172a253e72f
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_2.png b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_2.png
new file mode 100644
index 00000000000..166a4d8e8d6
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_3.png b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_3.png
new file mode 100644
index 00000000000..3dacbc7b505
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_4.png b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_4.png
new file mode 100644
index 00000000000..152a731a34c
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_4.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_5.png b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_5.png
new file mode 100644
index 00000000000..5c9b516dceb
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_5.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_alt.png b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_alt.png
new file mode 100644
index 00000000000..d14490858ac
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_alt.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_alt_2.png b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_alt_2.png
new file mode 100644
index 00000000000..6f4073d1e55
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/concrete_barrier_alt_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_1.png b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_1.png
new file mode 100644
index 00000000000..35e169511a4
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_2.png b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_2.png
new file mode 100644
index 00000000000..5dd4111cf39
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_3.png b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_3.png
new file mode 100644
index 00000000000..07a18d4b49b
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_4.png b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_4.png
new file mode 100644
index 00000000000..ea9f0dc039a
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_4.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_5.png b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_5.png
new file mode 100644
index 00000000000..410d800f79a
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_5.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_6.png b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_6.png
new file mode 100644
index 00000000000..5e5c41c7077
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/foodstuff_6.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/glass_1.png b/Resources/Textures/Structures/Decoration/world.rsi/glass_1.png
new file mode 100644
index 00000000000..17ac65cf260
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/glass_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/glass_2.png b/Resources/Textures/Structures/Decoration/world.rsi/glass_2.png
new file mode 100644
index 00000000000..eb3ab8acaa9
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/glass_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/glass_3.png b/Resources/Textures/Structures/Decoration/world.rsi/glass_3.png
new file mode 100644
index 00000000000..897e09bd7e5
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/glass_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/glass_4.png b/Resources/Textures/Structures/Decoration/world.rsi/glass_4.png
new file mode 100644
index 00000000000..be2b99641c2
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/glass_4.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/glass_5.png b/Resources/Textures/Structures/Decoration/world.rsi/glass_5.png
new file mode 100644
index 00000000000..ade2587a9ac
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/glass_5.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/glass_6.png b/Resources/Textures/Structures/Decoration/world.rsi/glass_6.png
new file mode 100644
index 00000000000..79c5e850d7a
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/glass_6.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/mailbox-open.png b/Resources/Textures/Structures/Decoration/world.rsi/mailbox-open.png
new file mode 100644
index 00000000000..c5126efbf88
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/mailbox-open.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/mailbox.png b/Resources/Textures/Structures/Decoration/world.rsi/mailbox.png
new file mode 100644
index 00000000000..52b69f7db4d
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/mailbox.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/mailbox_old-open.png b/Resources/Textures/Structures/Decoration/world.rsi/mailbox_old-open.png
new file mode 100644
index 00000000000..3c712d2c3d3
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/mailbox_old-open.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/mailbox_old.png b/Resources/Textures/Structures/Decoration/world.rsi/mailbox_old.png
new file mode 100644
index 00000000000..d80d352f7d1
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/mailbox_old.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/meta.json b/Resources/Textures/Structures/Decoration/world.rsi/meta.json
new file mode 100644
index 00000000000..1920ab8b628
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/world.rsi/meta.json
@@ -0,0 +1,249 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/ffcecc82f28c796f8eff92ac46ff0f5e0d9b1ab6/mojave/icons/structure/miscellaneous.dmi",
+  "size": {
+    "x": 32,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "mailbox_old"
+    },
+    {
+      "name": "mailbox_old-open"
+    },
+    {
+      "name": "mailbox"
+    },
+    {
+      "name": "mailbox-open"
+    },
+    {
+      "name": "barrels1"
+    },
+    {
+      "name": "barrels2"
+    },
+    {
+      "name": "barrels3"
+    },
+    {
+      "name": "barrels4"
+    },
+    {
+      "name": "barrels5"
+    },
+    {
+      "name": "barrels6"
+    },
+    {
+      "name": "payphone",
+      "directions": 4
+    },
+    {
+      "name": "payphone_alt",
+      "directions": 4
+    },
+    {
+      "name": "trashbin"
+    },
+    {
+      "name": "trashbin-1"
+    },
+    {
+      "name": "trashbin-2"
+    },
+    {
+      "name": "trashbin-3"
+    },
+    {
+      "name": "phone_black"
+    },
+    {
+      "name": "phone_red"
+    },
+    {
+      "name": "pot_1"
+    },
+    {
+      "name": "pot_2"
+    },
+    {
+      "name": "pot_3"
+    },
+    {
+      "name": "pot_4"
+    },
+    {
+      "name": "concrete_barrier",
+      "directions": 4
+    },
+    {
+      "name": "concrete_barrier_1",
+      "directions": 4
+    },
+    {
+      "name": "concrete_barrier_2",
+      "directions": 4
+    },
+    {
+      "name": "concrete_barrier_3",
+      "directions": 4
+    },
+    {
+      "name": "concrete_barrier_4",
+      "directions": 4
+    },
+    {
+      "name": "concrete_barrier_5",
+      "directions": 4
+    },
+    {
+      "name": "concrete_barrier_alt",
+      "directions": 4
+    },
+    {
+      "name": "concrete_barrier_alt_2",
+      "directions": 4
+    },
+    {
+      "name": "skeleton"
+    },
+    {
+      "name": "shower",
+      "directions": 4
+    },
+    {
+      "name": "toilet",
+      "directions": 4
+    },
+    {
+      "name": "sink",
+      "directions": 4
+    },
+    {
+      "name": "scattered_papers",
+      "directions": 8
+    },
+    {
+      "name": "papers_1",
+      "directions": 4
+    },
+    {
+      "name": "papers_2",
+      "directions": 4
+    },
+    {
+      "name": "papers_3",
+      "directions": 4
+    },
+    {
+      "name": "woodscrap",
+      "directions": 8
+    },
+    {
+      "name": "brickrubble",
+      "directions": 8
+    },
+    {
+      "name": "cardboard",
+      "directions": 8
+    },
+    {
+      "name": "pallet",
+      "directions": 4
+    },
+    {
+      "name": "pallet_stack",
+      "directions": 4
+    },
+    {
+      "name": "brickpile"
+    },
+    {
+      "name": "bookstack_1"
+    },
+    {
+      "name": "bookstack_2"
+    },
+    {
+      "name": "bookstack_3"
+    },
+    {
+      "name": "bookpile_1"
+    },
+    {
+      "name": "bookpile_2"
+    },
+    {
+      "name": "bookpile_3"
+    },
+    {
+      "name": "bookpile_4"
+    },
+    {
+      "name": "bookpile_5"
+    },
+    {
+      "name": "bookpile_6"
+    },
+    {
+      "name": "foodstuff_1"
+    },
+    {
+      "name": "foodstuff_2"
+    },
+    {
+      "name": "foodstuff_3"
+    },
+    {
+      "name": "foodstuff_4"
+    },
+    {
+      "name": "foodstuff_5"
+    },
+    {
+      "name": "foodstuff_6"
+    },
+    {
+      "name": "trashbags_1"
+    },
+    {
+      "name": "trashbags_2"
+    },
+    {
+      "name": "trashbags_3"
+    },
+    {
+      "name": "trashbags_4"
+    },
+    {
+      "name": "trashbags_5"
+    },
+    {
+      "name": "trashbags_6"
+    },
+    {
+      "name": "glass_1"
+    },
+    {
+      "name": "glass_2"
+    },
+    {
+      "name": "glass_3"
+    },
+    {
+      "name": "glass_4"
+    },
+    {
+      "name": "glass_5"
+    },
+    {
+      "name": "glass_6"
+    },
+    {
+      "name": "mine_sign"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/mine_sign.png b/Resources/Textures/Structures/Decoration/world.rsi/mine_sign.png
new file mode 100644
index 00000000000..e67ecc5e370
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/mine_sign.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/pallet.png b/Resources/Textures/Structures/Decoration/world.rsi/pallet.png
new file mode 100644
index 00000000000..f1ef027d274
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/pallet.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/pallet_stack.png b/Resources/Textures/Structures/Decoration/world.rsi/pallet_stack.png
new file mode 100644
index 00000000000..73d59a10f32
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/pallet_stack.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/papers_1.png b/Resources/Textures/Structures/Decoration/world.rsi/papers_1.png
new file mode 100644
index 00000000000..f250f41ecba
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/papers_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/papers_2.png b/Resources/Textures/Structures/Decoration/world.rsi/papers_2.png
new file mode 100644
index 00000000000..f9aa74fe508
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/papers_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/papers_3.png b/Resources/Textures/Structures/Decoration/world.rsi/papers_3.png
new file mode 100644
index 00000000000..277a55e12c1
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/papers_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/payphone.png b/Resources/Textures/Structures/Decoration/world.rsi/payphone.png
new file mode 100644
index 00000000000..928291b65ef
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/payphone.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/payphone_alt.png b/Resources/Textures/Structures/Decoration/world.rsi/payphone_alt.png
new file mode 100644
index 00000000000..aa05c3fd31d
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/payphone_alt.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/phone_black.png b/Resources/Textures/Structures/Decoration/world.rsi/phone_black.png
new file mode 100644
index 00000000000..87403a190f2
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/phone_black.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/phone_red.png b/Resources/Textures/Structures/Decoration/world.rsi/phone_red.png
new file mode 100644
index 00000000000..e925a7f1f4c
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/phone_red.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/pot_1.png b/Resources/Textures/Structures/Decoration/world.rsi/pot_1.png
new file mode 100644
index 00000000000..b9ae782f094
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/pot_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/pot_2.png b/Resources/Textures/Structures/Decoration/world.rsi/pot_2.png
new file mode 100644
index 00000000000..a2e594848a8
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/pot_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/pot_3.png b/Resources/Textures/Structures/Decoration/world.rsi/pot_3.png
new file mode 100644
index 00000000000..f665ca9125e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/pot_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/pot_4.png b/Resources/Textures/Structures/Decoration/world.rsi/pot_4.png
new file mode 100644
index 00000000000..3ae15c9ee50
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/pot_4.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/scattered_papers.png b/Resources/Textures/Structures/Decoration/world.rsi/scattered_papers.png
new file mode 100644
index 00000000000..59447400c37
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/scattered_papers.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/shower.png b/Resources/Textures/Structures/Decoration/world.rsi/shower.png
new file mode 100644
index 00000000000..ca3f561f9d2
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/shower.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/sink.png b/Resources/Textures/Structures/Decoration/world.rsi/sink.png
new file mode 100644
index 00000000000..ab89eea0ad0
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/sink.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/skeleton.png b/Resources/Textures/Structures/Decoration/world.rsi/skeleton.png
new file mode 100644
index 00000000000..9742b98dfd7
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/skeleton.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/toilet.png b/Resources/Textures/Structures/Decoration/world.rsi/toilet.png
new file mode 100644
index 00000000000..912bd547b0a
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/toilet.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/trashbags_1.png b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_1.png
new file mode 100644
index 00000000000..32c78882f41
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_1.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/trashbags_2.png b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_2.png
new file mode 100644
index 00000000000..a6ebeb9933b
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/trashbags_3.png b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_3.png
new file mode 100644
index 00000000000..828a44184ee
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_3.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/trashbags_4.png b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_4.png
new file mode 100644
index 00000000000..368852fc235
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_4.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/trashbags_5.png b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_5.png
new file mode 100644
index 00000000000..b878b22d526
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_5.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/trashbags_6.png b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_6.png
new file mode 100644
index 00000000000..236a3b0f1ec
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/trashbags_6.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/trashbin-1.png b/Resources/Textures/Structures/Decoration/world.rsi/trashbin-1.png
new file mode 100644
index 00000000000..ab01db6716d
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/trashbin-1.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/trashbin-2.png b/Resources/Textures/Structures/Decoration/world.rsi/trashbin-2.png
new file mode 100644
index 00000000000..01ebf1808ec
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/trashbin-2.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/trashbin-3.png b/Resources/Textures/Structures/Decoration/world.rsi/trashbin-3.png
new file mode 100644
index 00000000000..0ded7ef6a45
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/trashbin-3.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/trashbin.png b/Resources/Textures/Structures/Decoration/world.rsi/trashbin.png
new file mode 100644
index 00000000000..cc6bfcbaf6b
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/trashbin.png differ
diff --git a/Resources/Textures/Structures/Decoration/world.rsi/woodscrap.png b/Resources/Textures/Structures/Decoration/world.rsi/woodscrap.png
new file mode 100644
index 00000000000..5cdb4e82489
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/world.rsi/woodscrap.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/closet.png
new file mode 100644
index 00000000000..72f5a15231c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/closet_door.png
new file mode 100644
index 00000000000..2aea809d943
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/closet_open.png
new file mode 100644
index 00000000000..04bfdc1aef2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/meta.json
new file mode 100644
index 00000000000..b4d08e76497
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/cabinet.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "https://github.com/JustLoveBeingAnOwl/Interstate-80-owlTaken at /commit/a6f9e0a6649e89f0aa731f363e07f541654ecb3d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Closets/closet.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/closet.rsi/closet.png
new file mode 100644
index 00000000000..afd232916b6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closet.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closet.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/closet.rsi/closet_door.png
new file mode 100644
index 00000000000..f35c07161b8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closet.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closet.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/closet.rsi/closet_open.png
new file mode 100644
index 00000000000..a7551aff598
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closet.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/closet.rsi/meta.json
new file mode 100644
index 00000000000..3f29b07f084
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/closet.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "original sprites by Mithrandalf for ",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet_open"
+    },
+    {
+      "name": "welded"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Storage/Closets/closet.rsi/welded.png b/Resources/Textures/Structures/Storage/Closets/closet.rsi/welded.png
new file mode 100644
index 00000000000..5ba5dcc8962
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closet.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/closet.png
new file mode 100644
index 00000000000..f172eb6e1a2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/closet_door.png
new file mode 100644
index 00000000000..cee2ab57863
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/closet_open.png
new file mode 100644
index 00000000000..994cabb2715
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/meta.json
new file mode 100644
index 00000000000..a8b78d972ba
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/734c2aba4549814549d0fa7a9aa2e2d03ec1a2da/mojave/icons/structure/storage.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet_open"
+    },
+    {
+      "name": "welded"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/welded.png b/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/welded.png
new file mode 100644
index 00000000000..5ba5dcc8962
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/closet.png
new file mode 100644
index 00000000000..af64f96c3e2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/closet_door.png
new file mode 100644
index 00000000000..95c3f82c11f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/closet_open.png
new file mode 100644
index 00000000000..3d9b907af64
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/meta.json
new file mode 100644
index 00000000000..6c96f799da0
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "https://github.com/JustLoveBeingAnOwl/Interstate-80-owlTaken at /commit/a6f9e0a6649e89f0aa731f363e07f541654ecb3d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "welded"
+    },
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/welded.png b/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/welded.png
new file mode 100644
index 00000000000..3b3c1afb164
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgrey.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/closet.png
new file mode 100644
index 00000000000..42c8042f278
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/closet_door.png
new file mode 100644
index 00000000000..d358d38b075
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/closet_open.png
new file mode 100644
index 00000000000..03fcc057c13
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/meta.json
new file mode 100644
index 00000000000..6c96f799da0
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "https://github.com/JustLoveBeingAnOwl/Interstate-80-owlTaken at /commit/a6f9e0a6649e89f0aa731f363e07f541654ecb3d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "welded"
+    },
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/welded.png b/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/welded.png
new file mode 100644
index 00000000000..3b3c1afb164
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetold.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/closetold.rsi/closet.png
new file mode 100644
index 00000000000..65432daad84
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetold.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetold.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/closetold.rsi/closet_door.png
new file mode 100644
index 00000000000..6359b0bf95f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetold.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetold.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/closetold.rsi/closet_open.png
new file mode 100644
index 00000000000..f9ae6430bbb
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetold.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/closetold.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/closetold.rsi/meta.json
new file mode 100644
index 00000000000..6c96f799da0
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/closetold.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "https://github.com/JustLoveBeingAnOwl/Interstate-80-owlTaken at /commit/a6f9e0a6649e89f0aa731f363e07f541654ecb3d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "welded"
+    },
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Closets/closetold.rsi/welded.png b/Resources/Textures/Structures/Storage/Closets/closetold.rsi/welded.png
new file mode 100644
index 00000000000..3b3c1afb164
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/closetold.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/closet.png
new file mode 100644
index 00000000000..4384fc083d4
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/closet_door.png
new file mode 100644
index 00000000000..14e73e6aca0
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/closet_open.png
new file mode 100644
index 00000000000..3002352395a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/meta.json
new file mode 100644
index 00000000000..42ebb30c440
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "https://github.com/JustLoveBeingAnOwl/Interstate-80-owlTaken at /commit/a6f9e0a6649e89f0aa731f363e07f541654ecb3d",
+  "size": {
+    "x": 36,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "welded"
+    },
+    {
+      "name": "closet_open"
+    },
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/welded.png b/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/welded.png
new file mode 100644
index 00000000000..2626c910f37
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/doublecloset.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/closet.png
new file mode 100644
index 00000000000..0d0446556ab
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/closet_door.png
new file mode 100644
index 00000000000..81d17e6434f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/closet_open.png
new file mode 100644
index 00000000000..68d500a1b9a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/meta.json
new file mode 100644
index 00000000000..4573bdcf0ed
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "https://github.com/JustLoveBeingAnOwl/Interstate-80-owlTaken at /commit/a6f9e0a6649e89f0aa731f363e07f541654ecb3d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "welded"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/welded.png b/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/welded.png
new file mode 100644
index 00000000000..3b3c1afb164
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/closet.png
new file mode 100644
index 00000000000..7f97f962458
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/closet_door.png
new file mode 100644
index 00000000000..3b405c38888
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/closet_open.png
new file mode 100644
index 00000000000..24eae0e5887
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/meta.json
new file mode 100644
index 00000000000..4573bdcf0ed
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "https://github.com/JustLoveBeingAnOwl/Interstate-80-owlTaken at /commit/a6f9e0a6649e89f0aa731f363e07f541654ecb3d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "welded"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/welded.png b/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/welded.png
new file mode 100644
index 00000000000..9854ad9b7cb
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/closet.png
new file mode 100644
index 00000000000..51f6568bb80
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/closet_door.png
new file mode 100644
index 00000000000..4fb2a2fe68b
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/closet_open.png
new file mode 100644
index 00000000000..b5fdb260ff6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/meta.json
new file mode 100644
index 00000000000..df09196536f
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "https://github.com/JustLoveBeingAnOwl/Interstate-80-owlTaken at /commit/a6f9e0a6649e89f0aa731f363e07f541654ecb3d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "welded"
+    },
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet_open"
+    },
+    {
+      "name": "shotgun"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/shotgun.png b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/shotgun.png
new file mode 100644
index 00000000000..2118cdf5f5d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/shotgun.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/welded.png b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/welded.png
new file mode 100644
index 00000000000..ae50afa7819
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/guncabinet.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/closet.png b/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/closet.png
new file mode 100644
index 00000000000..973d3220dfe
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/closet_door.png
new file mode 100644
index 00000000000..43e0e5b04f6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/closet_open.png
new file mode 100644
index 00000000000..ee7343e2836
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/meta.json b/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/meta.json
new file mode 100644
index 00000000000..6c96f799da0
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "https://github.com/JustLoveBeingAnOwl/Interstate-80-owlTaken at /commit/a6f9e0a6649e89f0aa731f363e07f541654ecb3d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "welded"
+    },
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/welded.png b/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/welded.png
new file mode 100644
index 00000000000..b0b016fa33d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Closets/medicabinet.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/base.png
new file mode 100644
index 00000000000..fd318d112d8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/closed.png
new file mode 100644
index 00000000000..2c0ff15bc08
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/icon.png
new file mode 100644
index 00000000000..6af597137d0
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/lock.png b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/lock.png
new file mode 100644
index 00000000000..cb3c8e710cc
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/lock.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/meta.json
new file mode 100644
index 00000000000..4a70ffccd86
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/b35ff6e7f1b94108e0b934a1caf84d60066840be/mojave/icons/structure/crates.dmi, converted & additional states modified by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "lock"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/open.png
new file mode 100644
index 00000000000..b6a45eab7ae
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/welded.png
new file mode 100644
index 00000000000..2af808afb3e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/base.png
new file mode 100644
index 00000000000..b7d43e1ee13
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/closed.png
new file mode 100644
index 00000000000..280feef20ed
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/icon.png
new file mode 100644
index 00000000000..b4d1e832551
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/lock.png b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/lock.png
new file mode 100644
index 00000000000..cb3c8e710cc
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/lock.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/meta.json
new file mode 100644
index 00000000000..4a70ffccd86
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/b35ff6e7f1b94108e0b934a1caf84d60066840be/mojave/icons/structure/crates.dmi, converted & additional states modified by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "lock"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/open.png
new file mode 100644
index 00000000000..d7f5122c4ef
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/welded.png
new file mode 100644
index 00000000000..2af808afb3e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/armycrate.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cashregister.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/cashregister.rsi/meta.json
new file mode 100644
index 00000000000..2f6f3effc31
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/cashregister.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/b35ff6e7f1b94108e0b934a1caf84d60066840be/mojave/icons/structure/crates.dmi,  converted & additional states modified by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "register_cleanopen",
+      "directions": 4
+    },
+    {
+      "name": "register_clean",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/cashregister.rsi/register_clean.png b/Resources/Textures/Structures/Storage/Crates/cashregister.rsi/register_clean.png
new file mode 100644
index 00000000000..7e03d84874e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cashregister.rsi/register_clean.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cashregister.rsi/register_cleanopen.png b/Resources/Textures/Structures/Storage/Crates/cashregister.rsi/register_cleanopen.png
new file mode 100644
index 00000000000..684ce62f9ff
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cashregister.rsi/register_cleanopen.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cashregisterbloody.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/cashregisterbloody.rsi/meta.json
new file mode 100644
index 00000000000..7b97a7e7b07
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/cashregisterbloody.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/b35ff6e7f1b94108e0b934a1caf84d60066840be/mojave/icons/structure/crates.dmi,  converted & additional states modified by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "register",
+      "directions": 4
+    },
+    {
+      "name": "registeropen",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/cashregisterbloody.rsi/register.png b/Resources/Textures/Structures/Storage/Crates/cashregisterbloody.rsi/register.png
new file mode 100644
index 00000000000..ae713d3dbad
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cashregisterbloody.rsi/register.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cashregisterbloody.rsi/registeropen.png b/Resources/Textures/Structures/Storage/Crates/cashregisterbloody.rsi/registeropen.png
new file mode 100644
index 00000000000..b1f58e204a1
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cashregisterbloody.rsi/registeropen.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/base.png
new file mode 100644
index 00000000000..dbe959cdde5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/closed.png
new file mode 100644
index 00000000000..cde0879b2f1
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/icon.png
new file mode 100644
index 00000000000..f3a5facaf85
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/meta.json
new file mode 100644
index 00000000000..30ddccec79c
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "By patogrone for nuclear14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/open.png
new file mode 100644
index 00000000000..79e4ca0fc68
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/base.png
new file mode 100644
index 00000000000..5391f84ca77
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/closed.png
new file mode 100644
index 00000000000..c4598c55061
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/icon.png
new file mode 100644
index 00000000000..e5611ffbc77
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/meta.json
new file mode 100644
index 00000000000..30ddccec79c
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "By patogrone for nuclear14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/open.png
new file mode 100644
index 00000000000..588072ac79a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/cratewooden.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/base.png
new file mode 100644
index 00000000000..24a824f6582
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/closed.png
new file mode 100644
index 00000000000..d81f5214556
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/icon.png
new file mode 100644
index 00000000000..6d3c39fa352
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/meta.json
new file mode 100644
index 00000000000..ba4bf0a813e
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Base and icon by patogrone. Others modified by Peptide.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "welded"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/open.png
new file mode 100644
index 00000000000..73a2329c8ee
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/welded.png
new file mode 100644
index 00000000000..a2bc24c5286
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/footlocker.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png
index 386dd0845da..c0538c846bf 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png
index e7d29a34793..a94bb6a968a 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png
index 039099b3378..6e5483209e0 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png
index 10129791a7c..e189e1addb6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/base.png
new file mode 100644
index 00000000000..9917e659f2c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/closed.png
new file mode 100644
index 00000000000..67e54227dd1
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/icon.png
new file mode 100644
index 00000000000..9a9555b7b10
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/lock.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/lock.png
new file mode 100644
index 00000000000..cb3c8e710cc
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/lock.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/meta.json
new file mode 100644
index 00000000000..4a70ffccd86
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/b35ff6e7f1b94108e0b934a1caf84d60066840be/mojave/icons/structure/crates.dmi, converted & additional states modified by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "lock"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/open.png
new file mode 100644
index 00000000000..5eaada83948
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/welded.png
new file mode 100644
index 00000000000..2af808afb3e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/medicalcrate.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/base.png
new file mode 100644
index 00000000000..1ede687689c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/closed.png
new file mode 100644
index 00000000000..226128bed7e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/icon.png
new file mode 100644
index 00000000000..c59bb7ae208
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/lock.png b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/lock.png
new file mode 100644
index 00000000000..cb3c8e710cc
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/lock.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/meta.json
new file mode 100644
index 00000000000..4a70ffccd86
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/b35ff6e7f1b94108e0b934a1caf84d60066840be/mojave/icons/structure/crates.dmi, converted & additional states modified by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "lock"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/open.png
new file mode 100644
index 00000000000..5c44ebd1f3d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/welded.png
new file mode 100644
index 00000000000..2af808afb3e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/redcrate.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/base.png
new file mode 100644
index 00000000000..ade5f8427e3
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/closed.png
new file mode 100644
index 00000000000..f23806fbd0e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/icon.png
new file mode 100644
index 00000000000..c197616dee9
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/meta.json
new file mode 100644
index 00000000000..3e766f497f3
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from Nukapop13, states created / modified by Peptide90 for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/open.png
new file mode 100644
index 00000000000..a99a2cc6b08
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashbin.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png
index 85d7c299925..e993cd2c57a 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png
index 1c11bc8942e..4e3de205d81 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png
index 6c212de3288..e3af2c40f52 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png
index 58f97286f2c..ef403abeb83 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png
index cad0a0f18a1..06b25dfb7e6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/army_crate-1.png b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/army_crate-1.png
new file mode 100644
index 00000000000..41652078229
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/army_crate-1.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/army_crate-2.png b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/army_crate-2.png
new file mode 100644
index 00000000000..c2fd123bcf2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/army_crate-2.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/army_crate.png b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/army_crate.png
new file mode 100644
index 00000000000..a4d20f49920
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/army_crate.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/meta.json
new file mode 100644
index 00000000000..cecaa5ed225
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/b35ff6e7f1b94108e0b934a1caf84d60066840be/mojave/icons/structure/crates.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "wood_crate"
+    },
+    {
+      "name": "plain_crate"
+    },
+    {
+      "name": "plain_crate-1"
+    },
+    {
+      "name": "plain_crate-2"
+    },
+    {
+      "name": "plain_crate-3"
+    },
+    {
+      "name": "army_crate"
+    },
+    {
+      "name": "army_crate-1"
+    },
+    {
+      "name": "army_crate-2"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate-1.png b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate-1.png
new file mode 100644
index 00000000000..19aeff684c2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate-1.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate-2.png b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate-2.png
new file mode 100644
index 00000000000..f394aa4f413
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate-2.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate-3.png b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate-3.png
new file mode 100644
index 00000000000..40e261ef695
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate-3.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate.png b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate.png
new file mode 100644
index 00000000000..5f45c1ec8b4
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/plain_crate.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/wood_crate.png b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/wood_crate.png
new file mode 100644
index 00000000000..01ddb55466f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/woodencrates.rsi/wood_crate.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodenfootlocker.rsi/footlocker_wood.png b/Resources/Textures/Structures/Storage/Crates/woodenfootlocker.rsi/footlocker_wood.png
new file mode 100644
index 00000000000..2128d861de4
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/woodenfootlocker.rsi/footlocker_wood.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodenfootlocker.rsi/footlocker_woodopen.png b/Resources/Textures/Structures/Storage/Crates/woodenfootlocker.rsi/footlocker_woodopen.png
new file mode 100644
index 00000000000..d074186536a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/woodenfootlocker.rsi/footlocker_woodopen.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/woodenfootlocker.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/woodenfootlocker.rsi/meta.json
new file mode 100644
index 00000000000..7084feb0b6c
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/woodenfootlocker.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/b35ff6e7f1b94108e0b934a1caf84d60066840be/mojave/icons/structure/crates.dmi,  converted & additional states modified by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "footlocker_wood",
+      "directions": 4
+    },
+    {
+      "name": "footlocker_woodopen",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Furniture/safe.rsi/closet.png b/Resources/Textures/Structures/Storage/Furniture/safe.rsi/closet.png
new file mode 100644
index 00000000000..918d4196224
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/safe.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/safe.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Furniture/safe.rsi/closet_door.png
new file mode 100644
index 00000000000..5fe03e1df3e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/safe.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/safe.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Furniture/safe.rsi/closet_open.png
new file mode 100644
index 00000000000..a141d00a720
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/safe.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/safe.rsi/meta.json b/Resources/Textures/Structures/Storage/Furniture/safe.rsi/meta.json
new file mode 100644
index 00000000000..a8b78d972ba
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Furniture/safe.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/734c2aba4549814549d0fa7a9aa2e2d03ec1a2da/mojave/icons/structure/storage.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet_open"
+    },
+    {
+      "name": "welded"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Furniture/safe.rsi/welded.png b/Resources/Textures/Structures/Storage/Furniture/safe.rsi/welded.png
new file mode 100644
index 00000000000..be8c7964677
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/safe.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/closet.png b/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/closet.png
new file mode 100644
index 00000000000..dc80405ac96
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/closet.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/closet_door.png b/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/closet_door.png
new file mode 100644
index 00000000000..3d7d3e0a263
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/closet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/closet_open.png b/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/closet_open.png
new file mode 100644
index 00000000000..a5e6a362cba
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/closet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/meta.json b/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/meta.json
new file mode 100644
index 00000000000..a8b78d972ba
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/734c2aba4549814549d0fa7a9aa2e2d03ec1a2da/mojave/icons/structure/storage.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closet"
+    },
+    {
+      "name": "closet_door"
+    },
+    {
+      "name": "closet_open"
+    },
+    {
+      "name": "welded"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/welded.png b/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/welded.png
new file mode 100644
index 00000000000..be8c7964677
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/safespinner.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic.png b/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic.png
new file mode 100644
index 00000000000..92ab8b725a9
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic_door.png b/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic_door.png
new file mode 100644
index 00000000000..c293a5e76ea
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic_on.png b/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic_on.png
new file mode 100644
index 00000000000..07cd92ff696
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic_on.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic_open.png b/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic_open.png
new file mode 100644
index 00000000000..b2aacd3c567
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/generic_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/meta.json b/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/meta.json
new file mode 100644
index 00000000000..f3e52394406
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Furniture/washingmachine.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/734c2aba4549814549d0fa7a9aa2e2d03ec1a2da/mojave/icons/structure/storage.dmi, additional states modified by Peptide",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "generic",
+	  "directions": 4
+    },
+    {
+      "name": "generic_door",
+	  "directions": 4
+    },
+    {
+      "name": "generic_open",
+	  "directions": 4
+    },
+    {
+      "name": "generic_on",
+      "delays": [
+        [
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic.png b/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic.png
new file mode 100644
index 00000000000..c53f7e21a50
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic_door.png b/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic_door.png
new file mode 100644
index 00000000000..f8b9e0c20d0
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic_door.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic_on.png b/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic_on.png
new file mode 100644
index 00000000000..6ae719968cf
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic_on.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic_open.png b/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic_open.png
new file mode 100644
index 00000000000..4f33cbf1eb4
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/generic_open.png differ
diff --git a/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/meta.json b/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/meta.json
new file mode 100644
index 00000000000..f3e52394406
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Furniture/washingmachine_industrial.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/734c2aba4549814549d0fa7a9aa2e2d03ec1a2da/mojave/icons/structure/storage.dmi, additional states modified by Peptide",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "generic",
+	  "directions": 4
+    },
+    {
+      "name": "generic_door",
+	  "directions": 4
+    },
+    {
+      "name": "generic_open",
+	  "directions": 4
+    },
+    {
+      "name": "generic_on",
+      "delays": [
+        [
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08,
+          0.08
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/black-closed.png b/Resources/Textures/Structures/Storage/barrels.rsi/black-closed.png
new file mode 100644
index 00000000000..f5588e0a179
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/black-closed.png differ
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/black-full.png b/Resources/Textures/Structures/Storage/barrels.rsi/black-full.png
new file mode 100644
index 00000000000..23f843bf154
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/black-full.png differ
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/black-open.png b/Resources/Textures/Structures/Storage/barrels.rsi/black-open.png
new file mode 100644
index 00000000000..375e98aacb6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/black-open.png differ
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/blue-closed.png b/Resources/Textures/Structures/Storage/barrels.rsi/blue-closed.png
new file mode 100644
index 00000000000..f3d79b683f9
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/blue-closed.png differ
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/blue-open.png b/Resources/Textures/Structures/Storage/barrels.rsi/blue-open.png
new file mode 100644
index 00000000000..e1398fe96ba
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/blue-open.png differ
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/meta.json b/Resources/Textures/Structures/Storage/barrels.rsi/meta.json
new file mode 100644
index 00000000000..595e2ed350b
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/barrels.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Mithrandalf Discord 93652604520767488",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "black-closed"
+    },
+    {
+      "name": "black-full"
+    },
+	{
+      "name": "black-open"
+    },
+	{
+      "name": "blue-closed"
+    },
+	{
+      "name": "blue-open"
+    },
+	{
+      "name": "red-closed"
+    },
+	{
+      "name": "red-full"
+    },
+	{
+      "name": "red-open"
+    },
+	{
+      "name": "yellow-closed"
+    },
+	{
+      "name": "yellow-full"
+    },
+	{
+      "name": "yellow-open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/red-closed.png b/Resources/Textures/Structures/Storage/barrels.rsi/red-closed.png
new file mode 100644
index 00000000000..d2e93a9076a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/red-closed.png differ
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/red-full.png b/Resources/Textures/Structures/Storage/barrels.rsi/red-full.png
new file mode 100644
index 00000000000..d464a1094c5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/red-full.png differ
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/red-open.png b/Resources/Textures/Structures/Storage/barrels.rsi/red-open.png
new file mode 100644
index 00000000000..fe6acfebacb
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/red-open.png differ
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/yellow-closed.png b/Resources/Textures/Structures/Storage/barrels.rsi/yellow-closed.png
new file mode 100644
index 00000000000..3f8f967c9dd
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/yellow-closed.png differ
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/yellow-full.png b/Resources/Textures/Structures/Storage/barrels.rsi/yellow-full.png
new file mode 100644
index 00000000000..430139d3382
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/yellow-full.png differ
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/yellow-open.png b/Resources/Textures/Structures/Storage/barrels.rsi/yellow-open.png
new file mode 100644
index 00000000000..34f2c4373f2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/barrels.rsi/yellow-open.png differ
diff --git a/Resources/Textures/Structures/Storage/burningbarrel.rsi/burnbarrel.png b/Resources/Textures/Structures/Storage/burningbarrel.rsi/burnbarrel.png
new file mode 100644
index 00000000000..769a962390d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/burningbarrel.rsi/burnbarrel.png differ
diff --git a/Resources/Textures/Structures/Storage/burningbarrel.rsi/burnbarrel_lit.png b/Resources/Textures/Structures/Storage/burningbarrel.rsi/burnbarrel_lit.png
new file mode 100644
index 00000000000..f9f7c42808f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/burningbarrel.rsi/burnbarrel_lit.png differ
diff --git a/Resources/Textures/Structures/Storage/burningbarrel.rsi/meta.json b/Resources/Textures/Structures/Storage/burningbarrel.rsi/meta.json
new file mode 100644
index 00000000000..e9ea220d55a
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/burningbarrel.rsi/meta.json
@@ -0,0 +1,51 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "https://github.com/BadDeathclaw/Drymouth-Gulch/commit/63d5cc6913885fd4b481b5ffcc980726c2dedca9",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "burnbarrel"
+    },
+    {
+      "name": "burnbarrel_lit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          1,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/firstaid.png b/Resources/Textures/Structures/Storage/storage.rsi/firstaid.png
new file mode 100644
index 00000000000..ddb1dd3887c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/firstaid.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/firstaid_door.png b/Resources/Textures/Structures/Storage/storage.rsi/firstaid_door.png
new file mode 100644
index 00000000000..7abcc07275b
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/firstaid_door.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/firstaid_open.png b/Resources/Textures/Structures/Storage/storage.rsi/firstaid_open.png
new file mode 100644
index 00000000000..e1df54b1528
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/firstaid_open.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/fridge.png b/Resources/Textures/Structures/Storage/storage.rsi/fridge.png
new file mode 100644
index 00000000000..56b742cb6d7
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/fridge.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/fridge_door.png b/Resources/Textures/Structures/Storage/storage.rsi/fridge_door.png
new file mode 100644
index 00000000000..1df343df516
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/fridge_door.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/fridge_open.png b/Resources/Textures/Structures/Storage/storage.rsi/fridge_open.png
new file mode 100644
index 00000000000..6e9d2d3cc88
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/fridge_open.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/locker.png b/Resources/Textures/Structures/Storage/storage.rsi/locker.png
new file mode 100644
index 00000000000..7459220d3ce
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/locker.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/locker_door.png b/Resources/Textures/Structures/Storage/storage.rsi/locker_door.png
new file mode 100644
index 00000000000..d4dbc54117c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/locker_door.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/locker_loot.png b/Resources/Textures/Structures/Storage/storage.rsi/locker_loot.png
new file mode 100644
index 00000000000..4715931aa19
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/locker_loot.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/locker_open.png b/Resources/Textures/Structures/Storage/storage.rsi/locker_open.png
new file mode 100644
index 00000000000..8298cea36ef
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/locker_open.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/meta.json b/Resources/Textures/Structures/Storage/storage.rsi/meta.json
new file mode 100644
index 00000000000..0c633b526f2
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/storage.rsi/meta.json
@@ -0,0 +1,65 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/734c2aba4549814549d0fa7a9aa2e2d03ec1a2da/mojave/icons/structure/storage.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "fridge"
+    },
+    {
+      "name": "fridge_door"
+    },
+    {
+      "name": "fridge_open"
+    },
+    {
+      "name": "safe_wall"
+    },
+    {
+      "name": "safe_wall-open"
+    },
+    {
+      "name": "firstaid"
+    },
+    {
+      "name": "firstaid_door"
+    },
+    {
+      "name": "firstaid_open"
+    },
+    {
+      "name": "vent"
+    },
+    {
+      "name": "vent-damaged"
+    },
+    {
+      "name": "vent-open"
+    },
+    {
+      "name": "locker"
+    },
+    {
+      "name": "locker_door"
+    },
+    {
+      "name": "locker_open"
+    },
+    {
+      "name": "toolbox"
+    },
+    {
+      "name": "toolbox_open"
+    },
+    {
+      "name": "locker_loot"
+    },
+    {
+      "name": "toolbox_loot"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/safe_wall-open.png b/Resources/Textures/Structures/Storage/storage.rsi/safe_wall-open.png
new file mode 100644
index 00000000000..78af50ad816
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/safe_wall-open.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/safe_wall.png b/Resources/Textures/Structures/Storage/storage.rsi/safe_wall.png
new file mode 100644
index 00000000000..aa13aedfb83
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/safe_wall.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/toolbox.png b/Resources/Textures/Structures/Storage/storage.rsi/toolbox.png
new file mode 100644
index 00000000000..ad66f69275c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/toolbox.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/toolbox_loot.png b/Resources/Textures/Structures/Storage/storage.rsi/toolbox_loot.png
new file mode 100644
index 00000000000..a6c8df90bc6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/toolbox_loot.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/toolbox_open.png b/Resources/Textures/Structures/Storage/storage.rsi/toolbox_open.png
new file mode 100644
index 00000000000..fcec1e456a7
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/toolbox_open.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/vent-damaged.png b/Resources/Textures/Structures/Storage/storage.rsi/vent-damaged.png
new file mode 100644
index 00000000000..72a77a24a4c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/vent-damaged.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/vent-open.png b/Resources/Textures/Structures/Storage/storage.rsi/vent-open.png
new file mode 100644
index 00000000000..285ef2a2b04
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/vent-open.png differ
diff --git a/Resources/Textures/Structures/Storage/storage.rsi/vent.png b/Resources/Textures/Structures/Storage/storage.rsi/vent.png
new file mode 100644
index 00000000000..9d0f46b8121
Binary files /dev/null and b/Resources/Textures/Structures/Storage/storage.rsi/vent.png differ
diff --git a/Resources/Textures/Structures/Storage/tanksx64.rsi/chemical_container.png b/Resources/Textures/Structures/Storage/tanksx64.rsi/chemical_container.png
new file mode 100644
index 00000000000..c7365021975
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanksx64.rsi/chemical_container.png differ
diff --git a/Resources/Textures/Structures/Storage/tanksx64.rsi/chemical_container_broken.png b/Resources/Textures/Structures/Storage/tanksx64.rsi/chemical_container_broken.png
new file mode 100644
index 00000000000..41b8d120b75
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanksx64.rsi/chemical_container_broken.png differ
diff --git a/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank.png b/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank.png
new file mode 100644
index 00000000000..93813f60145
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank.png differ
diff --git a/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank_chemical.png b/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank_chemical.png
new file mode 100644
index 00000000000..58329e55380
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank_chemical.png differ
diff --git a/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank_chemical_huge.png b/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank_chemical_huge.png
new file mode 100644
index 00000000000..91b49aff422
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank_chemical_huge.png differ
diff --git a/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank_pipe.png b/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank_pipe.png
new file mode 100644
index 00000000000..22bb887022e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanksx64.rsi/largetank_pipe.png differ
diff --git a/Resources/Textures/Structures/Storage/tanksx64.rsi/meta.json b/Resources/Textures/Structures/Storage/tanksx64.rsi/meta.json
new file mode 100644
index 00000000000..77176b72431
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/tanksx64.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/aa171b6d7dda4a58168013a60e44f10165f2678d/mojave/icons/structure/tank.dmi",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "largetank"
+    },
+    {
+      "name": "largetank_chemical"
+    },
+    {
+      "name": "largetank_pipe"
+    },
+    {
+      "name": "largetank_chemical_huge"
+    },
+    {
+      "name": "chemical_container"
+    },
+    {
+      "name": "chemical_container_broken"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Wallmounts/hydrant.rsi/closed.png b/Resources/Textures/Structures/Wallmounts/hydrant.rsi/closed.png
new file mode 100644
index 00000000000..149353076dd
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/hydrant.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/hydrant.rsi/frame.png b/Resources/Textures/Structures/Wallmounts/hydrant.rsi/frame.png
new file mode 100644
index 00000000000..504c12ecac9
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/hydrant.rsi/frame.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/hydrant.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/hydrant.rsi/meta.json
new file mode 100644
index 00000000000..b03441e364e
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/hydrant.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "By Peptide90 for Nuclear14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closed"
+    },
+    {
+      "name": "frame"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Wallmounts/hydrant.rsi/open.png b/Resources/Textures/Structures/Wallmounts/hydrant.rsi/open.png
new file mode 100644
index 00000000000..dcb8f484ab9
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/hydrant.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/closed.png b/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/closed.png
new file mode 100644
index 00000000000..8e44b2457ae
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/frame.png b/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/frame.png
new file mode 100644
index 00000000000..c345cb331c0
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/frame.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/meta.json
new file mode 100644
index 00000000000..b03441e364e
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "By Peptide90 for Nuclear14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closed"
+    },
+    {
+      "name": "frame"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/open.png b/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/open.png
new file mode 100644
index 00000000000..eef4e7e0900
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/hydrantold.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/base.png b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/base.png
new file mode 100644
index 00000000000..d4424fe40d1
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/broken.png
new file mode 100644
index 00000000000..cd939620239
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/burned.png
new file mode 100644
index 00000000000..7bf5ea45553
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/burned.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/empty.png
new file mode 100644
index 00000000000..91070999ae9
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/empty.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/glow.png
new file mode 100644
index 00000000000..da0b0a35ae3
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/glow.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/meta.json
new file mode 100644
index 00000000000..c0849a2dc30
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/lightbulbcaged.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from Nukapop13, glow by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "glow",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "empty",
+      "directions": 4
+    },
+    {
+      "name": "burned",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Wallmounts/noticeboard.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/noticeboard.rsi/meta.json
index f5d234d91bc..0e9dc64e4bf 100644
--- a/Resources/Textures/Structures/Wallmounts/noticeboard.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/noticeboard.rsi/meta.json
@@ -1,32 +1,32 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "copyright": "Taken from Paradise Station from commit https://github.com/ParadiseSS13/Paradise/commit/137338f4dd3cb33124ab3fbd55a4865dd2bdab81",
-  "license": "CC-BY-SA-3.0",
-  "states": [
-    {
-      "name": "noticeboard"
+    "version": 1,
+    "size": {
+      "x": 32,
+      "y": 32
     },
-    {
-      "name": "notice-0"
-    },
-    {
-      "name": "notice-1"
-    },
-    {
-      "name": "notice-2"
-    },
-    {
-      "name": "notice-3"
-    },
-    {
-      "name": "notice-4"
-    },
-    {
-      "name": "notice-5"
-    }
-  ]
-}
+    "copyright": "created by maxxorion",
+    "license": "CC-BY-SA-3.0",
+    "states": [
+      {
+        "name": "noticeboard"
+      },
+      {
+        "name": "notice-0"
+      },
+      {
+        "name": "notice-1"
+      },
+      {
+        "name": "notice-2"
+      },
+      {
+        "name": "notice-3"
+      },
+      {
+        "name": "notice-4"
+      },
+      {
+        "name": "notice-5"
+      }
+    ]
+  }
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Wallmounts/noticeboard.rsi/noticeboard.png b/Resources/Textures/Structures/Wallmounts/noticeboard.rsi/noticeboard.png
index 378577afdcc..72e885c223c 100644
Binary files a/Resources/Textures/Structures/Wallmounts/noticeboard.rsi/noticeboard.png and b/Resources/Textures/Structures/Wallmounts/noticeboard.rsi/noticeboard.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/bar.png b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/bar.png
new file mode 100644
index 00000000000..dd58e640056
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/bar.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/clinic.png b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/clinic.png
new file mode 100644
index 00000000000..02b39be4e5b
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/clinic.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/meta.json
new file mode 100644
index 00000000000..0fea77ce0a4
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/meta.json
@@ -0,0 +1,48 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/6fde5cf64e584727ce66d92d81352801670e172f",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+    "name": "open_on",
+	"delays": [
+		[
+			1,
+			1,
+			1,
+			1
+		]
+	]
+    },
+    {
+    "name": "rent"
+    },
+    {
+    "name": "bar"
+    },
+    {
+    "name": "clinic"
+    },
+    {
+    "name": "open"
+    },
+    {
+    "name": "open_bar"
+    },
+    {
+    "name": "open_bar_on",
+	"delays": [
+		[
+			1,
+			1,
+			1,
+			1
+		]
+	]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open.png b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open.png
new file mode 100644
index 00000000000..c0253e54007
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open_bar.png b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open_bar.png
new file mode 100644
index 00000000000..a3db90816fc
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open_bar.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open_bar_on.png b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open_bar_on.png
new file mode 100644
index 00000000000..56beba50d3a
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open_bar_on.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open_on.png b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open_on.png
new file mode 100644
index 00000000000..47ca73a0f61
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/open_on.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/rent.png b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/rent.png
new file mode 100644
index 00000000000..640ed4326d2
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_32x32.rsi/rent.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/bazaar_on.png b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/bazaar_on.png
new file mode 100644
index 00000000000..d7907e3a419
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/bazaar_on.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/hotel.png b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/hotel.png
new file mode 100644
index 00000000000..a1a6d5a5188
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/hotel.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/meta.json
new file mode 100644
index 00000000000..bedad018567
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/6fde5cf64e584727ce66d92d81352801670e172f",
+  "size": {
+    "x": 64,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "workers"
+    },
+    {
+      "name": "bazaar_on"
+    },
+    {
+      "name": "hotel"
+    },
+    {
+      "name": "private"
+    },
+    {
+      "name": "we_open_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/private.png b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/private.png
new file mode 100644
index 00000000000..2e18cb26129
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/private.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/we_open_open.png b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/we_open_open.png
new file mode 100644
index 00000000000..adf35156db8
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/we_open_open.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/workers.png b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/workers.png
new file mode 100644
index 00000000000..d55d828b608
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs_64x32.rsi/workers.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/vdu.rsi/VDU.png b/Resources/Textures/Structures/Wallmounts/vdu.rsi/VDU.png
new file mode 100644
index 00000000000..8cbddf529a4
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/vdu.rsi/VDU.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/vdu.rsi/keyboard.png b/Resources/Textures/Structures/Wallmounts/vdu.rsi/keyboard.png
new file mode 100644
index 00000000000..8f27951d9c3
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/vdu.rsi/keyboard.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/vdu.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/vdu.rsi/meta.json
new file mode 100644
index 00000000000..5dc376d26e3
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/vdu.rsi/meta.json
@@ -0,0 +1,57 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "By PatoGrone for . Screen by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "keyboard",
+	  "directions": 4
+    },
+    {
+      "name": "screen",
+	  "directions": 4,
+      "delays": [
+        [
+          1,
+          1,
+          1,
+          1,
+          1,
+          1
+        ],
+        [
+          1,
+          1,
+          1,
+          1,
+          1,
+          1
+        ],
+        [
+          1,
+          1,
+          1,
+          1,
+          1,
+          1
+        ],
+        [
+          1,
+          1,
+          1,
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "VDU",
+	  "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/vdu.rsi/screen.png b/Resources/Textures/Structures/Wallmounts/vdu.rsi/screen.png
new file mode 100644
index 00000000000..889dc80bab3
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/vdu.rsi/screen.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/calendar.png b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/calendar.png
new file mode 100644
index 00000000000..a95bb7036f3
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/calendar.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/calendar_blank.png b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/calendar_blank.png
new file mode 100644
index 00000000000..107156f2872
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/calendar_blank.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/clock.png b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/clock.png
new file mode 100644
index 00000000000..70928a39f04
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/clock.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/cross.png b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/cross.png
new file mode 100644
index 00000000000..3ad7875071d
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/cross.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/danger_sign.png b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/danger_sign.png
new file mode 100644
index 00000000000..f9d715025ff
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/danger_sign.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/exit.png b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/exit.png
new file mode 100644
index 00000000000..75f3b5a5d07
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/exit.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/meta.json
new file mode 100644
index 00000000000..64c4a8da70f
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/be7a9f24f2bca68f07e4b0b086dc03a3eb9f971f/mojave/icons/structure/wall_decor.dmi. Wanted goose poster by maxxorion",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "clock",
+      "directions": 4
+    },
+    {
+      "name": "calendar"
+    },
+    {
+      "name": "calendar_blank"
+    },
+    {
+      "name": "notice_sign"
+    },
+    {
+      "name": "danger_sign"
+    },
+    {
+      "name": "wanted_poster"
+    },
+    {
+      "name": "cross"
+    },
+    {
+      "name": "exit",
+      "directions": 4
+    },
+    {
+      "name": "wallscreen",
+      "directions": 4
+    },
+	{
+	  "name": "wanted_poster_goose"
+	}
+  ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/notice_sign.png b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/notice_sign.png
new file mode 100644
index 00000000000..2fca121f942
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/notice_sign.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/wallscreen.png b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/wallscreen.png
new file mode 100644
index 00000000000..e18cc520dc2
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/wallscreen.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/wanted_poster.png b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/wanted_poster.png
new file mode 100644
index 00000000000..9a5d3cb8486
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/wanted_poster.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/walldecor.rsi/wanted_poster_goose.png b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/wanted_poster_goose.png
new file mode 100644
index 00000000000..afde4b545fa
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/walldecor.rsi/wanted_poster_goose.png differ
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 87df8c1eec8..68b84c7fe2e 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -468,9 +468,6 @@ binds:
 - function: OpenDecalSpawnWindow
   type: State
   key: F8
-- function: OpenScoreboardWindow
-  type: State
-  key: F9
 - function: OpenSandboxWindow
   type: State
   key: B