diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
index 72d3df22e4..9878fc0767 100644
--- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
+++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
@@ -27,6 +27,16 @@ namespace Content.Client.GameObjects.Components.Storage
         private int StorageCapacityMax;
         private StorageWindow Window;
 
+        public bool Open
+        {
+            get => _open;
+            set
+            {
+                _open = value;
+                SetDoorSprite(_open);
+            }
+        }
+
         public override void OnAdd()
         {
             base.OnAdd();
@@ -41,6 +51,17 @@ namespace Content.Client.GameObjects.Components.Storage
             base.OnRemove();
         }
 
+        /// <inheritdoc />
+        public override void HandleComponentState(ComponentState state)
+        {
+            base.HandleComponentState(state);
+
+            if (!(state is StorageComponentState storageState))
+                return;
+
+            Open = storageState.Open;
+        }
+
         public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
         {
             switch (message)
@@ -54,7 +75,7 @@ namespace Content.Client.GameObjects.Components.Storage
                     OpenUI();
                     break;
                 case CloseStorageUIMessage msg:
-                    // todo: close window/grey it out
+                    CloseUI();
                     break;
             }
         }
@@ -80,6 +101,11 @@ namespace Content.Client.GameObjects.Components.Storage
             Window.Open();
         }
 
+        private void CloseUI()
+        {
+            Window.Close();
+        }
+
         /// <summary>
         /// Function for clicking one of the stored entity buttons in the UI, tells server to remove that entity
         /// </summary>
@@ -89,6 +115,22 @@ namespace Content.Client.GameObjects.Components.Storage
             SendNetworkMessage(new RemoveEntityMessage(entityuid));
         }
 
+        private void SetDoorSprite(bool open)
+        {
+            if(!Owner.TryGetComponent<ISpriteComponent>(out var spriteComp))
+                return;
+
+            if(!spriteComp.Running)
+                return;
+
+            var baseName = spriteComp.LayerGetState(0).Name;
+
+            var stateId = open ? $"{baseName}_open" : $"{baseName}_door";
+
+            if (spriteComp.BaseRSI.TryGetState(stateId, out _))
+                spriteComp.LayerSetState(1, stateId);
+        }
+
         /// <summary>
         /// GUI class for client storage component
         /// </summary>
@@ -113,6 +155,12 @@ namespace Content.Client.GameObjects.Components.Storage
                 Information = VSplitContainer.GetChild<Label>("Information");
             }
 
+            public override void Close()
+            {
+                StorageEntity.SendNetworkMessage(new CloseStorageUIMessage());
+                base.Close();
+            }
+
             /// <summary>
             /// Loops through stored entities creating buttons for each, updates information labels
             /// </summary>
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index 5635a0e5ee..acd3bbd290 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -102,6 +102,7 @@
     <Compile Include="GameObjects\EntitySystems\PowerApcSystem.cs" />
     <Compile Include="GameObjects\EntitySystems\PowerSmesSystem.cs" />
     <Compile Include="GameObjects\EntitySystems\PowerSystem.cs" />
+    <Compile Include="GameObjects\EntitySystems\StorageSystem.cs" />
     <Compile Include="GameObjects\EntitySystems\WelderSystem.cs" />
     <Compile Include="GameObjects\EntitySystems\TemperatureSystem.cs" />
     <Compile Include="Interfaces\GameObjects\Components\Items\IHandsComponent.cs" />
diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
index 36d7ac8bd3..bbb0047927 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
@@ -14,6 +14,7 @@ using SS14.Shared.IoC;
 using SS14.Shared.Log;
 using SS14.Shared.Serialization;
 using System.Collections.Generic;
+using SS14.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects
 {
@@ -28,12 +29,32 @@ namespace Content.Server.GameObjects
         private int StorageCapacityMax = 10000;
         public HashSet<IPlayerSession> SubscribedSessions = new HashSet<IPlayerSession>();
 
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool Open
+        {
+            get => _open;
+            set
+            {
+                if (_open == value)
+                    return;
+
+                _open = value;
+                Dirty();
+            }
+        }
+
         public override void OnAdd()
         {
             base.OnAdd();
 
             storage = ContainerManagerComponent.Create<Container>("storagebase", Owner);
         }
+        
+        /// <inheritdoc />
+        public override ComponentState GetComponentState()
+        {
+            return new StorageComponentState(_open);
+        }
 
         public override void ExposeData(ObjectSerializer serializer)
         {
@@ -155,6 +176,7 @@ namespace Content.Server.GameObjects
                 Logger.DebugS("Storage", "Storage (UID {0}) subscribed player session (UID {1}).", Owner.Uid, session.AttachedEntityUid);
                 session.PlayerStatusChanged += HandlePlayerSessionChangeEvent;
                 SubscribedSessions.Add(session);
+                UpdateDoorState();
             }
         }
 
@@ -164,9 +186,18 @@ namespace Content.Server.GameObjects
         /// <param name="channel"></param>
         public void UnsubscribeSession(IPlayerSession session)
         {
-            Logger.DebugS("Storage", "Storage (UID {0}) unsubscribed player session (UID {1}).", Owner.Uid, session.AttachedEntityUid);
-            SubscribedSessions.Remove(session);
-            SendNetworkMessage(new CloseStorageUIMessage(), session.ConnectedClient);
+            if(SubscribedSessions.Contains(session))
+            {
+                Logger.DebugS("Storage", "Storage (UID {0}) unsubscribed player session (UID {1}).", Owner.Uid, session.AttachedEntityUid);
+                SubscribedSessions.Remove(session);
+                SendNetworkMessage(new CloseStorageUIMessage(), session.ConnectedClient);
+                UpdateDoorState();
+            }
+        }
+
+        private void UpdateDoorState()
+        {
+            Open = SubscribedSessions.Count != 0;
         }
 
         public void HandlePlayerSessionChangeEvent(object obj, SessionStatusEventArgs SSEA)
@@ -210,7 +241,8 @@ namespace Content.Server.GameObjects
 
             switch (message)
             {
-                case RemoveEntityMessage msg:
+                case RemoveEntityMessage _:
+                {
                     var playerMan = IoCManager.Resolve<IPlayerManager>();
                     var session = playerMan.GetSessionByChannel(netChannel);
                     var playerentity = session.AttachedEntity;
@@ -237,6 +269,16 @@ namespace Content.Server.GameObjects
                             entity.GetComponent<ITransformComponent>().WorldPosition = ourtransform.WorldPosition;
                         }
                     }
+                }
+                    break;
+
+                case CloseStorageUIMessage _:
+                {
+                    var playerMan = IoCManager.Resolve<IPlayerManager>();
+                    var session = playerMan.GetSessionByChannel(netChannel);
+
+                    UnsubscribeSession(session);
+                }
                     break;
             }
         }
diff --git a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs
new file mode 100644
index 0000000000..8f0fa4bffc
--- /dev/null
+++ b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using SS14.Server.Interfaces.Player;
+using SS14.Shared.GameObjects;
+using SS14.Shared.GameObjects.Systems;
+
+namespace Content.Server.GameObjects.EntitySystems
+{
+    class StorageSystem : EntitySystem
+    {
+        private readonly List<IPlayerSession> _sessionCache = new List<IPlayerSession>();
+
+        /// <inheritdoc />
+        public override void Initialize()
+        {
+            EntityQuery = new TypeEntityQuery(typeof(ServerStorageComponent));
+        }
+
+        /// <inheritdoc />
+        public override void Update(float frameTime)
+        {
+            foreach (var entity in RelevantEntities)
+            {
+                var storageComp = entity.GetComponent<ServerStorageComponent>();
+
+                // We have to cache the set of sessions because Unsubscribe modifies the original.
+                _sessionCache.Clear();
+                _sessionCache.AddRange(storageComp.SubscribedSessions);
+
+                if (_sessionCache.Count == 0)
+                    continue;
+
+                var storagePos = entity.Transform.WorldPosition;
+                var storageMap = entity.Transform.MapID;
+
+                foreach (var session in _sessionCache)
+                {
+                    var attachedEntity = session.AttachedEntity;
+
+                    // The component manages the set of sessions, so this invalid session should be removed soon.
+                    if (attachedEntity == null || !attachedEntity.IsValid())
+                        continue;
+
+                    if(storageMap != attachedEntity.Transform.MapID)
+                        continue;
+
+                    var distanceSquared = (storagePos - attachedEntity.Transform.WorldPosition).LengthSquared;
+                    if (distanceSquared > InteractionSystem.INTERACTION_RANGE_SQUARED)
+                    {
+                        storageComp.UnsubscribeSession(session);
+                    }
+                }
+
+
+            }
+        }
+    }
+}
diff --git a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs b/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs
index c0f1749cd2..d3db244861 100644
--- a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs
+++ b/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs
@@ -9,6 +9,29 @@ namespace Content.Shared.GameObjects.Components.Storage
     {
         public sealed override string Name => "Storage";
         public override uint? NetID => ContentNetIDs.INVENTORY;
+        public override Type StateType => typeof(StorageComponentState);
+
+        protected bool _open;
+
+        /// <inheritdoc />
+        public override void ExposeData(ObjectSerializer serializer)
+        {
+            base.ExposeData(serializer);
+
+            serializer.DataField(ref _open, "open", false);
+        }
+    }
+
+    [Serializable, NetSerializable]
+    public class StorageComponentState : ComponentState
+    {
+        public bool Open { get; }
+
+        public StorageComponentState(bool open)
+            : base(ContentNetIDs.INVENTORY)
+        {
+            Open = open;
+        }
     }
 
     /// <summary>
diff --git a/Resources/Prototypes/Entities/Container.yml b/Resources/Prototypes/Entities/Container.yml
new file mode 100644
index 0000000000..b477d569fd
--- /dev/null
+++ b/Resources/Prototypes/Entities/Container.yml
@@ -0,0 +1,24 @@
+- type: entity
+  id: crate_generic
+  name: Crate
+  description: A large container for items.
+  components:
+  - type: Sprite
+    sprite: Buildings/crate.rsi
+    layers:
+    - state: crate
+    - state: crate_door
+
+  - type: Icon
+    sprite: Buildings/crate.rsi
+    state: crate
+
+  - type: Clickable
+  - type: BoundingBox
+  - type: Collidable
+  - type: Storage
+    Capacity: 60
+
+  placement:
+    snap:
+    - Wall
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Items.yml b/Resources/Prototypes/Entities/Items.yml
index d5cc9894f0..0698d7db7d 100644
--- a/Resources/Prototypes/Entities/Items.yml
+++ b/Resources/Prototypes/Entities/Items.yml
@@ -69,6 +69,19 @@
   - type: Item
     Size: 10
 
+- type: entity
+  name: "Fire Extinguisher"
+  parent: BaseItem
+  id: fire_extinguisher
+  description: Extinguishes fires.
+  components:
+  - type: Sprite
+    texture: Objects/fire_extinguisher.png
+  - type: Icon
+    texture: Objects/fire_extinguisher.png
+  - type: Item
+    Size: 10
+    
 #handheld lights
 - type: entity
   name: "Lantern"
diff --git a/Resources/Prototypes/Entities/closet.yml b/Resources/Prototypes/Entities/closet.yml
new file mode 100644
index 0000000000..01fb939d29
--- /dev/null
+++ b/Resources/Prototypes/Entities/closet.yml
@@ -0,0 +1,24 @@
+- type: entity
+  id: locker_generic
+  name: Locker
+  description: A standard-issue Nanotrasen storage unit.
+  components:
+  - type: Sprite
+    sprite: Buildings/closet.rsi
+    layers:
+    - state: generic
+    - state: generic_door
+
+  - type: Icon
+    sprite: Buildings/closet.rsi
+    state: generic
+
+  - type: Clickable
+  - type: BoundingBox
+  - type: Collidable
+  - type: Storage
+    Capacity: 80
+
+  placement:
+    snap:
+    - Wall
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/closet.rsi/generic.png b/Resources/Textures/Buildings/closet.rsi/generic.png
new file mode 100644
index 0000000000..d9d0380ee0
Binary files /dev/null and b/Resources/Textures/Buildings/closet.rsi/generic.png differ
diff --git a/Resources/Textures/Buildings/closet.rsi/generic_door.png b/Resources/Textures/Buildings/closet.rsi/generic_door.png
new file mode 100644
index 0000000000..10c0367ea4
Binary files /dev/null and b/Resources/Textures/Buildings/closet.rsi/generic_door.png differ
diff --git a/Resources/Textures/Buildings/closet.rsi/generic_open.png b/Resources/Textures/Buildings/closet.rsi/generic_open.png
new file mode 100644
index 0000000000..b3dcabd1e2
Binary files /dev/null and b/Resources/Textures/Buildings/closet.rsi/generic_open.png differ
diff --git a/Resources/Textures/Buildings/closet.rsi/meta.json b/Resources/Textures/Buildings/closet.rsi/meta.json
new file mode 100644
index 0000000000..49576de12f
--- /dev/null
+++ b/Resources/Textures/Buildings/closet.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from https://github.com/discordia-space/CEV-Eris.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "generic",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "generic_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "generic_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/crate.rsi/crate.png b/Resources/Textures/Buildings/crate.rsi/crate.png
new file mode 100644
index 0000000000..c6a11f9f6a
Binary files /dev/null and b/Resources/Textures/Buildings/crate.rsi/crate.png differ
diff --git a/Resources/Textures/Buildings/crate.rsi/crate_door.png b/Resources/Textures/Buildings/crate.rsi/crate_door.png
new file mode 100644
index 0000000000..a191869066
Binary files /dev/null and b/Resources/Textures/Buildings/crate.rsi/crate_door.png differ
diff --git a/Resources/Textures/Buildings/crate.rsi/crate_open.png b/Resources/Textures/Buildings/crate.rsi/crate_open.png
new file mode 100644
index 0000000000..abafc09751
Binary files /dev/null and b/Resources/Textures/Buildings/crate.rsi/crate_open.png differ
diff --git a/Resources/Textures/Buildings/crate.rsi/meta.json b/Resources/Textures/Buildings/crate.rsi/meta.json
new file mode 100644
index 0000000000..e8fa1c03c2
--- /dev/null
+++ b/Resources/Textures/Buildings/crate.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from https://github.com/discordia-space/CEV-Eris.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "crate",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "crate_door",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "crate_open",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/fire_extinguisher.png b/Resources/Textures/Objects/fire_extinguisher.png
new file mode 100644
index 0000000000..87a128c8fe
Binary files /dev/null and b/Resources/Textures/Objects/fire_extinguisher.png differ
diff --git a/engine b/engine
index d8ca95db0c..307030ec8f 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit d8ca95db0c1a8e1db48465352e29c7650b3afc81
+Subproject commit 307030ec8f46965315488cb1f7ec5b1c6db3cd73