From: Sphiral <145869023+SphiraI@users.noreply.github.com>
Date: Sun, 21 Jul 2024 17:16:58 +0000 (-0500)
Subject: The Shelfs Update (#27858)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1e89c075732285672622f020bf06eef02684a437;p=space-station-14.git

The Shelfs Update (#27858)

* goofed up

* wip, mostly test sprites

* Nearly done, just need to fix storage locks

* everything done to my knowledge

* Alright, construction tested and working, and updated health spread

* remove a single comment I forgot. Pending sprite changes.

* Update sprites and add chemistry locked preset

* Forgot to remove a comment
---

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 5d77c91a5d..a51a9a1930 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -78,6 +78,9 @@
     solution: drink
   - type: FitsInDispenser
     solution: drink
+  - type: Tag
+    tags:
+      - DrinkGlass
 
 # Transformable container - normal glass
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index be23c2e43f..f1f30f6c46 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -34,6 +34,9 @@
     solution: food
   - type: TrashOnSolutionEmpty
     solution: food
+  - type: Tag
+    tags:
+      - Ingredient
 
 - type: entity
   abstract: true
@@ -272,6 +275,9 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 15
+  - type: Tag
+    tags:
+      - Ingredient
 
 - type: entity
   name: dough
@@ -684,3 +690,6 @@
       reagents:
       - ReagentId: CocoaPowder
         Quantity: 2
+  - type: Tag
+    tags:
+      - Ingredient
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
new file mode 100644
index 0000000000..af68f5898d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
@@ -0,0 +1,475 @@
+# Parents
+- type: entity
+  abstract: true
+  id: ShelfBase
+  parent: BaseStructure
+  name: shelf
+  description: a strange place to place, well, anything really. You feel like you shouldn't be seeing this.'
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.35,-0.35,0.35,0.35"
+        density: 35
+        layer:
+        - BulletImpassable
+  - type: Transform
+  - type: Damageable
+    damageModifierSet: Wood
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: WallMount
+    arc: 175
+  - type: Storage
+    grid:
+    - 0,0,3,1
+    - 0,3,3,4
+    maxItemSize: Normal
+  - type: UserInterface
+    interfaces:
+     enum.StorageUiKey.Key:
+      type: StorageBoundUserInterface
+  - type: InteractionOutline
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: Tag
+    tags:
+    - Structure
+
+- type: entity
+  abstract: true
+  id: ShelfBaseReinforced
+  parent: ShelfBase
+  name: reinforced shelf
+  description: It looks as strong as reality itself.
+  components:
+  - type: Lock
+  - type: LockVisuals
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+    layers:
+    - state: rbase
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: unlocked
+      shader: unshaded
+      # used to keep the unlocked light visible while open. 
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateDoorOpen: open
+    stateDoorClosed: closed
+
+  - type: AccessReader
+
+# Normal
+- type: entity
+  id: ShelfWood
+  parent: ShelfBase
+  name: wooden shelf
+  description: A convenient place to place, well, anything really.
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank1:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+    - Wooden
+  - type: Construction
+    graph: Shelf
+    node: ShelfWood
+
+- type: entity
+  id: ShelfMetal
+  parent: ShelfBase
+  name: metal shelf
+  description: A sturdy place to place, well, anything really.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: base
+  - type: Damageable
+    damageModifierSet: Metallic
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 120
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+  - type: Construction
+    graph: Shelf
+    node: ShelfMetal
+
+- type: entity
+  id: ShelfGlass
+  parent: ShelfBase
+  name: glass shelf
+  description: A fragile place to place, well, anything really.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: base
+  - type: Damageable
+    damageModifierSet: Glass
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 0
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+  - type: Construction
+    graph: Shelf
+    node: ShelfGlass
+
+# Reinforced
+- type: entity
+  id: ShelfRWood
+  parent: ShelfBaseReinforced
+  name: sturdy wood shelf
+  description: A safe place to put your favorite bottle of whiskey
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+    layers:
+    - state: rbase
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 215
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 2
+            max: 5
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRWood
+
+- type: entity
+  id: ShelfRMetal
+  parent: ShelfBaseReinforced
+  name: sturdy metal shelf
+  description: A strong & shiny place to keep all your vials safe
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/metal.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 450
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 2
+            max: 3
+          ShardGlass:
+            min: 1
+            max: 2
+          PartRodMetal1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRMetal
+
+- type: entity
+  id: ShelfRGlass
+  parent: ShelfBaseReinforced
+  name: sturdy glass shelf
+  description: Crystal clear reinforced glass doors to show off all your fancy bottles you definitely didn't sell a co-worker's favorite mothroach for.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/glass.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 250
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlastic1:
+            min: 1
+            max: 3
+          ShardGlass:
+            min: 1
+            max: 2
+          PartRodMetal1:
+            min: 0
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRGlass
+
+# Departmental
+- type: entity
+  id: ShelfBar
+  parent: ShelfBase
+  name: bar shelf
+  description: Made out of the finest synthetic wood for all alcohol holding needs.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi
+    state: base
+    layers:
+      - state: base
+      - state: bar-0
+      - map: ["enum.StorageFillLayers.Fill"]
+  - type: Appearance
+  - type: StorageFillVisualizer
+    maxFillLevels: 13
+    fillBaseName: bar
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank1:
+            min: 1
+            max: 4
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - DrinkGlass
+        - DrinkBottle
+        - DrinkCan
+        - Beer
+  - type: Construction
+    graph: Shelf
+    node: ShelfBar
+
+- type: entity
+  id: ShelfKitchen
+  parent: ShelfBase
+  name: cooking shelf
+  description: Holds knifes, spice, and everything nice!
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Service/kitchen.rsi
+    state: base
+    layers:
+      - state: base
+      - state: kitchen-0
+      - map: ["enum.StorageFillLayers.Fill"]
+  - type: Appearance
+  - type: StorageFillVisualizer
+    maxFillLevels: 13
+    fillBaseName: kitchen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 4
+          MaterialWoodPlank1:
+            min: 0
+            max: 1
+          PartRodMetal1:
+            min: 0
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - DrinkGlass
+        - BoxCardboard
+        - MonkeyCube
+        - Enzyme
+        - Mayo
+        - Packet
+        - Cleaver
+        - Knife
+        - KitchenKnife
+        - RollingPin
+        - Ingredient
+        - Trash
+  - type: Construction
+    graph: Shelf
+    node: ShelfKitchen
+
+- type: entity
+  id: ShelfChemistry
+  parent: ShelfBaseReinforced
+  name: chemical shelf
+  description: Keeps all your chemicals safe and out of the clow- er, public hands!
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: unlocked
+      shader: unshaded
+    - state: chem-0
+    - map: ["enum.StorageFillLayers.Fill"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: StorageFillVisualizer
+    maxFillLevels: 7
+    fillBaseName: chem
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 330
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 1
+            max: 2
+          SheetPlastic1:
+            min: 1
+            max: 2
+          ShardGlass:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - ChemDispensable
+        - GlassBeaker
+        - Bottle
+  - type: Construction
+    graph: Shelf
+    node: ShelfChemistry
+
+
+
+# Access presets
+# Try to keep alphabetical sorting if adding more
+
+- type: entity
+  parent: ShelfChemistry
+  id: ShelfChemistryChemistrySecure
+  suffix: Chemistry, Secure
+  components:
+  - type: AccessReader
+    access: [["Chemistry"]]
+
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
new file mode 100644
index 0000000000..61a903f7a0
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
@@ -0,0 +1,268 @@
+- type: constructionGraph
+  id: Shelf
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DeleteEntity {}
+      edges:
+# Normal
+        - to: ShelfWood
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 4
+              doAfter: 2
+        - to: ShelfMetal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Steel
+              amount: 5
+              doAfter: 3
+        - to: ShelfGlass
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Glass
+              amount: 4
+              doAfter: 2
+# Reinforced
+        - to: ShelfRWood
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 8
+              doAfter: 3
+            - material: Cable
+              amount: 2
+              doAfter: 1
+        - to: ShelfRMetal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plasteel
+              amount: 5
+              doAfter: 3
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 2
+            - material: Cable
+              amount: 3
+              doAfter: 1
+        - to: ShelfRGlass
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plastic
+              amount: 5
+              doAfter: 2
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 3
+            - material: Cable
+              amount: 2
+              doAfter: 1
+# Departmental
+        - to: ShelfBar
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 6
+              doAfter: 2
+        - to: ShelfKitchen
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 1
+            - material: Steel
+              amount: 5
+            - material: WoodPlank
+              amount: 3
+              doAfter: 2
+        - to: ShelfChemistry
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plasteel
+              amount: 2
+              doAfter: 2
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 2
+            - material: Plastic
+              amount: 5
+              doAfter: 2
+            - material: Cable
+              amount: 2
+              doAfter: 1
+
+# Normal deconstructs
+    - node: ShelfWood
+      entity: ShelfWood
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 4
+          steps:
+            - tool: Prying
+              doAfter: 2
+
+    - node: ShelfMetal
+      entity: ShelfMetal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetSteel1
+                amount: 5
+          steps:
+            - tool: Screwing
+              doAfter: 5
+
+    - node: ShelfGlass
+      entity: ShelfGlass
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetGlass1
+                amount: 4
+          steps:
+            - tool: Screwing
+              doAfter: 2
+# Reinforced deconstructs
+    - node: ShelfRWood
+      entity: ShelfRWood
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 8
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Screwing
+              doAfter: 5
+            - tool: Prying
+              doAfter: 2
+
+    - node: ShelfRMetal
+      entity: ShelfRMetal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetPlasteel1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 3
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 5
+
+    - node: ShelfRGlass
+      entity: ShelfRGlass
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetPlastic1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Welding
+              doAfter: 2
+            - tool: Screwing
+              doAfter: 4
+
+# Departmental deconstructs
+    - node: ShelfBar
+      entity: ShelfBar
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 6
+          steps:
+            - tool: Prying
+              doAfter: 3
+
+    - node: ShelfKitchen
+      entity: ShelfKitchen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: PartRodMetal
+                amount: 2
+            - !type:SpawnPrototype
+                prototype: SheetSteel1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 3
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 2
+            - tool: Prying
+              doAfter: 1
+
+    - node: ShelfChemistry
+      entity: ShelfChemistry
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetPlasteel1
+                amount: 2
+            - !type:SpawnPrototype
+                prototype: SheetPlastic1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Welding
+              doAfter: 2
+            - tool: Screwing
+              doAfter: 1
+            - tool: Anchoring
+              doAfter: 2
+            - tool: Prying
+              doAfter: 4
diff --git a/Resources/Prototypes/Recipes/Construction/storage.yml b/Resources/Prototypes/Recipes/Construction/storage.yml
index c8edebc509..7128c79eee 100644
--- a/Resources/Prototypes/Recipes/Construction/storage.yml
+++ b/Resources/Prototypes/Recipes/Construction/storage.yml
@@ -67,3 +67,151 @@
   canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
+
+# Shelfs
+# Normals
+- type: construction
+  id: ShelfWood
+  name: wooden shelf
+  description: A convenient place to place, well, anything really.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfWood
+  icon:
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfMetal
+  name: metal shelf
+  description: A sturdy place to place, well, anything really.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfMetal
+  icon:
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfGlass
+  name: glass shelf
+  description: Just like a normal shelf! But fragile and without the walls!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfGlass
+  icon:
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+# Reinforced
+- type: construction
+  id: ShelfRWood
+  name: sturdy wooden shelf
+  description: The perfect place to store all your vintage records.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRWood
+  icon:
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfRMetal
+  name: sturdy metal shelf
+  description: Nice and strong, and keeps your maints loot secure.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRMetal
+  icon:
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfRGlass
+  name: sturdy glass shelf
+  description: See through, decent strength, shiny plastic case. Whats not to love?
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRGlass
+  icon:
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+# Departmental
+- type: construction
+  id: ShelfBar
+  name: bar shelf
+  description: A convenient place for all your extra booze, specifically designed to hold more bottles!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfBar
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfKitchen
+  name: cooking shelf
+  description: Holds your knifes, spice, and everything nice!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfKitchen
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Service/kitchen.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfChemistry
+  name: chemical shelf
+  description: Perfect for keeping the most important chemicals safe, and out of the clumsy clowns hands!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfChemistry
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index d7a7f089b1..197966b491 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -542,6 +542,9 @@
 - type: Tag
   id: DrinkCan
 
+- type: Tag
+  id: DrinkGlass
+
 - type: Tag
   id: DrinkSpaceGlue
 
@@ -764,6 +767,9 @@
 - type: Tag
   id: Igniter
 
+- type: Tag
+  id: Ingredient
+
 - type: Tag #Drop this innate tool instead of deleting it.
   id: InnateDontDelete
 
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png
new file mode 100644
index 0000000000..2d67101d2f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png
new file mode 100644
index 0000000000..199a65fb95
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png
new file mode 100644
index 0000000000..47ee108f18
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png
new file mode 100644
index 0000000000..77a54a15ce
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png
new file mode 100644
index 0000000000..ddd26ba627
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png
new file mode 100644
index 0000000000..942f3df3ad
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png
new file mode 100644
index 0000000000..1b7430d809
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png
new file mode 100644
index 0000000000..e415ee1a7e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png
new file mode 100644
index 0000000000..c79f80c0c2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png
new file mode 100644
index 0000000000..3156cb9fa1
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
new file mode 100644
index 0000000000..a3fb20976e
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "chem-0"
+    },
+    {
+      "name": "chem-1"
+    },
+    {
+      "name": "chem-2"
+    },
+    {
+      "name": "chem-3"
+    },
+    {
+      "name": "chem-4"
+    },
+    {
+      "name": "chem-5"
+    },
+    {
+      "name": "chem-6"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png
new file mode 100644
index 0000000000..ce50773db8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png
new file mode 100644
index 0000000000..39d2fb7788
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png
new file mode 100644
index 0000000000..c090326148
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png
new file mode 100644
index 0000000000..7d698e0020
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png
new file mode 100644
index 0000000000..5acb43b179
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png
new file mode 100644
index 0000000000..328ca05ab7
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png
new file mode 100644
index 0000000000..77469720a6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png
new file mode 100644
index 0000000000..5eab596dd4
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png
new file mode 100644
index 0000000000..116080939b
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png
new file mode 100644
index 0000000000..15c03124e6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png
new file mode 100644
index 0000000000..ece06f2d78
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png
new file mode 100644
index 0000000000..8ec7b1f612
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png
new file mode 100644
index 0000000000..e9468e2cdf
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png
new file mode 100644
index 0000000000..d01b2a6bc8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png
new file mode 100644
index 0000000000..b5b86d3e4c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png
new file mode 100644
index 0000000000..ff9dd093b6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
new file mode 100644
index 0000000000..79e0904dd9
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "bar-0"
+    },
+    {
+      "name": "bar-1"
+    },
+    {
+      "name": "bar-2"
+    },
+    {
+      "name": "bar-3"
+    },
+    {
+      "name": "bar-4"
+    },
+    {
+      "name": "bar-5"
+    },
+    {
+      "name": "bar-6"
+    },
+    {
+      "name": "bar-7"
+    },
+    {
+      "name": "bar-8"
+    },
+    {
+      "name": "bar-9"
+    },
+    {
+      "name": "bar-10"
+    },
+    {
+      "name": "bar-11"
+    },
+    {
+      "name": "bar-12"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png
new file mode 100644
index 0000000000..b302518d3d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png
new file mode 100644
index 0000000000..199a65fb95
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png
new file mode 100644
index 0000000000..ded931cadf
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png
new file mode 100644
index 0000000000..8d71c464f6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png
new file mode 100644
index 0000000000..5885ae1c6e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png
new file mode 100644
index 0000000000..5afb489f64
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png
new file mode 100644
index 0000000000..03799bb688
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png
new file mode 100644
index 0000000000..5daaf7dda8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png
new file mode 100644
index 0000000000..fc7be0c7da
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png
new file mode 100644
index 0000000000..150e8f3ec7
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png
new file mode 100644
index 0000000000..653ca142c2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png
new file mode 100644
index 0000000000..8fb7d79932
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png
new file mode 100644
index 0000000000..ca197f5ba5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png
new file mode 100644
index 0000000000..9f61aeeb48
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
new file mode 100644
index 0000000000..2daba51b6c
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "kitchen-0"
+    },
+    {
+      "name": "kitchen-1"
+    },
+    {
+      "name": "kitchen-2"
+    },
+    {
+      "name": "kitchen-3"
+    },
+    {
+      "name": "kitchen-4"
+    },
+    {
+      "name": "kitchen-5"
+    },
+    {
+      "name": "kitchen-6"
+    },
+    {
+      "name": "kitchen-7"
+    },
+    {
+      "name": "kitchen-8"
+    },
+    {
+      "name": "kitchen-9"
+    },
+    {
+      "name": "kitchen-10"
+    },
+    {
+      "name": "kitchen-11"
+    },
+    {
+      "name": "kitchen-12"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png
new file mode 100644
index 0000000000..ccaf278a54
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png
new file mode 100644
index 0000000000..c79f80c0c2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png
new file mode 100644
index 0000000000..3156cb9fa1
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
new file mode 100644
index 0000000000..544b43a1e8
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png
new file mode 100644
index 0000000000..ce50773db8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png
new file mode 100644
index 0000000000..584a185caa
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png
new file mode 100644
index 0000000000..39d2fb7788
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png
new file mode 100644
index 0000000000..430b603aa3
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png
new file mode 100644
index 0000000000..c79f80c0c2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png
new file mode 100644
index 0000000000..3156cb9fa1
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
new file mode 100644
index 0000000000..544b43a1e8
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png
new file mode 100644
index 0000000000..ce50773db8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png
new file mode 100644
index 0000000000..430b603aa3
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/unlocked.png
new file mode 100644
index 0000000000..39d2fb7788
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png
new file mode 100644
index 0000000000..a1054e575d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/closed.png
new file mode 100644
index 0000000000..df740ed7b0
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png
new file mode 100644
index 0000000000..421688fcda
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json
new file mode 100644
index 0000000000..544b43a1e8
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png
new file mode 100644
index 0000000000..c0e25c446b
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png
new file mode 100644
index 0000000000..a1054e575d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/unlocked.png
new file mode 100644
index 0000000000..3a00217eda
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/unlocked.png differ