diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml
new file mode 100644
index 0000000000..a8ccdf5952
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml
@@ -0,0 +1,52 @@
+- type: entity
+  name: wooden bed
+  id: CP14WoodenBed
+  parent: BaseStructure
+  description: Wooden bed. Better than nothing.
+  components:
+  - type: HealOnBuckle
+    damage:
+      types:
+        Poison: -0.1
+        Blunt: -0.1
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.05"
+        density: 190
+        mask:
+        - TableMask
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/wooden_bed.rsi
+    state: icon
+    noRot: true
+  - type: Strap
+    position: Down
+    rotation: -90
+  - type: PlaceableSurface
+    placeCentered: true
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 75
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 1
+            max: 2
+  - type: Transform
+    anchored: true
+    noRot: true
+  - type: Anchorable
+  - type: Pullable
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/dressers.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/dressers.yml
new file mode 100644
index 0000000000..d791df5293
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/dressers.yml
@@ -0,0 +1,162 @@
+- type: entity
+  id: CP14DresserBase
+  parent: BaseStructure
+  abstract: true
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+      - map: [ base ]
+        state: icon
+  - type: Storage
+    grid:
+    - 0,0,6,3
+    maxItemSize: Normal
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: GenericVisualizer
+    visuals:
+      enum.StorageVisuals.Open:
+        base:
+          True: { state: icon-open }
+          False: { state: icon }
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.25,0.45,0.55"
+        density: 155
+        mask:
+        - MachineMask
+        layer:
+        - WallLayer
+  - type: InteractionOutline
+  - type: Clickable
+  - type: Anchorable
+  - type: Rotatable
+  - type: Appearance
+
+- type: entity
+  id: CP14ClosetBase
+  parent: BaseStructureDynamic
+  name: closet
+  description: Just an ordinary, decrepit closet.
+  abstract: true
+  components:
+  - type: ResistLocker
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: base_door
+      map: ["enum.StorageVisualLayers.Door"]
+  - type: MovedByPressure
+  - type: ItemSlots
+  - type: DamageOnHighSpeedImpact
+    damage:
+      types:
+        Blunt: 5
+    soundHit:
+      collection: MetalThud
+  - type: InteractionOutline
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.48,0.45,0.28"
+        density: 75
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+  - type: EntityStorage
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+      paper_label: !type:ContainerSlot
+  - type: PlaceableSurface
+    placeCentered: true
+    isPlaceable: false
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: base
+    stateDoorOpen: base_open
+    stateDoorClosed: base_door
+  - type: StaticPrice
+    price: 50
+  - type: Anchorable
+  - type: Rotatable
+
+- type: entity
+  name: wooden dresser
+  parent:
+  - CP14DresserBase
+  - CP14BaseWooden
+  id: CP14WoodenDresser
+  description: A regular wooden dresser.
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Storage/Dressers/wood_dresser.rsi
+    state: icons
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14WoodenPlanks1:
+            min: 3
+            max: 3
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  name: wooden cupboard
+  parent:
+  - CP14ClosetBase
+  - CP14BaseWooden
+  id: CP14WoodenCupboard
+  description: It's a regular wooden cabinet.
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Storage/Dressers/wood_cupboard.rsi
+    state: icons
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+          params:
+            volume: -6
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14WoodenPlanks1:
+            min: 1
+            max: 1
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml
similarity index 67%
rename from Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml
rename to Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml
index 243f8cee16..bba5976986 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml
@@ -1,7 +1,6 @@
 - type: entity
-  id: CP14WallmountTorch
-  name: wallmount torch
-  description: A good, reliable light source. Too bad it doesn't last.
+  id: BaseWallmount
+  abstract: true
   placement:
     mode: SnapgridCenter
   components:
@@ -11,6 +10,14 @@
   - type: InteractionOutline
   - type: Sprite
     drawdepth: Mobs
+
+- type: entity
+  id: CP14WallmountTorch
+  name: wallmount torch
+  parent: BaseWallmount
+  description: A good, reliable light source. Too bad it doesn't last.
+  components:
+  - type: Sprite
     sprite: _CP14/Structures/Furniture/wallmount_torch.rsi
     layers:
       - state: base
@@ -74,16 +81,10 @@
 - type: entity
   id: CP14WallmountLamp
   name: eternal flame lamp
+  parent: BaseWallmount
   description: A fragile eternal blue fire as proof of the superiority of magic over nature. 
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Transform
-    anchored: true
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
-    drawdepth: Mobs
     sprite: _CP14/Structures/Wallmount/wallmount_lamp.rsi
     layers:
       - state: base
@@ -105,4 +106,50 @@
           damage: 40
         behaviors:
           - !type:DoActsBehavior
-            acts: [ "Destruction" ]
\ No newline at end of file
+            acts: [ "Destruction" ]
+
+- type: entity
+  id: CP14WallmountBarShelfA
+  name: bar shelf
+  suffix: 1
+  parent: BaseWallmount
+  description: buba. ##TODO 
+  components:
+  - type: Appearance
+  - type: Sprite
+    sprite: _CP14/Structures/Wallmount/wallmount_bar_shelf.rsi
+    layers:
+    - state: shelf
+    - state: bottleA-0
+    - map: ["enum.StorageFillLayers.Fill"]
+  - type: StorageFillVisualizer
+    maxFillLevels: 7
+    fillBaseName: bottleA
+  - type: Storage
+    grid:
+    - 0,0,5,3
+    maxItemSize: Normal
+##   whitelist:                TODO
+##     tags:
+##       - CP14Bottles 
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+
+- type: entity
+  id: CP14WallmountBarShelfB
+  suffix: 2
+  parent: CP14WallmountBarShelfA
+  components:
+  - type: Sprite
+    layers:
+    - state: shelf
+    - state: bottleB-0
+    - map: ["enum.StorageFillLayers.Fill"]
+  - type: StorageFillVisualizer
+    fillBaseName: bottleB
+
diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml
index ea0e446fd6..4ed2fc27ee 100644
--- a/Resources/Prototypes/_CP14/tags.yml
+++ b/Resources/Prototypes/_CP14/tags.yml
@@ -20,4 +20,7 @@
   id: CP14FitInMortar
 
 - type: Tag
-  id: CP14Pestle
\ No newline at end of file
+  id: CP14Pestle
+
+- type: Tag
+  id: CP14Bottles
diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log.png
index bc15fda2d0..756ead6a85 100644
Binary files a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log.png and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_2.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_2.png
index 46e572e573..b34d92a163 100644
Binary files a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_2.png and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_2.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_3.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_3.png
index 8cc2aae439..5e428ab66e 100644
Binary files a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_3.png and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_3.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks.png
index 26d6542ced..0bc3a57f12 100644
Binary files a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks.png and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_2.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_2.png
index 62e4c08502..277f0a1df2 100644
Binary files a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_2.png and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_2.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_3.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_3.png
index d1bca4799b..11cc22e534 100644
Binary files a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_3.png and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/full.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/full.png
index 3023c66262..2fc62d7212 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/full.png and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/full.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state0.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state0.png
index 442fae843e..c69318746f 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state0.png and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state0.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state1.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state1.png
index fd509e4cef..40b992e7f1 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state1.png and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state1.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state2.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state2.png
index 442fae843e..c69318746f 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state2.png and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state2.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state3.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state3.png
index efde151cb5..5a40616261 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state3.png and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state4.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state4.png
index d21ef0eaba..43f78e7e32 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state4.png and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state4.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state5.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state5.png
index 7e587556ff..798082c9cb 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state5.png and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state5.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state6.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state6.png
index e176ccc3d9..eca55406bf 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state6.png and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state6.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state7.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state7.png
index dd2a5c2355..1b836554c7 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state7.png and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/state7.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/barrel.png b/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/barrel.png
index 845e8c1758..1a9a209a1a 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/barrel.png and b/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/barrel.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/barrel_open.png b/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/barrel_open.png
index 263b609086..bcb7384f5f 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/barrel_open.png and b/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/barrel_open.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/meta.json
index f12f364970..e81a1b6c60 100644
--- a/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by Prazat, modified by TheShuEd",
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by Prazat, modified by TheShuEd and Jaraten",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/wooden.png b/Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/wooden.png
index 1fa79c18aa..d07f3d7241 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/wooden.png and b/Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/wooden.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/icon.png b/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/icon.png
new file mode 100644
index 0000000000..07a14e9f88
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/icon.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/meta.json
new file mode 100644
index 0000000000..7b2f61f4c3
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "All rights reserved for the CrystallPunk14 project only",
+    "copyright": "Created by jaraten(discord) for CrystallPunk14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Storage/Crates/brasschest.rsi/base.png b/Resources/Textures/_CP14/Structures/Storage/Crates/brasschest.rsi/base.png
index bb41020648..c3e4a6834e 100644
Binary files a/Resources/Textures/_CP14/Structures/Storage/Crates/brasschest.rsi/base.png and b/Resources/Textures/_CP14/Structures/Storage/Crates/brasschest.rsi/base.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Crates/brasschest.rsi/icon.png b/Resources/Textures/_CP14/Structures/Storage/Crates/brasschest.rsi/icon.png
index 9fdfc2a594..1ee6da9289 100644
Binary files a/Resources/Textures/_CP14/Structures/Storage/Crates/brasschest.rsi/icon.png and b/Resources/Textures/_CP14/Structures/Storage/Crates/brasschest.rsi/icon.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base.png b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base.png
new file mode 100644
index 0000000000..872ca78ef1
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base_door.png b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base_door.png
new file mode 100644
index 0000000000..20338d50a6
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base_door.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base_open.png b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base_open.png
new file mode 100644
index 0000000000..5a644f6a4d
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base_open.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/meta.json b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/meta.json
new file mode 100644
index 0000000000..514db827b8
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by jaraten(discord) for CrystallPunk14",
+  "size": {
+    "x": 32,
+    "y": 96
+  },
+  "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "base_open",
+      "directions": 4
+    },
+    {
+      "name": "base_door",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/icon-open.png b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/icon-open.png
new file mode 100644
index 0000000000..ff0e61b779
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/icon-open.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/icon.png b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/icon.png
new file mode 100644
index 0000000000..56d1c1f8dd
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/icon.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/meta.json b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/meta.json
new file mode 100644
index 0000000000..72c93d768b
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by jaraten(discord) for CrystallPunk14",
+  "size": {
+    "x": 32,
+    "y": 96
+  },
+  "states": [
+    {
+      "name": "icon",
+      "directions": 4
+    },
+    {
+      "name": "icon-open",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-0.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-0.png
new file mode 100644
index 0000000000..18eddecad8
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-0.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-1.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-1.png
new file mode 100644
index 0000000000..06ef6f97cd
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-1.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-2.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-2.png
new file mode 100644
index 0000000000..762378db6f
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-2.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-3.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-3.png
new file mode 100644
index 0000000000..a650200ea1
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-4.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-4.png
new file mode 100644
index 0000000000..4550b54044
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-4.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-5.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-5.png
new file mode 100644
index 0000000000..e82f7315ac
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-5.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-6.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-6.png
new file mode 100644
index 0000000000..550a4751e8
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleA-6.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-0.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-0.png
new file mode 100644
index 0000000000..18eddecad8
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-0.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-1.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-1.png
new file mode 100644
index 0000000000..4c424de167
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-1.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-2.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-2.png
new file mode 100644
index 0000000000..015f1193c2
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-2.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-3.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-3.png
new file mode 100644
index 0000000000..42ce87915e
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-4.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-4.png
new file mode 100644
index 0000000000..5874897439
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-4.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-5.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-5.png
new file mode 100644
index 0000000000..5281827ca2
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-5.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-6.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-6.png
new file mode 100644
index 0000000000..6e3cf75bed
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/bottleB-6.png differ
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/meta.json
new file mode 100644
index 0000000000..1ac0bead77
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/meta.json
@@ -0,0 +1,71 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by jaraten(discord) for CrystallPunk14",
+    "size": {
+        "x": 32,
+        "y": 96
+    },
+    "states": [
+        {
+            "name": "bottleA-0",
+            "directions": 4
+        },
+        {
+            "name": "shelf",
+            "directions": 4
+        },
+        {
+            "name": "bottleA-1",
+            "directions": 4
+        },
+        {
+            "name": "bottleA-2",
+            "directions": 4
+        },
+        {
+            "name": "bottleA-3",
+            "directions": 4
+        },
+        {
+            "name": "bottleA-4",
+            "directions": 4
+        },
+        {
+            "name": "bottleA-5",
+            "directions": 4
+        },
+        {
+            "name": "bottleA-6",
+            "directions": 4
+        },
+        {
+            "name": "bottleB-0",
+            "directions": 4
+        },
+        {
+            "name": "bottleB-1",
+            "directions": 4
+        },
+        {
+            "name": "bottleB-2",
+            "directions": 4
+        },
+        {
+            "name": "bottleB-3",
+            "directions": 4
+        },
+        {
+            "name": "bottleB-4",
+            "directions": 4
+        },
+        {
+            "name": "bottleB-5",
+            "directions": 4
+        },
+        {
+            "name": "bottleB-6",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/shelf.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/shelf.png
new file mode 100644
index 0000000000..5ce8c9106c
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_bar_shelf.rsi/shelf.png differ
diff --git a/Resources/Textures/_CP14/Tiles/stonebricks.png b/Resources/Textures/_CP14/Tiles/stonebricks.png
index 841e2619e7..4a139c0c75 100644
Binary files a/Resources/Textures/_CP14/Tiles/stonebricks.png and b/Resources/Textures/_CP14/Tiles/stonebricks.png differ
diff --git a/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_1.png b/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_1.png
index 9e23317d59..bf406f4109 100644
Binary files a/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_1.png and b/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_1.png differ
diff --git a/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_2.png b/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_2.png
index 225ebf82d7..c512ee639a 100644
Binary files a/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_2.png and b/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_2.png differ
diff --git a/Resources/Textures/_CP14/Tiles/stonebricks_square_carved.png b/Resources/Textures/_CP14/Tiles/stonebricks_square_carved.png
index f517233269..2386f9073a 100644
Binary files a/Resources/Textures/_CP14/Tiles/stonebricks_square_carved.png and b/Resources/Textures/_CP14/Tiles/stonebricks_square_carved.png differ