diff --git a/Content.Client/Audio/ContentAudioSystem.CP14AmbientLoop.cs b/Content.Client/Audio/ContentAudioSystem.CP14AmbientLoop.cs
index 14a29bf9e8..4394beb07e 100644
--- a/Content.Client/Audio/ContentAudioSystem.CP14AmbientLoop.cs
+++ b/Content.Client/Audio/ContentAudioSystem.CP14AmbientLoop.cs
@@ -43,8 +43,8 @@ public sealed partial class ContentAudioSystem
 
    private void CP14UpdateAmbientLoops()
    {
-       //TEMPORALY DISABLE - Client error spam
-       return;
+
+       return; //DISABLED UNTIL CLIENT ERROR SPAM FIXED
 
        if (_timing.CurTime <= _nextUpdateTime)
            return;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 860df342de..8264b67d51 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -54,9 +54,9 @@ public sealed partial class AdminVerbSystem
         var targetPlayer = targetActor.PlayerSession;
 
 
-        Verb CP14Bandit = new()
+        Verb CP14Sociopath = new()
         {
-            Text = Loc.GetString("cp14-admin-verb-text-make-bandit"),
+            Text = Loc.GetString("cp14-admin-verb-text-make-sociopath"),
             Category = VerbCategory.Antag,
             Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/Color/black.rsi"),
                 "icon"), //TODO
@@ -65,9 +65,9 @@ public sealed partial class AdminVerbSystem
                 //_antag.ForceMakeAntag<CP14BanditRoleComponent>(targetPlayer, "CP14Bandit"); //TODO
             },
             Impact = LogImpact.High,
-            Message = Loc.GetString("cp14-admin-verb-make-bandit"),
+            Message = Loc.GetString("cp14-admin-verb-make-sociopath"),
         };
-        args.Verbs.Add(CP14Bandit);
+        args.Verbs.Add(CP14Sociopath);
 
         /* CP14 disable default antags
         Verb traitor = new()
diff --git a/Content.Server/_CP14/Currency/CP14CurrencySystem.Converter.cs b/Content.Server/_CP14/Currency/CP14CurrencySystem.Converter.cs
index 6160909c0d..d8af17c3af 100644
--- a/Content.Server/_CP14/Currency/CP14CurrencySystem.Converter.cs
+++ b/Content.Server/_CP14/Currency/CP14CurrencySystem.Converter.cs
@@ -106,10 +106,10 @@ public sealed partial class CP14CurrencySystem
     }
 
 
-
     private void OnConverterExamine(Entity<CP14CurrencyConverterComponent> ent, ref ExaminedEvent args)
     {
-        var push = $"{Loc.GetString("cp14-currency-converter-examine-title")} {GetCurrencyPrettyString(ent.Comp.Balance)}";
+        var push =
+            $"{Loc.GetString("cp14-currency-converter-examine-title")} {GetCurrencyPrettyString(ent.Comp.Balance)}";
         args.PushMarkup(push);
     }
 
@@ -129,7 +129,10 @@ public sealed partial class CP14CurrencySystem
         _audio.PlayPvs(ent.Comp.InsertSound, ent, AudioParams.Default.WithMaxDistance(3));
     }
 
-    public HashSet<EntityUid> GenerateMoney(EntProtoId currencyType, int target, EntityCoordinates coordinates, out int remainder)
+    public HashSet<EntityUid> GenerateMoney(EntProtoId currencyType,
+        int target,
+        EntityCoordinates coordinates,
+        out int remainder)
     {
         remainder = target;
         HashSet<EntityUid> spawns = new();
@@ -164,7 +167,8 @@ public sealed partial class CP14CurrencySystem
         spawns.Add(ent);
         remainder -= singleCurrency;
 
-        if (TryComp<StackComponent>(ent, out var stack) && _proto.TryIndex<StackPrototype>(stack.StackTypeId, out var indexedStack))
+        if (TryComp<StackComponent>(ent, out var stack) &&
+            _proto.TryIndex<StackPrototype>(stack.StackTypeId, out var indexedStack))
         {
             AdjustStack(ent, stack, indexedStack, singleCurrency, ref remainder);
         }
@@ -172,7 +176,11 @@ public sealed partial class CP14CurrencySystem
         return false;
     }
 
-    private void AdjustStack(EntityUid ent, StackComponent stack, StackPrototype stackProto, float singleCurrency, ref int remainder)
+    private void AdjustStack(EntityUid ent,
+        StackComponent stack,
+        StackPrototype stackProto,
+        float singleCurrency,
+        ref int remainder)
     {
         var singleStackCurrency = singleCurrency / stack.Count;
         var stackLeftSpace = stackProto.MaxCount - stack.Count;
@@ -188,5 +196,4 @@ public sealed partial class CP14CurrencySystem
             }
         }
     }
-
 }
diff --git a/Content.Server/_CP14/Currency/CP14CurrencySystem.cs b/Content.Server/_CP14/Currency/CP14CurrencySystem.cs
index b30c185541..e38b704d99 100644
--- a/Content.Server/_CP14/Currency/CP14CurrencySystem.cs
+++ b/Content.Server/_CP14/Currency/CP14CurrencySystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Storage;
 using Content.Shared.Whitelist;
 using Robust.Server.Audio;
 using Robust.Shared.Prototypes;
+
 namespace Content.Server._CP14.Currency;
 
 public sealed partial class CP14CurrencySystem : CP14SharedCurrencySystem
@@ -17,6 +18,7 @@ public sealed partial class CP14CurrencySystem : CP14SharedCurrencySystem
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
+
     public override void Initialize()
     {
         base.Initialize();
diff --git a/Content.Server/_CP14/Roles/CP14BanditRoleComponent.cs b/Content.Server/_CP14/Roles/CP14BanditRoleComponent.cs
deleted file mode 100644
index fd5138a741..0000000000
--- a/Content.Server/_CP14/Roles/CP14BanditRoleComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Shared.Roles;
-
-namespace Content.Server._CP14.Roles;
-
-/// <summary>
-///     Added to mind role entities to tag that they are a bandit.
-/// </summary>
-[RegisterComponent]
-public sealed partial class CP14BanditRoleComponent : BaseMindRoleComponent
-{
-}
diff --git a/Content.Server/_CP14/Roles/CP14SociopathRoleComponent.cs b/Content.Server/_CP14/Roles/CP14SociopathRoleComponent.cs
new file mode 100644
index 0000000000..dda830709f
--- /dev/null
+++ b/Content.Server/_CP14/Roles/CP14SociopathRoleComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Roles;
+
+namespace Content.Server._CP14.Roles;
+
+/// <summary>
+///     Added to mind role entities to tag that they are a sociopath.
+/// </summary>
+[RegisterComponent]
+public sealed partial class CP14SociopathRoleComponent : BaseMindRoleComponent
+{
+}
diff --git a/Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs b/Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs
index 56d5b164c4..893bc18c45 100644
--- a/Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs
+++ b/Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs
@@ -23,6 +23,7 @@ public sealed partial class CP14FireSpreadSystem : EntitySystem
     [Dependency] private readonly ITileDefinitionManager _tiledef = default!;
 
     private EntProtoId _fireProto = "CP14Fire";
+
     public override void Initialize()
     {
         SubscribeLocalEvent<CP14FireSpreadComponent, OnFireChangedEvent>(OnCompInit);
@@ -103,7 +104,9 @@ public sealed partial class CP14FireSpreadSystem : EntitySystem
 
     private void IgniteEntities(EntityUid uid, CP14FireSpreadComponent spread)
     {
-        var targets = _lookup.GetEntitiesInRange<FlammableComponent>(_transform.GetMapCoordinates(uid), spread.Radius, LookupFlags.Uncontained);
+        var targets = _lookup.GetEntitiesInRange<FlammableComponent>(_transform.GetMapCoordinates(uid),
+            spread.Radius,
+            LookupFlags.Uncontained);
         foreach (var target in targets)
         {
             if (!_random.Prob(spread.Prob))
@@ -143,7 +146,7 @@ public sealed partial class CP14FireSpreadSystem : EntitySystem
                 continue;
 
             Spawn(_fireProto, _mapSystem.ToCenterCoordinates(tileref, grid));
-            _tile.ReplaceTile(tileref, (ContentTileDefinition) _tiledef[tile.BurnedTile]);
+            _tile.ReplaceTile(tileref, (ContentTileDefinition)_tiledef[tile.BurnedTile]);
         }
     }
 }
diff --git a/Resources/Locale/en-US/_CP14/administration/antag.ftl b/Resources/Locale/en-US/_CP14/administration/antag.ftl
index ebd3486e9d..a5d5636ba9 100644
--- a/Resources/Locale/en-US/_CP14/administration/antag.ftl
+++ b/Resources/Locale/en-US/_CP14/administration/antag.ftl
@@ -1,2 +1,2 @@
-cp14-admin-verb-text-make-bandit = Make bandit
-cp14-admin-verb-make-bandit = Add to target antagonist role “Bandit”
\ No newline at end of file
+cp14-admin-verb-text-make-sociopath = Make sociopath
+cp14-admin-verb-make-sociopath = Add to target antagonist role “Sociopath”
diff --git a/Resources/Locale/en-US/_CP14/antags/antags.ftl b/Resources/Locale/en-US/_CP14/antags/antags.ftl
index 090f9adda8..5c9656cb7d 100644
--- a/Resources/Locale/en-US/_CP14/antags/antags.ftl
+++ b/Resources/Locale/en-US/_CP14/antags/antags.ftl
@@ -1,3 +1,3 @@
-cp14-roles-antag-bandit-name = Bandit
-cp14-roles-antag-bandit-objective = Defy morality and the law. You need money. A lot of money, and you can earn it in any way you want, including robbery and murder.
-cp14-roles-antag-bandit-briefing = The cruel past has opened your eyes: the creatures around you are weaklings trying to cling to so-called “morality”. That word is foreign to you. You know that murder or robbery is just one of the tools to achieve your goals.
\ No newline at end of file
+cp14-roles-antag-sociopath-name = Sociopath
+cp14-roles-antag-sociopath-objective = You don't understand morality or empathy. As long as other people are constrained by them, you don't have to worry about exactly how to accomplish your tasks.
+cp14-roles-antag-sociopath-briefing = From birth you don't know what emotion, morality or empathy are. You only know that other people are constrained by them, and this prevents them from being effective. You have certain goals - and you can strive to accomplish them by ANY means.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_CP14/administration/antag.ftl b/Resources/Locale/ru-RU/_CP14/administration/antag.ftl
index bbf8794b0e..784be5aaf1 100644
--- a/Resources/Locale/ru-RU/_CP14/administration/antag.ftl
+++ b/Resources/Locale/ru-RU/_CP14/administration/antag.ftl
@@ -1,2 +1,2 @@
-cp14-admin-verb-text-make-bandit = Сделать бандитом
-cp14-admin-verb-make-bandit = Добавить цели роль антагониста "Бандит"
\ No newline at end of file
+cp14-admin-verb-text-make-sociopath = Сделать социопатом
+cp14-admin-verb-make-sociopath = Добавить цели роль антагониста "Социопат"
diff --git a/Resources/Locale/ru-RU/_CP14/antags/antags.ftl b/Resources/Locale/ru-RU/_CP14/antags/antags.ftl
index f6f4f0956e..11899a82b1 100644
--- a/Resources/Locale/ru-RU/_CP14/antags/antags.ftl
+++ b/Resources/Locale/ru-RU/_CP14/antags/antags.ftl
@@ -1,3 +1,3 @@
-cp14-roles-antag-bandit-name = Бандит
-cp14-roles-antag-bandit-objective = Отриньте моральные нормы и закон. Вам нужны деньги. Много денег, и вы можете зарабатывать их любыми способами, включая грабежи, разбой и убийства.
-cp14-roles-antag-bandit-briefing = Жестокое прошлое открыло вам глаза: окружающие вас существа - слабаки, старающиеся держаться за так называемую "мораль". Вам это слово чуждо. Вы знаете, что убийство или грабежи - это просто один из инструментов достижения ваших целей.
\ No newline at end of file
+cp14-roles-antag-sociopath-name = Социопат
+cp14-roles-antag-sociopath-objective = Вам непонятны принципы морали или сочувствия. Пока остальные люди скованы ими, вам не нужно заботиться о том, как именно выполнить свои задачи.
+cp14-roles-antag-sociopath-briefing = С самого рождения вы не знаете что такое эмоции, мораль или сочувствие. Вы знаете только, что остальные люди скованы ими, и это мешает им действовать эффективно. У вас есть определенные задачи - и вы можете стремиться к их выполнению ЛЮБЫМИ методами.
\ No newline at end of file
diff --git a/Resources/Maps/_CP14/tavern.yml b/Resources/Maps/_CP14/tavern.yml
index fddd6bd0a0..b3c8c2bb44 100644
--- a/Resources/Maps/_CP14/tavern.yml
+++ b/Resources/Maps/_CP14/tavern.yml
@@ -320,7 +320,7 @@ entities:
           version: 6
         0,2:
           ind: 0,2
-          tiles: HQAAAAAADwAAAAACDwAAAAACDwAAAAACDwAAAAABDwAAAAACDwAAAAAEDwAAAAABDwAAAAADDwAAAAACDwAAAAACDwAAAAACDwAAAAACGgAAAAAEGgAAAAACGgAAAAAJHQAAAAACDwAAAAACDwAAAAACDwAAAAADDwAAAAADDwAAAAAFDwAAAAAEDwAAAAADDwAAAAAADwAAAAAFDwAAAAACDwAAAAACDwAAAAACHQAAAAACGgAAAAAAGgAAAAAIHQAAAAABDwAAAAAFDwAAAAABDwAAAAACDwAAAAABDwAAAAAEDwAAAAAFDwAAAAADDwAAAAADDwAAAAAEDwAAAAAADwAAAAACDwAAAAAEGgAAAAAPGgAAAAAEHQAAAAAEHQAAAAADDwAAAAACDwAAAAACDwAAAAABDwAAAAAEDwAAAAADDwAAAAACDwAAAAADDwAAAAAADwAAAAADDwAAAAABDwAAAAABDwAAAAAEGgAAAAAJGgAAAAADHQAAAAACDwAAAAADDwAAAAACDwAAAAAEDwAAAAABDwAAAAACDwAAAAADMQAAAAAADwAAAAAEDwAAAAADDwAAAAAEMQAAAAAADwAAAAACDwAAAAACDwAAAAABDwAAAAAADwAAAAABMwAAAAAADwAAAAAAMwAAAAAADwAAAAAAMwAAAAAADwAAAAAFDwAAAAAFDwAAAAADDwAAAAAFDwAAAAADDwAAAAAFDwAAAAAFDwAAAAAEMQAAAAAAMwAAAAAADwAAAAACMQAAAAAADwAAAAAFMQAAAAAADwAAAAAFMQAAAAAADwAAAAADDwAAAAADDwAAAAACDwAAAAADDwAAAAAADwAAAAADDwAAAAABDwAAAAACDwAAAAAEDwAAAAADDwAAAAADDwAAAAAFDwAAAAABDwAAAAABDwAAAAAFDwAAAAAFDwAAAAAFDwAAAAAADwAAAAAEDwAAAAAEDwAAAAAEDwAAAAABDwAAAAAADwAAAAACMQAAAAAAMwAAAAAADwAAAAABDwAAAAADDwAAAAAFDwAAAAAADwAAAAADDwAAAAAADwAAAAAEDwAAAAADDwAAAAAADwAAAAAADwAAAAACDwAAAAAEDwAAAAADDwAAAAABDwAAAAAADwAAAAABDwAAAAAADwAAAAABDwAAAAAADwAAAAADDwAAAAACDwAAAAAEDwAAAAADDwAAAAABDwAAAAADMgAAAAAADwAAAAAEDwAAAAAADwAAAAACDwAAAAADMQAAAAAAMwAAAAAADwAAAAAADwAAAAAEDwAAAAAFDwAAAAABDwAAAAADDwAAAAAADwAAAAAADwAAAAADMgAAAAAAMgAAAAAAMgAAAAAADwAAAAAFDwAAAAAEDwAAAAACDwAAAAACDwAAAAABDwAAAAAEDwAAAAAFDwAAAAAADwAAAAABDwAAAAABDwAAAAACDwAAAAAFDwAAAAAAMgAAAAAAMwAAAAAAMgAAAAAADwAAAAAEDwAAAAAADwAAAAAEDwAAAAAADwAAAAAADwAAAAAAMQAAAAAADwAAAAAFDwAAAAABDwAAAAABDwAAAAABDwAAAAADDwAAAAADMgAAAAAAMgAAAAAAMgAAAAAADwAAAAAADwAAAAAEDwAAAAAADwAAAAAADwAAAAAEDwAAAAABMQAAAAAADwAAAAAFDwAAAAAEDwAAAAACDwAAAAABDwAAAAAADwAAAAADDwAAAAAADwAAAAAFDwAAAAACDwAAAAAFDwAAAAABDwAAAAABDwAAAAAFDwAAAAAEDwAAAAACHQAAAAAADwAAAAAFDwAAAAABDwAAAAADDwAAAAAFDwAAAAAADwAAAAAFDwAAAAAEDwAAAAACDwAAAAAFDwAAAAAFDwAAAAABDwAAAAAADwAAAAADDwAAAAAEDwAAAAAFHAAAAAAAHAAAAAAEHAAAAAAEHAAAAAACHAAAAAAAHAAAAAADHAAAAAAEHAAAAAAFHAAAAAACHAAAAAABHAAAAAAAHAAAAAABHAAAAAADHAAAAAAFHAAAAAAEHAAAAAAF
+          tiles: HQAAAAAADwAAAAACDwAAAAACDwAAAAACDwAAAAABDwAAAAACDwAAAAAEDwAAAAABDwAAAAADDwAAAAACDwAAAAACDwAAAAACDwAAAAACGgAAAAAEGgAAAAACGgAAAAAJHQAAAAACDwAAAAACDwAAAAACDwAAAAADDwAAAAADDwAAAAAFDwAAAAAEDwAAAAADDwAAAAAADwAAAAAFDwAAAAACDwAAAAACDwAAAAACHQAAAAACGgAAAAAAGgAAAAAIHQAAAAABDwAAAAAFDwAAAAABDwAAAAACDwAAAAABDwAAAAAEDwAAAAAFDwAAAAADDwAAAAADDwAAAAAEDwAAAAAADwAAAAACDwAAAAAEGgAAAAAPGgAAAAAEHQAAAAAEHQAAAAADDwAAAAACDwAAAAACDwAAAAABDwAAAAAEDwAAAAADDwAAAAACDwAAAAADDwAAAAAADwAAAAADDwAAAAABDwAAAAABDwAAAAAEGgAAAAAJGgAAAAADHQAAAAACDwAAAAADDwAAAAACDwAAAAAEDwAAAAABDwAAAAACDwAAAAADMQAAAAAADwAAAAAEDwAAAAADDwAAAAAEMQAAAAAADwAAAAACDwAAAAACDwAAAAABDwAAAAAADwAAAAABMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAADwAAAAAADwAAAAAFDwAAAAAFDwAAAAADDwAAAAAFDwAAAAADDwAAAAAFDwAAAAAFDwAAAAAEDwAAAAAADwAAAAAADwAAAAACMgAAAAAAMgAAAAAAMgAAAAAAMgAAAAAADwAAAAAADwAAAAADDwAAAAADDwAAAAACDwAAAAADDwAAAAAADwAAAAADDwAAAAABDwAAAAACDwAAAAAEDwAAAAADDwAAAAADMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAADwAAAAAFDwAAAAAFDwAAAAAADwAAAAAEDwAAAAAEDwAAAAAEDwAAAAABDwAAAAAADwAAAAACDwAAAAAADwAAAAAADwAAAAABDwAAAAADDwAAAAAFDwAAAAAADwAAAAADDwAAAAAADwAAAAAEDwAAAAADDwAAAAAADwAAAAAADwAAAAACDwAAAAAEDwAAAAADDwAAAAABDwAAAAAADwAAAAABDwAAAAAADwAAAAABDwAAAAAADwAAAAADDwAAAAACDwAAAAAEDwAAAAADDwAAAAABDwAAAAADMgAAAAAADwAAAAAEDwAAAAAADwAAAAACDwAAAAADDwAAAAAADwAAAAAADwAAAAAADwAAAAAEDwAAAAAFDwAAAAABDwAAAAADDwAAAAAADwAAAAAADwAAAAADMgAAAAAAMgAAAAAAMgAAAAAADwAAAAAFDwAAAAAEDwAAAAACDwAAAAACDwAAAAABDwAAAAAEDwAAAAAFDwAAAAAADwAAAAABDwAAAAABDwAAAAACDwAAAAAFDwAAAAAAMgAAAAAAMwAAAAAAMgAAAAAADwAAAAAEDwAAAAAADwAAAAAEDwAAAAAADwAAAAAADwAAAAAAMQAAAAAADwAAAAAFDwAAAAABDwAAAAABDwAAAAABDwAAAAADDwAAAAADMgAAAAAAMgAAAAAAMgAAAAAADwAAAAAADwAAAAAEDwAAAAAADwAAAAAADwAAAAAEDwAAAAABMQAAAAAADwAAAAAFDwAAAAAEDwAAAAACDwAAAAABDwAAAAAADwAAAAADDwAAAAAADwAAAAAFDwAAAAACDwAAAAAFDwAAAAABDwAAAAABDwAAAAAFDwAAAAAEDwAAAAACHQAAAAAADwAAAAAFDwAAAAABDwAAAAADDwAAAAAFDwAAAAAADwAAAAAFDwAAAAAEDwAAAAACDwAAAAAFDwAAAAAFDwAAAAABDwAAAAAADwAAAAADDwAAAAAEDwAAAAAFHAAAAAAAHAAAAAAEHAAAAAAEHAAAAAACHAAAAAAAHAAAAAADHAAAAAAEHAAAAAAFHAAAAAACHAAAAAABHAAAAAAAHAAAAAABHAAAAAADHAAAAAAFHAAAAAAEHAAAAAAF
           version: 6
         2,3:
           ind: 2,3
@@ -405,8 +405,8 @@ entities:
             color: '#FFFFFFFF'
             id: CP14BrickTileStoneCornerNe
           decals:
-            7: 12,41
             22: 5,45
+            59: 14,41
         - node:
             color: '#FFFFFFFF'
             id: CP14BrickTileStoneCornerNw
@@ -418,13 +418,12 @@ entities:
             color: '#FFFFFFFF'
             id: CP14BrickTileStoneCornerSe
           decals:
-            1: 12,37
+            55: 14,37
         - node:
             color: '#FFFFFFFF'
             id: CP14BrickTileStoneCornerSw
           decals:
-            31: 0,39
-            39: 6,37
+            54: 0,37
         - node:
             color: '#FFFFFFFF'
             id: CP14BrickTileStoneInnerNe
@@ -436,22 +435,17 @@ entities:
           decals:
             13: 11,40
             24: 2,43
-        - node:
-            color: '#FFFFFFFF'
-            id: CP14BrickTileStoneInnerSw
-          decals:
-            37: 6,39
         - node:
             color: '#FFFFFFFF'
             id: CP14BrickTileStoneLineE
           decals:
-            4: 12,38
-            5: 12,39
-            6: 12,40
             15: 5,41
             16: 5,42
             17: 5,43
             18: 5,44
+            56: 14,38
+            57: 14,39
+            58: 14,40
         - node:
             color: '#FFFFFFFF'
             id: CP14BrickTileStoneLineN
@@ -464,20 +458,25 @@ entities:
             19: 4,45
             20: 3,45
             25: 1,43
+            60: 13,41
+            61: 12,41
         - node:
             color: '#FFFFFFFF'
             id: CP14BrickTileStoneLineS
           decals:
             2: 11,37
-            32: 1,39
-            33: 2,39
-            34: 3,39
-            35: 4,39
-            36: 5,39
             40: 7,37
             41: 8,37
             42: 9,37
             43: 10,37
+            44: 5,37
+            45: 6,37
+            46: 4,37
+            47: 3,37
+            48: 2,37
+            49: 1,37
+            50: 12,37
+            51: 13,37
         - node:
             color: '#FFFFFFFF'
             id: CP14BrickTileStoneLineW
@@ -486,7 +485,8 @@ entities:
             28: 0,42
             29: 0,41
             30: 0,40
-            38: 6,38
+            52: 0,38
+            53: 0,39
     - type: Biome
       forcedMarkerLayers: []
       markerLayers: []
@@ -75911,7 +75911,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 28.552069,34.690502
       parent: 1
-- proto: CP14BlueVial
+- proto: CP14BlueBottle
   entities:
   - uid: 11961
     components:
@@ -75920,25 +75920,6 @@ entities:
       parent: 1
 - proto: CP14BrassChest
   entities:
-  - uid: 9688
-    components:
-    - type: Transform
-      pos: 9.5,44.5
-      parent: 1
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 9689
-          - 9690
-          - 9691
-          - 9692
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
   - uid: 9888
     components:
     - type: Transform
@@ -76448,15 +76429,10 @@ entities:
       parent: 1
 - proto: CP14CopperBar10
   entities:
-  - uid: 9701
+  - uid: 3704
     components:
     - type: Transform
-      pos: 7.2863507,42.812088
-      parent: 1
-  - uid: 9702
-    components:
-    - type: Transform
-      pos: 7.691279,42.82333
+      pos: 8.71216,44.64698
       parent: 1
 - proto: CP14CopperBar5
   entities:
@@ -76900,24 +76876,6 @@ entities:
     - type: Transform
       pos: 3.5,45.5
       parent: 1
-  - uid: 9707
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,40.5
-      parent: 1
-  - uid: 9708
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,41.5
-      parent: 1
-  - uid: 9709
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,42.5
-      parent: 1
   - uid: 9710
     components:
     - type: Transform
@@ -77026,17 +76984,15 @@ entities:
       parent: 1
 - proto: CP14DemiplanKey
   entities:
-  - uid: 5315
+  - uid: 3925
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.6266832,45.420956
+      pos: 8.327911,44.759422
       parent: 1
-  - uid: 5317
+  - uid: 3932
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.3231506,45.606487
+      pos: 8.125448,44.534534
       parent: 1
   - uid: 5318
     components:
@@ -77044,23 +77000,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 26.237787,4.6841173
       parent: 1
-  - uid: 5319
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.2000246,45.387222
-      parent: 1
-  - uid: 5345
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.9976683,45.69082
-      parent: 1
   - uid: 5412
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.537284,45.69082
+      pos: 8.125448,44.759422
       parent: 1
   - uid: 5429
     components:
@@ -77068,6 +77011,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 29.289982,5.089072
       parent: 1
+  - uid: 9042
+    components:
+    - type: Transform
+      pos: 8.33916,44.534534
+      parent: 1
 - proto: CP14DirtBlock1
   entities:
   - uid: 5252
@@ -77103,12 +77051,6 @@ entities:
       parent: 1
 - proto: CP14EnergyCrystalMedium
   entities:
-  - uid: 9660
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.746285,44.812912
-      parent: 1
   - uid: 9890
     components:
     - type: Transform
@@ -77146,12 +77088,6 @@ entities:
     - type: InsideEntityStorage
 - proto: CP14EnergyCrystalSmall
   entities:
-  - uid: 9637
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.757534,44.507675
-      parent: 1
   - uid: 9891
     components:
     - type: Transform
@@ -77232,6 +77168,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 39.5,3.5
       parent: 1
+- proto: CP14FenceIronGrilleGate
+  entities:
+  - uid: 9075
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,38.5
+      parent: 1
 - proto: CP14FenceIronGrilleStraight
   entities:
   - uid: 4408
@@ -77282,6 +77226,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,19.5
       parent: 1
+  - uid: 5317
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,37.5
+      parent: 1
   - uid: 5331
     components:
     - type: Transform
@@ -77374,6 +77324,12 @@ entities:
     - type: Transform
       pos: -1.5,45.5
       parent: 1
+  - uid: 9076
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,39.5
+      parent: 1
   - uid: 9878
     components:
     - type: Transform
@@ -78153,29 +78109,10 @@ entities:
       parent: 1
 - proto: CP14GoldBar10
   entities:
-  - uid: 9699
+  - uid: 3662
     components:
     - type: Transform
-      pos: 7.2863507,43.28435
-      parent: 1
-  - uid: 9700
-    components:
-    - type: Transform
-      pos: 7.657535,43.295593
-      parent: 1
-- proto: CP14GoldCoin
-  entities:
-  - uid: 9680
-    components:
-    - type: Transform
-      pos: 8.11787,44.617615
-      parent: 1
-- proto: CP14GoldCoin5
-  entities:
-  - uid: 9665
-    components:
-    - type: Transform
-      pos: 8.485631,44.666588
+      pos: 9.240815,44.658222
       parent: 1
 - proto: CP14GreenBottle
   entities:
@@ -78184,6 +78121,16 @@ entities:
     - type: Transform
       pos: 18.20035,41.903072
       parent: 1
+  - uid: 8934
+    components:
+    - type: Transform
+      pos: 18.394794,41.958626
+      parent: 1
+  - uid: 11959
+    components:
+    - type: Transform
+      pos: 21.46045,39.748867
+      parent: 1
   - uid: 11962
     components:
     - type: Transform
@@ -78194,18 +78141,6 @@ entities:
     - type: Transform
       pos: -4.2344017,22.037807
       parent: 1
-- proto: CP14GreenVial
-  entities:
-  - uid: 8934
-    components:
-    - type: Transform
-      pos: 18.394794,41.958626
-      parent: 1
-  - uid: 11959
-    components:
-    - type: Transform
-      pos: 21.46045,39.748867
-      parent: 1
   - uid: 12945
     components:
     - type: Transform
@@ -78235,22 +78170,17 @@ entities:
       parent: 1
 - proto: CP14IronBar10
   entities:
+  - uid: 3899
+    components:
+    - type: Transform
+      pos: 7.6530333,44.691956
+      parent: 1
   - uid: 5266
     components:
     - type: Transform
       parent: 5265
     - type: Physics
       canCollide: False
-  - uid: 9697
-    components:
-    - type: Transform
-      pos: 7.342591,43.711636
-      parent: 1
-  - uid: 9698
-    components:
-    - type: Transform
-      pos: 7.6237907,43.734123
-      parent: 1
 - proto: CP14IronBar5
   entities:
   - uid: 5275
@@ -78271,51 +78201,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,42.5
       parent: 1
-- proto: CP14IronDoorBankSafe1
-  entities:
-  - uid: 9090
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,37.5
-      parent: 1
-- proto: CP14IronDoorBankSafe2
-  entities:
-  - uid: 9058
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,39.5
-      parent: 1
-- proto: CP14IronDoorBankSafe3
-  entities:
-  - uid: 3662
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,41.5
-      parent: 1
-- proto: CP14IronDoorBankSafe4
-  entities:
-  - uid: 4053
-    components:
-    - type: Transform
-      pos: 4.5,38.5
-      parent: 1
-- proto: CP14IronDoorBankSafe5
-  entities:
-  - uid: 4026
-    components:
-    - type: Transform
-      pos: 2.5,38.5
-      parent: 1
-- proto: CP14IronDoorBankSafe6
-  entities:
-  - uid: 3932
-    components:
-    - type: Transform
-      pos: 0.5,38.5
-      parent: 1
 - proto: CP14IronDoorBankStaff
   entities:
   - uid: 3913
@@ -78392,24 +78277,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 19.5,15.5
       parent: 1
-- proto: CP14JewelryRuby
-  entities:
-  - uid: 9689
-    components:
-    - type: Transform
-      parent: 9688
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: CP14JewelryTopaz
-  entities:
-  - uid: 9690
-    components:
-    - type: Transform
-      parent: 9688
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: CP14Lamppost
   entities:
   - uid: 5316
@@ -79083,13 +78950,6 @@ entities:
     - type: Transform
       pos: 30.509441,37.657265
       parent: 1
-- proto: CP14PlatinumCoin5
-  entities:
-  - uid: 9679
-    components:
-    - type: Transform
-      pos: 7.211579,44.667915
-      parent: 1
 - proto: CP14RandomBushOffsetSpawner
   entities:
   - uid: 3550
@@ -79291,6 +79151,108 @@ entities:
     - type: Transform
       pos: 35.03091,28.890251
       parent: 1
+- proto: CP14Safe
+  entities:
+  - uid: 4053
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,39.5
+      parent: 1
+  - uid: 4074
+    components:
+    - type: Transform
+      pos: 1.5,39.5
+      parent: 1
+  - uid: 5315
+    components:
+    - type: Transform
+      pos: 2.5,39.5
+      parent: 1
+  - uid: 5319
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,37.5
+      parent: 1
+  - uid: 9248
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,38.5
+      parent: 1
+  - uid: 9388
+    components:
+    - type: Transform
+      pos: 3.5,39.5
+      parent: 1
+  - uid: 9396
+    components:
+    - type: Transform
+      pos: 0.5,39.5
+      parent: 1
+  - uid: 9637
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,37.5
+      parent: 1
+  - uid: 9660
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,37.5
+      parent: 1
+  - uid: 9665
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,41.5
+      parent: 1
+  - uid: 9671
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,40.5
+      parent: 1
+  - uid: 9679
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,37.5
+      parent: 1
+  - uid: 9680
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,37.5
+      parent: 1
+- proto: CP14SafeVaultFilled25
+  entities:
+  - uid: 3942
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,42.5
+      parent: 1
+  - uid: 5527
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,43.5
+      parent: 1
+  - uid: 9681
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,42.5
+      parent: 1
+  - uid: 9685
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,43.5
+      parent: 1
 - proto: CP14Scissors
   entities:
   - uid: 8725
@@ -79479,15 +79441,6 @@ entities:
     - type: Transform
       pos: 29.337812,39.78022
       parent: 1
-- proto: CP14SilverCoin
-  entities:
-  - uid: 9692
-    components:
-    - type: Transform
-      parent: 9688
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: CP14SilverCoin1
   entities:
   - uid: 4466
@@ -79495,20 +79448,6 @@ entities:
     - type: Transform
       pos: 18.563568,32.792416
       parent: 1
-- proto: CP14SilverCoin5
-  entities:
-  - uid: 9671
-    components:
-    - type: Transform
-      pos: 7.690447,44.68508
-      parent: 1
-  - uid: 9691
-    components:
-    - type: Transform
-      parent: 9688
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: CP14SmallWoodenCrate
   entities:
   - uid: 12995
@@ -80077,11 +80016,23 @@ entities:
     - type: Transform
       pos: 4.5,45.5
       parent: 1
+  - uid: 3911
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,44.5
+      parent: 1
   - uid: 3933
     components:
     - type: Transform
       pos: 24.5,45.5
       parent: 1
+  - uid: 4026
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,44.5
+      parent: 1
   - uid: 4093
     components:
     - type: Transform
@@ -80192,6 +80143,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,-2.5
       parent: 1
+  - uid: 5345
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,44.5
+      parent: 1
   - uid: 5395
     components:
     - type: Transform
@@ -80322,16 +80279,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 29.5,2.5
       parent: 1
-  - uid: 9681
-    components:
-    - type: Transform
-      pos: 7.5,44.5
-      parent: 1
-  - uid: 9685
-    components:
-    - type: Transform
-      pos: 8.5,44.5
-      parent: 1
   - uid: 9868
     components:
     - type: Transform
@@ -81376,10 +81323,15 @@ entities:
     - type: Transform
       pos: 15.5,39.5
       parent: 1
+  - uid: 3650
+    components:
+    - type: Transform
+      pos: -0.5,42.5
+      parent: 1
   - uid: 3655
     components:
     - type: Transform
-      pos: 3.5,38.5
+      pos: -0.5,41.5
       parent: 1
   - uid: 3660
     components:
@@ -81389,7 +81341,7 @@ entities:
   - uid: 3661
     components:
     - type: Transform
-      pos: 1.5,38.5
+      pos: -0.5,40.5
       parent: 1
   - uid: 3679
     components:
@@ -81406,11 +81358,6 @@ entities:
     - type: Transform
       pos: 1.5,36.5
       parent: 1
-  - uid: 3704
-    components:
-    - type: Transform
-      pos: 3.5,37.5
-      parent: 1
   - uid: 3887
     components:
     - type: Transform
@@ -81444,11 +81391,6 @@ entities:
         state: top
       - sprite: _CP14/Structures/Wallpaper/wallpaper_bank.rsi
         state: right
-  - uid: 3899
-    components:
-    - type: Transform
-      pos: 5.5,38.5
-      parent: 1
   - uid: 3900
     components:
     - type: Transform
@@ -81512,11 +81454,6 @@ entities:
         state: top
       - sprite: _CP14/Structures/Wallpaper/wallpaper_purple.rsi
         state: right
-  - uid: 3925
-    components:
-    - type: Transform
-      pos: 5.5,37.5
-      parent: 1
   - uid: 3926
     components:
     - type: Transform
@@ -81650,11 +81587,6 @@ entities:
       layers:
       - sprite: _CP14/Structures/Wallpaper/wallpaper_bank.rsi
         state: right
-  - uid: 4074
-    components:
-    - type: Transform
-      pos: 14.5,40.5
-      parent: 1
   - uid: 4076
     components:
     - type: Transform
@@ -81749,11 +81681,6 @@ entities:
     - type: Transform
       pos: 1.5,45.5
       parent: 1
-  - uid: 9042
-    components:
-    - type: Transform
-      pos: 14.5,38.5
-      parent: 1
   - uid: 9043
     components:
     - type: Transform
@@ -81763,15 +81690,10 @@ entities:
       layers:
       - sprite: _CP14/Structures/Wallpaper/wallpaper_purple.rsi
         state: top
-  - uid: 9075
+  - uid: 9090
     components:
     - type: Transform
-      pos: 13.5,38.5
-      parent: 1
-  - uid: 9076
-    components:
-    - type: Transform
-      pos: 13.5,40.5
+      pos: 3.5,40.5
       parent: 1
   - uid: 9126
     components:
@@ -81783,11 +81705,6 @@ entities:
     - type: Transform
       pos: -0.5,39.5
       parent: 1
-  - uid: 9248
-    components:
-    - type: Transform
-      pos: 1.5,37.5
-      parent: 1
   - uid: 9258
     components:
     - type: Transform
@@ -81812,11 +81729,26 @@ entities:
     - type: Transform
       pos: -0.5,43.5
       parent: 1
+  - uid: 9397
+    components:
+    - type: Transform
+      pos: 0.5,40.5
+      parent: 1
   - uid: 9398
     components:
     - type: Transform
       pos: -0.5,45.5
       parent: 1
+  - uid: 9399
+    components:
+    - type: Transform
+      pos: 1.5,40.5
+      parent: 1
+  - uid: 9492
+    components:
+    - type: Transform
+      pos: 2.5,40.5
+      parent: 1
   - uid: 9694
     components:
     - type: Transform
@@ -81893,14 +81825,6 @@ entities:
       parent: 1
     - type: Fixtures
       fixtures: {}
-  - uid: 3942
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,40.5
-      parent: 1
-    - type: Fixtures
-      fixtures: {}
   - uid: 4029
     components:
     - type: Transform
@@ -82000,6 +81924,29 @@ entities:
       parent: 1
     - type: Fixtures
       fixtures: {}
+  - uid: 9058
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,38.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 9127
+    components:
+    - type: Transform
+      pos: 13.5,41.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 9130
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,37.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
   - uid: 9485
     components:
     - type: Transform
@@ -82014,14 +81961,6 @@ entities:
       parent: 1
     - type: Fixtures
       fixtures: {}
-  - uid: 9492
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,39.5
-      parent: 1
-    - type: Fixtures
-      fixtures: {}
   - uid: 9498
     components:
     - type: Transform
@@ -86259,21 +86198,6 @@ entities:
     - type: Transform
       pos: 4.5,46.5
       parent: 1
-  - uid: 9396
-    components:
-    - type: Transform
-      pos: -0.5,42.5
-      parent: 1
-  - uid: 9397
-    components:
-    - type: Transform
-      pos: -0.5,41.5
-      parent: 1
-  - uid: 9399
-    components:
-    - type: Transform
-      pos: -0.5,40.5
-      parent: 1
 - proto: CP14WindowStoneBrick
   entities:
   - uid: 2560
@@ -86733,15 +86657,11 @@ entities:
     - type: Transform
       pos: 18.5,17.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 11943
     components:
     - type: Transform
       pos: 24.5,39.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: CP14WoodenClosetAlchemyFilled
   entities:
   - uid: 1961
@@ -87390,48 +87310,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,32.5
       parent: 1
-- proto: CP14WoodenPallet
-  entities:
-  - uid: 3650
-    components:
-    - type: Transform
-      pos: 2.5,37.5
-      parent: 1
-  - uid: 3911
-    components:
-    - type: Transform
-      pos: 4.5,37.5
-      parent: 1
-  - uid: 5527
-    components:
-    - type: Transform
-      pos: 14.5,41.5
-      parent: 1
-  - uid: 9127
-    components:
-    - type: Transform
-      pos: 14.5,37.5
-      parent: 1
-  - uid: 9130
-    components:
-    - type: Transform
-      pos: 14.5,39.5
-      parent: 1
-  - uid: 9388
-    components:
-    - type: Transform
-      pos: 0.5,37.5
-      parent: 1
-  - uid: 9695
-    components:
-    - type: Transform
-      pos: 7.5,43.5
-      parent: 1
-  - uid: 9696
-    components:
-    - type: Transform
-      pos: 7.5,42.5
-      parent: 1
 - proto: CP14WoodenPlanks1
   entities:
   - uid: 5171
diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
index a705799898..77dc55a6e0 100644
--- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
@@ -7,7 +7,7 @@
     contents:
       - id: CP14KeyRingAlchemist
       - id: HandLabeler #TODO custom cp14 labeler
-      - id: Syringe #TODO custom cp14 syringe
+      - id: CP14Syringe
         amount: 2
       - id: CP14Cauldron
       - id: CP14Pestle
@@ -77,4 +77,30 @@
       - id: HandLabeler #TODO custom cp14 labeler
       - id: CP14StampDenied
       - id: CP14StampApproved
-      - id: CP14StampCommandant
\ No newline at end of file
+      - id: CP14StampCommandant
+
+- type: entity
+  parent: CP14SafeVault
+  id: CP14SafeVaultFilled25
+  suffix: Vault, Filled 25gp
+  components:
+  - type: EntityTableContainerFill
+    containers: 
+      entity_storage: !type:GroupSelector
+        children:
+          - id: CP14JewelryRuby
+            weight: 0.1
+          - !type:GroupSelector
+            children:
+            # or 5gp
+            - id: CP14GoldCoin5
+            # or 50sp
+            - !type:AllSelector
+              children:
+              - id: CP14SilverCoin
+              - id: CP14SilverCoin
+              - id: CP14SilverCoin
+              - id: CP14SilverCoin 
+              - id: CP14SilverCoin
+            rolls: !type:ConstantNumberSelector
+              value: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
index 64d1de87bd..10a0c9e967 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
@@ -180,8 +180,6 @@
   - type: Strippable
   - type: UserInterface
     interfaces:
-      enum.VoiceMaskUIKey.Key:
-        type: VoiceMaskBoundUserInterface
       enum.HumanoidMarkingModifierKey.Key:
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
@@ -224,6 +222,7 @@
   - type: CP14FootprintTrailer
   - type: CP14DemiplaneStabilizer
     requireAlive: true
+  - type: CanEnterCryostorage
 
 
 - type: entity
@@ -256,6 +255,9 @@
     - Pacified
     - StaminaModifier
     - Flashed
+    - RadiationProtection
+    - Drowsiness
+    - Adrenaline
   - type: Blindable
   - type: Bloodstream
     bloodReagent: CP14Blood
@@ -271,6 +273,11 @@
     heatDamage:
       types:
         Heat: 1.5 #per second, scales with temperature & other constants
+  - type: TemperatureSpeed
+    thresholds:
+      293: 0.8
+      280: 0.6
+      260: 0.4
   - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
index ea997bdbad..7bc46e5142 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
@@ -222,4 +222,44 @@
         visible: false
   - type: SolutionContainerVisuals
     maxFillLevels: 2
-    fillBaseName: liq-
\ No newline at end of file
+    fillBaseName: liq-
+
+- type: entity
+  id: CP14Syringe
+  parent: BaseItem
+  name: syringe
+  description: Used to draw blood samples from mobs, or to inject them with reagents.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Alchemy/syringe.rsi
+    layers:
+      - state: syringe1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+      - state: base
+        map: ["enum.SolutionContainerLayers.Base"]
+  - type: Icon
+    sprite: _CP14/Objects/Specific/Alchemy/syringe.rsi
+    state: base
+  - type: Item
+    size: Tiny
+    sprite: _CP14/Objects/Specific/Alchemy/syringe.rsi
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 10
+  - type: Injector
+    injectOnly: false
+    toggleState: Draw
+  - type: ExaminableSolution
+    solution: injector
+  - type: Spillable
+    solution: injector
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: syringe
+  - type: Tag
+    tags:
+    - Syringe
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml
index 7651648da4..5e60287e25 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml
@@ -4,7 +4,6 @@
   name: bucket
   description: It's a boring old bucket.
   categories: [ ForkFiltered ]
-  suffix: CP14
   components: 
   - type: Drink
     solution: bucket
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml
index 0a159ea8c6..628b10d691 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml
@@ -5,6 +5,8 @@
   categories: [ ForkFiltered ]
   parent: BaseItem
   components:
+  - type: Item
+    size: Tiny
   - type: Sprite
     sprite: _CP14/Objects/Tools/scissors.rsi
     state: icon
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml
index fea7f2cb0f..68863a1722 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml
@@ -102,11 +102,11 @@
 
 - type: entity
   parent: CP14IronDoor
-  id: CP14IronDoorBankSafe1
-  suffix: Bank Safe 1
+  id: CP14IronDoorBankSafe
+  suffix: Bank Safe
   components:
   - type: CP14Lock
-    autoGenerateShape: BankSafe1
+    autoGenerateShape: BankSafe
   - type: Lock
     locked: true
 
@@ -117,55 +117,5 @@
   components:
   - type: CP14Lock
     autoGenerateShape: BankCommandantRoom
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe2
-  suffix: Bank Safe 2
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe2
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe3
-  suffix: Bank Safe 3
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe3
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe4
-  suffix: Bank Safe 4
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe4
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe5
-  suffix: Bank Safe 5
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe5
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe6
-  suffix: Bank Safe 6
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe6
   - type: Lock
     locked: true
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml
index a86ee997ba..955ee0bf3a 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml
@@ -44,6 +44,8 @@
   - type: Appearance
   - type: Transform
     anchored: true
+  - type: Lock
+    locked: false
 
 - type: entity
   name: wooden cabinet
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml
index ff1af14f70..a46a6a3244 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml
@@ -57,13 +57,15 @@
   - type: Rotatable
   - type: Transform
     anchored: true
+  - type: Lock
+    locked: false
 
 - type: entity
-  name: wooden closet
   parent:
   - CP14ClosetBase
   - CP14BaseFlammable
   id: CP14WoodenCloset
+  name: wooden closet
   description: It's a regular wooden closet.
   components:
   - type: Sprite
@@ -95,4 +97,60 @@
         spawn:
           CP14WoodenPlanks1:
             min: 2
-            max: 5
\ No newline at end of file
+            max: 5
+
+- type: entity
+  name: safe
+  parent:
+  - CP14ClosetBase
+  id: CP14Safe
+  description: A giant iron box for storing your most precious possessions. Extremely heavy and extremely strong.
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Storage/Dressers/vault.rsi
+    state: base
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.05,0.45,0.45"
+        density: 2000
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 500
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 350
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+          params:
+            volume: -6
+  - type: Lock
+    locked: true
+  - type: CP14Lock
+    autoGenerateShape: BankSafe
+
+- type: entity
+  parent: CP14Safe
+  id: CP14SafeVault
+  name: vault safe
+  components:
+  - type: CP14Lock
+    autoGenerateShape: BankVault
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/fire.yml b/Resources/Prototypes/_CP14/Entities/fire.yml
index 2cced93ebc..f3433b0a0c 100644
--- a/Resources/Prototypes/_CP14/Entities/fire.yml
+++ b/Resources/Prototypes/_CP14/Entities/fire.yml
@@ -3,16 +3,16 @@
   name: fire
   description: it's fire!
   categories: [ ForkFiltered ]
-  suffix: cp14
   placement:
     mode: SnapgridCenter
   components:
   - type: Sprite
-    drawDepth: Mobs
+    drawdepth: Effects
     snapCardinals: true
     sprite: _CP14/Effects/fire.rsi
     layers:
       - state: full
+        shader: unshaded
   - type: FireVisuals
     sprite: _CP14/Effects/fire.rsi
     normalState: full
diff --git a/Resources/Prototypes/_CP14/Entities/keyrings.yml b/Resources/Prototypes/_CP14/Entities/keyrings.yml
index 743f5833dd..e915188602 100644
--- a/Resources/Prototypes/_CP14/Entities/keyrings.yml
+++ b/Resources/Prototypes/_CP14/Entities/keyrings.yml
@@ -79,12 +79,7 @@
     contents:
     - id: CP14KeyBankEntrance
     - id: CP14KeyBankStaff
-    - id: CP14KeyBankSafe1
-    - id: CP14KeyBankSafe2
-    - id: CP14KeyBankSafe3
-    - id: CP14KeyBankSafe4
-    - id: CP14KeyBankSafe5
-    - id: CP14KeyBankSafe6
+    - id: CP14KeyBankSafe
 
 - type: entity
   parent: CP14BaseKeyRing
@@ -97,9 +92,4 @@
     - id: CP14KeyBankVault
     - id: CP14KeyBankEntrance
     - id: CP14KeyBankStaff
-    - id: CP14KeyBankSafe1
-    - id: CP14KeyBankSafe2
-    - id: CP14KeyBankSafe3
-    - id: CP14KeyBankSafe4
-    - id: CP14KeyBankSafe5
-    - id: CP14KeyBankSafe6
\ No newline at end of file
+    - id: CP14KeyBankSafe
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/keys.yml b/Resources/Prototypes/_CP14/Entities/keys.yml
index b62f835bba..d5010407be 100644
--- a/Resources/Prototypes/_CP14/Entities/keys.yml
+++ b/Resources/Prototypes/_CP14/Entities/keys.yml
@@ -169,60 +169,10 @@
 
 - type: entity
   parent: CP14BaseKey
-  id: CP14KeyBankSafe1
-  name: bank safe 1 key
+  id: CP14KeyBankSafe
+  name: bank safe key
   components:
   - type: Sprite
     state: key12
   - type: CP14Key
-    autoGenerateShape: BankSafe1
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe2
-  name: bank safe 2 key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe2
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe3
-  name: bank safe 3 key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe3
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe4
-  name: bank safe 4 key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe4
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe5
-  name: bank safe 5 key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe5
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe6
-  name: bank safe 6 key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe6
\ No newline at end of file
+    autoGenerateShape: BankSafe
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/GameRules/roundstart.yml b/Resources/Prototypes/_CP14/GameRules/roundstart.yml
index a2ecfc6300..dac1c34f9b 100644
--- a/Resources/Prototypes/_CP14/GameRules/roundstart.yml
+++ b/Resources/Prototypes/_CP14/GameRules/roundstart.yml
@@ -23,24 +23,24 @@
       - CP14PersonalCurrencyCollectObjectiveGroup
 
 - type: entity
-  id: CP14BanditsRule
+  id: CP14SociopathsRule
   parent: CP14BaseGameRule
   components:
   - type: GameRule
-    minPlayers: 0 #Increase when bigger online
+    minPlayers: 2 #Increase when bigger online
   - type: AntagSelection
     definitions:
-    - prefRoles: [ CP14Bandit ]
-      startingGear: CP14BanditGear
+    - prefRoles: [ CP14Sociopath ]
+      startingGear: CP14SociopathGear
       max: 8
       playerRatio: 10
-      blacklist:
-        components:
-        - AntagImmune
+      #blacklist:
+      #  components:
+      #  - AntagImmune
       lateJoinAdditional: true
       mindRoles:
-      - CP14MindRoleBandit
+      - CP14MindRoleSociopath
       briefing:
-        text: cp14-roles-antag-bandit-briefing
+        text: cp14-roles-antag-sociopath-briefing
         color: "#cc3010"
-        sound: "/Audio/_CP14/Ambience/Antag/bandit_start.ogg"
\ No newline at end of file
+        sound: "/Audio/_CP14/Ambience/Antag/bandit_start.ogg"
diff --git a/Resources/Prototypes/_CP14/LockCategories/LockCategory.yml b/Resources/Prototypes/_CP14/LockCategories/LockCategory.yml
index b6afbd6313..ef177bf919 100644
--- a/Resources/Prototypes/_CP14/LockCategories/LockCategory.yml
+++ b/Resources/Prototypes/_CP14/LockCategories/LockCategory.yml
@@ -20,29 +20,8 @@
   id: BankCommandantRoom
   complexity: 7
 
-
 - type: CP14LockCategory
-  id: BankSafe1
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankSafe2
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankSafe3
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankSafe4
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankSafe5
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankSafe6
+  id: BankSafe
   complexity: 5
 
 # Tavern 
diff --git a/Resources/Prototypes/_CP14/Roles/Antags/Bandit.yml b/Resources/Prototypes/_CP14/Roles/Antags/Bandit.yml
index a5c322ae4b..c83e535a75 100644
--- a/Resources/Prototypes/_CP14/Roles/Antags/Bandit.yml
+++ b/Resources/Prototypes/_CP14/Roles/Antags/Bandit.yml
@@ -1,16 +1,16 @@
 - type: antag
-  id: CP14Bandit
-  name: cp14-roles-antag-bandit-name
+  id: CP14Sociopath
+  name: cp14-roles-antag-sociopath-name
   antagonist: true
   setPreference: true
-  objective: cp14-roles-antag-bandit-objective
+  objective: cp14-roles-antag-sociopath-objective
   requirements:
   - !type:OverallPlaytimeRequirement
     time: 3600 # 1h
   #guides: TODO
 
 - type: startingGear
-  id: CP14BanditGear
+  id: CP14SociopathGear
   storage:
     back:
     - CP14BaseLockpick
@@ -19,14 +19,13 @@
 
 - type: entity
   parent: BaseMindRoleAntag
-  id: CP14MindRoleBandit
+  id: CP14MindRoleSociopath
   categories: [ ForkFiltered ]
-  name: Bandit Role
-#  description: cp14-roles-antag-bandit-objective
+  name: Sociopath Role
   components:
   - type: MindRole
-    antagPrototype: CP14Bandit
+    antagPrototype: CP14Sociopath
     exclusiveAntag: true
-  - type: CP14BanditRole
+  - type: CP14SociopathRole
   - type: RoleBriefing
-    briefing: cp14-roles-antag-bandit-briefing
\ No newline at end of file
+    briefing: cp14-roles-antag-sociopath-briefing
diff --git a/Resources/Prototypes/_CP14/game_presets.yml b/Resources/Prototypes/_CP14/game_presets.yml
index ef7dfb3140..b3f771ccd0 100644
--- a/Resources/Prototypes/_CP14/game_presets.yml
+++ b/Resources/Prototypes/_CP14/game_presets.yml
@@ -17,7 +17,7 @@
   showInVote: true
   cP14Allowed: true
   rules:
-    - CP14BanditsRule
+    - CP14SociopathsRule
     - CP14RoundObjectivesRule
 
 - type: gamePreset
@@ -30,4 +30,4 @@
   cP14Allowed: true
   rules:
     - Sandbox
-    - CP14RoundObjectivesRule
\ No newline at end of file
+    - CP14RoundObjectivesRule
diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/base.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/base.png
new file mode 100644
index 0000000000..c014951eb6
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/base.png differ
diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/inhand-left.png
new file mode 100644
index 0000000000..8abd2b2bd0
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/inhand-right.png
new file mode 100644
index 0000000000..7026132b9d
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/meta.json
new file mode 100644
index 0000000000..16d91a43db
--- /dev/null
+++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "license": "CLA",
+    "copyright": "Created by Max Gab for Crystallpunk",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "syringe1"
+        },
+        {
+            "name": "syringe2"
+        },
+        {
+            "name": "syringe3"
+        },
+        {
+          "name": "inhand-left",
+          "directions": 4
+        },
+        {
+          "name": "inhand-right",
+          "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/syringe1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/syringe1.png
new file mode 100644
index 0000000000..daee91d47d
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/syringe1.png differ
diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/syringe2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/syringe2.png
new file mode 100644
index 0000000000..0982b70131
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/syringe2.png differ
diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/syringe3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/syringe3.png
new file mode 100644
index 0000000000..719baf4bd7
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/syringe.rsi/syringe3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/base.png b/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/base.png
new file mode 100644
index 0000000000..bdc89e8291
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/base.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/base_door.png b/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/base_door.png
new file mode 100644
index 0000000000..6e257bfdbf
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/base_door.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/base_open.png b/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/base_open.png
new file mode 100644
index 0000000000..1c14a8561b
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/base_open.png differ
diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/meta.json b/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/meta.json
new file mode 100644
index 0000000000..1b9bbd15eb
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Storage/Dressers/vault.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "Created by omsoyk (discord)",
+  "size": {
+    "x": 32,
+    "y": 96
+  },
+  "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "base_open",
+      "directions": 4
+    },
+    {
+      "name": "base_door",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 9472ef2362..d33437eebe 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -132,6 +132,20 @@ CP14ClothingRingShadowStep: CP14ClothingRingManaGift
 CP14BlueVial: CP14BlueBottle
 CP14GreenVial: CP14GreenBottle
 
+#2024-13-11
+CP14IronDoorBankSafe1: CP14IronDoorBankSafe
+CP14IronDoorBankSafe2: CP14IronDoorBankSafe
+CP14IronDoorBankSafe3: CP14IronDoorBankSafe
+CP14IronDoorBankSafe4: CP14IronDoorBankSafe
+CP14IronDoorBankSafe5: CP14IronDoorBankSafe
+CP14IronDoorBankSafe6: CP14IronDoorBankSafe
+CP14KeyBankSafe1: CP14KeyBankSafe
+CP14KeyBankSafe2: CP14KeyBankSafe
+CP14KeyBankSafe3: CP14KeyBankSafe
+CP14KeyBankSafe4: CP14KeyBankSafe
+CP14KeyBankSafe5: CP14KeyBankSafe
+CP14KeyBankSafe6: CP14KeyBankSafe
+
 # <---> CrystallPunk migration zone end