diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
index 7dc463dd37..85f9b85669 100644
--- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
+++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
@@ -387,7 +387,7 @@ ent-CP14EnergyCrystalMediumEmpty = { ent-CP14EnergyCrystalMedium }
 
 ent-CP14Bucket = ведро
     .desc = Старое скучное ведро
-    .suffix = CP14, Нужен респрайт!
+    .suffix = CP14!
 
 ent-CP14OldLantern = Старая Лампа
     .desc = Пережиток прошлого техномагии. Большой, тяжелый, непрактичный. Таким приятно разве что бить по голове.
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml
index 6e72e5a963..21c2dd879c 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml
@@ -3,14 +3,14 @@
   id: CP14Bucket
   name: bucket
   description: It's a boring old bucket.
-  suffix: CP14, need resprite
+  suffix: CP14
   components: 
   - type: Drink
     solution: bucket
     ignoreEmpty: true
   - type: Clickable
   - type: Sprite
-    sprite: Objects/Tools/bucket.rsi
+    sprite: _CP14/Objects/Tools/wooden_bucket.rsi
     layers:
     - state: icon
     - map: ["enum.SolutionContainerLayers.Fill"]
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml
new file mode 100644
index 0000000000..db8d6036e7
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml
@@ -0,0 +1,126 @@
+- type: entity
+  id: CP14BaseCrate
+  abstract: true
+  parent: BaseStructureDynamic
+  components:
+  - type: InteractionOutline
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:EmptyAllContainersBehaviour
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14WoodenPlanks1:
+            min: 3
+            max: 5
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Climbable
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+      - map: [ base ]
+        state: icon
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.StorageVisuals.Open:
+        base:
+          True: { state: open }
+          False: { state: icon }
+  - type: Storage
+    grid:
+    - 0,0,6,6
+    maxItemSize: Large
+    storageOpenSound: /Audio/Effects/closetopen.ogg
+    storageCloseSound: /Audio/Effects/closetclose.ogg
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: [ ]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        density: 155
+        mask:
+        - MachineMask
+        layer:
+        - WallLayer
+
+- type: entity
+  id: CP14BaseSmallCrate
+  abstract: true
+  parent: CP14BaseCrate
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.3,-0.3,0.3,0.3"
+        density: 95
+        mask:
+        - MachineMask
+        layer:
+        - WallLayer
+  - type: Storage
+    grid:
+    - 0,0,4,4
+    maxItemSize: Normal
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 70
+      behaviors:
+      - !type:EmptyAllContainersBehaviour
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14WoodenPlanks1:
+            min: 3
+            max: 5
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  id: CP14LargeWoodenCrate
+  name: large wooden crate
+  description: solid wooden crate
+  parent: CP14BaseCrate
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Storage/Crates/large_wooden_crate.rsi
+
+- type: entity
+  id: CP14SmallWoodenCrate
+  name: small wooden crate
+  description: solid wooden crate
+  parent: CP14BaseSmallCrate
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Storage/Crates/small_wooden_crate.rsi
diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..903913643c
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-1.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-1.png
new file mode 100644
index 0000000000..71a3395c36
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-1.png differ
diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-2.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-2.png
new file mode 100644
index 0000000000..1a5fa1e3c3
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-2.png differ
diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-3.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-3.png
new file mode 100644
index 0000000000..e58ebe020b
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-3.png differ
diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/icon.png
new file mode 100644
index 0000000000..229c556dce
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/icon.png differ
diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-left.png
new file mode 100644
index 0000000000..423f64af1d
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-right.png
new file mode 100644
index 0000000000..7e4527ed04
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json
new file mode 100644
index 0000000000..31b4c020d9
--- /dev/null
+++ b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by Jaraten (github/discord) for CrystallPunk14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "fill-1"
+    },
+    {
+      "name": "fill-2"
+    },
+    {
+      "name": "fill-3"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/frame.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/frame.png
index 24ad6e9743..ea79d49096 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/frame.png and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/frame.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 2fc62d7212..498d1b5269 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/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/meta.json
index 3ef1c39e63..add7186f00 100644
--- a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "All rights reserved for the CrystallPunk14 project only",
-  "copyright": "Created by TheShuEd (Github) for CrystallPunk14",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk14 and resprite by Jaraten",
   "size": {
     "x": 32,
     "y": 32
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 c69318746f..d008dd6269 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 40b992e7f1..7cf24189d1 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 c69318746f..7647d09109 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 5a40616261..5e325da2c4 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 43f78e7e32..ae23f37912 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 798082c9cb..4c4b40d808 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 eca55406bf..c78b0f4877 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 1b836554c7..ea00da5040 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 1a9a209a1a..06d67e2c2d 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 bcb7384f5f..2d501b0fc5 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/workbench.rsi/melting_crafter.png b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/melting_crafter.png
index 93ddc409e3..d25029e773 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/melting_crafter.png and b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/melting_crafter.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json
index 660a3f67cd..2cc1c23fd9 100644
--- a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json
@@ -3,8 +3,8 @@
   "license": "All rights reserved for the CrystallPunk14 project only",
   "copyright": "Created by jaraten(discord) for CrystallPunk14",
   "size": {
-    "x": 32,
-    "y": 32
+    "x": 48,
+    "y": 48
   },
   "states": [
     {
diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/workbench.png b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/workbench.png
index 67b5171331..049ba90123 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/workbench.png and b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/workbench.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Crates/large_wooden_crate.rsi/icon.png b/Resources/Textures/_CP14/Structures/Storage/Crates/large_wooden_crate.rsi/icon.png
new file mode 100644
index 0000000000..f29947606b
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Crates/large_wooden_crate.rsi/icon.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Crates/large_wooden_crate.rsi/meta.json b/Resources/Textures/_CP14/Structures/Storage/Crates/large_wooden_crate.rsi/meta.json
new file mode 100644
index 0000000000..4220668b05
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Storage/Crates/large_wooden_crate.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by Jaraten (Github/discord) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Storage/Crates/large_wooden_crate.rsi/open.png b/Resources/Textures/_CP14/Structures/Storage/Crates/large_wooden_crate.rsi/open.png
new file mode 100644
index 0000000000..ea5e66db85
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Crates/large_wooden_crate.rsi/open.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Crates/small_wooden_crate.rsi/icon.png b/Resources/Textures/_CP14/Structures/Storage/Crates/small_wooden_crate.rsi/icon.png
new file mode 100644
index 0000000000..9f74db1d95
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Crates/small_wooden_crate.rsi/icon.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Crates/small_wooden_crate.rsi/meta.json b/Resources/Textures/_CP14/Structures/Storage/Crates/small_wooden_crate.rsi/meta.json
new file mode 100644
index 0000000000..4220668b05
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Storage/Crates/small_wooden_crate.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by Jaraten (Github/discord) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Storage/Crates/small_wooden_crate.rsi/open.png b/Resources/Textures/_CP14/Structures/Storage/Crates/small_wooden_crate.rsi/open.png
new file mode 100644
index 0000000000..5ed0179da3
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Crates/small_wooden_crate.rsi/open.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
index 872ca78ef1..bdd2441438 100644
Binary files a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base.png 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
index 20338d50a6..6e40af7ac0 100644
Binary files a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base_door.png 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
index 5a644f6a4d..039fe04071 100644
Binary files a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/base_open.png 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_dresser.rsi/icon-open.png b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/icon-open.png
index ff0e61b779..d2f04f3ca0 100644
Binary files a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/icon-open.png 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
index 56d1c1f8dd..6a6fd5aa33 100644
Binary files a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/icon.png and b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_dresser.rsi/icon.png differ