diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5e65967968..2389606031 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,17 +1,23 @@
 ## About the PR
 <!-- What did you change in this PR? -->
-<!-- Что вы изменили в своем пулл реквесте? -->
 
 ## Why / Balance
 <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. -->
-<!-- Зачем нужно это изменение? Прикрепите любые обсуждения или проблемы здесь. Опишите, как это повлияет на текущий баланс игры. -->
 
 ## Media
 <!--
 PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes.
 Small fixes/refactors are exempt.
 -->
+
+**Changelog**
+<!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay.
+Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up.
+Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. -->
 <!--
-Пулл реквесты, которые несут за собой игровые изменения (добавления одежды, предметов и так далее) требуют чтобы вы прикрепили скриншоты или видеоролики, демонстрирующие эти изменения.
-Небольшие исправления не считаются.
+:cl:
+- add: Added fun!
+- remove: Removed fun!
+- tweak: Changed fun!
+- fix: Fixed fun!
 -->
diff --git a/.github/workflows/CP14Publish.yml b/.github/workflows/CP14Publish.yml
index 2ab9ccfdca..2e7dec2557 100644
--- a/.github/workflows/CP14Publish.yml
+++ b/.github/workflows/CP14Publish.yml
@@ -1,4 +1,4 @@
-name: Publish
+name: Edge Publish
 
 concurrency:
   group: publish
@@ -10,6 +10,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+    
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    
+    - name: Install Python dependencies
+      run: sudo apt-get install -y python3-paramiko python3-lxml
+      
     - name: Send POST-request
       uses: appleboy/ssh-action@master
       with:
@@ -18,3 +27,10 @@ jobs:
         password: ${{ secrets.BUILD_PASS }}
         port: 22
         script: sh update.sh &> /dev/null
+
+    - name: Publish changelog (Discord)
+      continue-on-error: true
+      run: Tools/actions_changelogs_since_last_run.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
\ No newline at end of file
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 0ed281f317..ad2de7ef5d 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -40,7 +40,7 @@ public sealed class ClientClothingSystem : ClothingSystem
         {Jumpsuit, "INNERCLOTHING"},
         {"neck", "NECK"},
         {"back", "BACKPACK"},
-        {"belt1", "BELT1"},
+        {"belt", "BELT"},
         {"belt2", "BELT2"},
         {"gloves", "HAND"},
         {"shoes", "FEET"},
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 3ea4ecb612..d75642136a 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -1,5 +1,6 @@
 using Content.Client._CP14.Discord;
 using Content.Client._CP14.JoinQueue;
+using Content.Client._CP14.Input;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -171,6 +172,7 @@ namespace Content.Client.Entry
             _parallaxManager.LoadDefaultParallax();
 
             //CP14
+            CP14ContentContexts.SetupContexts(_inputManager.Contexts);
             _overlayManager.AddOverlay(new CP14BasePostProcessOverlay());
             _discordAuth.Initialize();
             _joinQueueManager.Initialize();
diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
index 116c78b417..b33426766c 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
+++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
@@ -26,27 +26,6 @@
                 <!-- Products will be added as children here -->
             </BoxContainer>
         </BoxContainer>
-        <!-- CP14 random reactions begin -->
-        <!--<BoxContainer Name="RandomVariations"
-                      Orientation="Vertical"
-                      VerticalExpand="True"
-                      VerticalAlignment="Center"
-                      HorizontalAlignment="Center">
-            <controls:SplitBar MinHeight="10">
-            </controls:SplitBar>
-            <Label Name="RandomVariationsLabel"
-                   Text="{Loc 'cp14-guidebook-random-variations-title'}"
-                   Visible="False"
-                   HorizontalAlignment="Center"
-                   FontColorOverride="#1e6651" />
-            <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalAlignment="Center">
-                <BoxContainer Name="RandomProductsContainer" HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Vertical">
-                    ~1~ Random products will be added as children here @1@
-                </BoxContainer>
-            </BoxContainer>
-        </BoxContainer>-->
-        <!-- CP14 random reactions end -->
-
     </BoxContainer>
     <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5" />
 </BoxContainer>
diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
index 1a52166075..29ed124422 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
@@ -37,7 +37,7 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
         Container container = ReactantsContainer;
         SetReagents(prototype.Reactants, ref container, protoMan);
         Container productContainer = ProductsContainer;
-        var products = new Dictionary<string, FixedPoint2>(prototype._products);  // CP14 random reactions
+        var products = new Dictionary<string, FixedPoint2>(prototype.Products);
         foreach (var (reagent, reactantProto) in prototype.Reactants)
         {
             if (reactantProto.Catalyst)
@@ -45,14 +45,6 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
         }
         SetReagents(products, ref productContainer, protoMan, false);
 
-        // CP14 random reagents begin
-        if (prototype.Cp14RandomProducts.Count > 0)
-        {
-            var randomProducts = new Dictionary<string, FixedPoint2>(prototype.Cp14RandomProducts[prototype.Cp14RandomProductIndex]);
-            SetReagents(randomProducts, ref productContainer, protoMan, false);
-        }
-        // CP14 random reagents end
-
         var mixingCategories = new List<MixingCategoryPrototype>();
         if (prototype.MixingCategories != null)
         {
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 97965913ee..5b7614780b 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -85,9 +85,6 @@ namespace Content.Client.Input
             human.AddFunction(ContentKeyFunctions.Arcade1);
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
-            //CP14 Keys
-            human.AddFunction(ContentKeyFunctions.CP14OpenSkillMenu);
-            //CP14 Keys end
 
             // actions should be common (for ghosts, mobs, etc)
             common.AddFunction(ContentKeyFunctions.OpenActionsMenu);
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index 43169fc561..fe12016b5e 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Shared._CP14.Input;
 using System.Numerics;
 using Content.Client.Stylesheets;
 using Content.Shared.CCVar;
@@ -313,7 +314,9 @@ namespace Content.Client.Options.UI.Tabs
 
             //CP14
             AddHeader("ui-options-header-cp14");
-            AddButton(ContentKeyFunctions.CP14OpenSkillMenu);
+            AddButton(CP14ContentKeyFunctions.CP14OpenSkillMenu);
+            AddButton(CP14ContentKeyFunctions.OpenBelt2);
+            AddButton(CP14ContentKeyFunctions.SmartEquipBelt2);
             //CP14 end
 
             foreach (var control in _keyControls.Values)
diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
index 9bcf64cf0e..8b58293c3d 100644
--- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
+++ b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
@@ -3,6 +3,7 @@
            xmlns:style="clr-namespace:Content.Client.Stylesheets"
            xmlns:ic="clr-namespace:Robust.Shared.Input;assembly=Robust.Shared"
            xmlns:is="clr-namespace:Content.Shared.Input;assembly=Content.Shared"
+           xmlns:isc="clr-namespace:Content.Shared._CP14.Input;assembly=Content.Shared"
            xmlns:xe="clr-namespace:Content.Client.UserInterface.XamlExtensions"
            xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
            xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.MenuBar.Widgets"
@@ -39,7 +40,7 @@
         Access="Internal"
         Icon="{xe:Tex '/Textures/Interface/students-cap.svg.192dpi.png'}"
         ToolTip="{Loc 'cp14-game-hud-open-skill-menu-button-tooltip'}"
-        BoundKey = "{x:Static is:ContentKeyFunctions.CP14OpenSkillMenu}"
+        BoundKey = "{x:Static isc:CP14ContentKeyFunctions.CP14OpenSkillMenu}"
         MinSize="42 64"
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
diff --git a/Content.Client/_CP14/Input/CP14ContentContexts.cs b/Content.Client/_CP14/Input/CP14ContentContexts.cs
new file mode 100644
index 0000000000..1ae01a68a9
--- /dev/null
+++ b/Content.Client/_CP14/Input/CP14ContentContexts.cs
@@ -0,0 +1,16 @@
+using Content.Shared._CP14.Input;
+using Robust.Shared.Input;
+
+namespace Content.Client._CP14.Input
+{
+    public static class CP14ContentContexts
+    {
+        public static void SetupContexts(IInputContextContainer contexts)
+        {
+            var human = contexts.GetContext("human");
+            human.AddFunction(CP14ContentKeyFunctions.OpenBelt2);
+            human.AddFunction(CP14ContentKeyFunctions.SmartEquipBelt2);
+            human.AddFunction(CP14ContentKeyFunctions.CP14OpenSkillMenu);
+        }
+    }
+}
diff --git a/Content.Client/_CP14/Trading/CP14TradingPlatformBoundUserInterface.cs b/Content.Client/_CP14/Trading/CP14TradingPlatformBoundUserInterface.cs
index 47a2d19950..b089d39347 100644
--- a/Content.Client/_CP14/Trading/CP14TradingPlatformBoundUserInterface.cs
+++ b/Content.Client/_CP14/Trading/CP14TradingPlatformBoundUserInterface.cs
@@ -14,7 +14,6 @@ public sealed class CP14TradingPlatformBoundUserInterface(EntityUid owner, Enum
 
         _window = this.CreateWindow<CP14TradingPlatformWindow>();
 
-        _window.OnUnlock += pos => SendMessage(new CP14TradingPositionUnlockAttempt(pos));
         _window.OnBuy += pos => SendMessage(new CP14TradingPositionBuyAttempt(pos));
     }
 
diff --git a/Content.Client/_CP14/Trading/CP14TradingPlatformWindow.xaml b/Content.Client/_CP14/Trading/CP14TradingPlatformWindow.xaml
index 37e9a615f7..716a801381 100644
--- a/Content.Client/_CP14/Trading/CP14TradingPlatformWindow.xaml
+++ b/Content.Client/_CP14/Trading/CP14TradingPlatformWindow.xaml
@@ -35,6 +35,10 @@
                                 <Label Name="Name" Access="Public" StyleClasses="LabelHeadingBigger" VAlign="Center"
                                        HorizontalExpand="True" HorizontalAlignment="Center" />
                             </BoxContainer>
+                            <BoxContainer Orientation="Horizontal" HorizontalExpand="True" HorizontalAlignment="Center">
+                                <TextureRect VerticalAlignment="Center" Margin="20 0 5 0" HorizontalAlignment="Left" TextureScale="2, 2" TexturePath="/Textures/_CP14/Interface/Misc/star.png"/>
+                                <RichTextLabel  Name="UnlockCost" Access="Public" Text="0"/>
+                            </BoxContainer>
                             <!-- Description -->
                             <BoxContainer HorizontalExpand="True">
                                 <RichTextLabel Name="Description" HorizontalExpand="True" Access="Public" />
@@ -47,17 +51,6 @@
 
                 <!-- Buttons -->
                 <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-
-                    <BoxContainer Name="UnlockBox" Orientation="Horizontal" HorizontalExpand="True" Visible="True">
-                        <Button Name="UnlockButton" Text="{Loc 'cp14-trading-ui-button-unlock'}"
-                                ToolTip="{Loc 'cp14-trading-ui-button-unlock-tooltip'}" StyleClasses="OpenRight"
-                                HorizontalExpand="True" MinHeight="35" Access="Public"/>
-                        <BoxContainer SetWidth="100" MaxWidth="100" Orientation="Horizontal">
-                            <TextureRect VerticalAlignment="Center" Margin="20 0 5 0" HorizontalAlignment="Left" TextureScale="2, 2" TexturePath="/Textures/_CP14/Interface/Misc/star.png"/>
-                            <RichTextLabel  Name="UnlockCost" Access="Public" Text="0"/>
-                        </BoxContainer>
-                    </BoxContainer>
-
                     <BoxContainer Name="BuyBox" Orientation="Horizontal" HorizontalExpand="True" Visible="True">
                         <Button Name="BuyButton" Text="{Loc 'cp14-trading-ui-button-buy'}"
                                 ToolTip="{Loc 'cp14-trading-ui-button-buy-tooltip'}" StyleClasses="OpenRight"
diff --git a/Content.Client/_CP14/Trading/CP14TradingPlatformWindow.xaml.cs b/Content.Client/_CP14/Trading/CP14TradingPlatformWindow.xaml.cs
index ca0d3f95b0..2cf1e6efb4 100644
--- a/Content.Client/_CP14/Trading/CP14TradingPlatformWindow.xaml.cs
+++ b/Content.Client/_CP14/Trading/CP14TradingPlatformWindow.xaml.cs
@@ -6,6 +6,7 @@ using Content.Shared._CP14.Trading;
 using Content.Shared._CP14.Trading.Components;
 using Content.Shared._CP14.Trading.Prototypes;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Player;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -25,6 +26,7 @@ public sealed partial class CP14TradingPlatformWindow : DefaultWindow
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly IEntityManager _e = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
 
     private readonly CP14ClientTradingPlatformSystem _tradingSystem;
     private readonly CP14ClientStationEconomySystem _economySystem;
@@ -39,8 +41,6 @@ public sealed partial class CP14TradingPlatformWindow : DefaultWindow
 
     private ProtoId<CP14TradingFactionPrototype>? _selectedFaction;
     private CP14TradingPositionPrototype? _selectedPosition;
-
-    public event Action<ProtoId<CP14TradingPositionPrototype>>? OnUnlock;
     public event Action<ProtoId<CP14TradingPositionPrototype>>? OnBuy;
 
     private ISawmill Sawmill { get; init; }
@@ -75,21 +75,9 @@ public sealed partial class CP14TradingPlatformWindow : DefaultWindow
             ParallaxBackground.Offset = -offset * 0.25f + new Vector2(1000, 1000); //hardcoding is bad
         };
         GraphControl.OnNodeSelected += SelectNode;
-        UnlockButton.OnPressed += UnlockPressed;
         BuyButton.OnPressed += BuyPressed;
     }
 
-    private void UnlockPressed(BaseButton.ButtonEventArgs obj)
-    {
-        if (_selectedPosition is null)
-            return;
-
-        OnUnlock?.Invoke(_selectedPosition);
-
-        if (_cachedUser is not null)
-            _audio.PlayGlobal(new SoundCollectionSpecifier("CP14CoinImpact"), _cachedUser.Value);
-    }
-
     private void BuyPressed(BaseButton.ButtonEventArgs obj)
     {
         if (_selectedPosition is null)
@@ -133,16 +121,15 @@ public sealed partial class CP14TradingPlatformWindow : DefaultWindow
         }
 
         _selectedPosition = node;
-        var unlocked = _cachedUser.Value.Comp.UnlockedPositions;
+        var unlocked = _cachedUser.Value.Comp.Reputation[_selectedPosition.Faction] >= _selectedPosition.ReputationLevel;
 
         Name.Text = _tradingSystem.GetTradeName(_selectedPosition);
         Description.Text = _tradingSystem.GetTradeDescription(_selectedPosition);
 
         LocationView.Texture = _selectedPosition.Icon.Frame0();
-        UnlockButton.Disabled = !_tradingSystem.CanUnlockPosition((_cachedUser.Value.Owner, _cachedUser.Value.Comp), _selectedPosition);
-        BuyButton.Disabled = !unlocked.Contains(_selectedPosition);
+        BuyButton.Disabled = !unlocked;
 
-        UnlockCost.Text = _selectedPosition.UnlockReputationCost.ToString();
+        UnlockCost.Text = _selectedPosition.ReputationLevel.ToString();
 
         BuyPriceHolder.RemoveAllChildren();
         BuyPriceHolder.AddChild(new CP14PriceControl(_economySystem.GetPrice(_selectedPosition) ?? 0));
@@ -153,24 +140,23 @@ public sealed partial class CP14TradingPlatformWindow : DefaultWindow
         Name.Text = string.Empty;
         Description.Text = string.Empty;
         LocationView.Texture = null;
-        UnlockButton.Disabled = true;
     }
 
     private void CacheSkillProto()
     {
         _allPositions = _proto.EnumeratePrototypes<CP14TradingPositionPrototype>();
         _allFactions = _proto.EnumeratePrototypes<CP14TradingFactionPrototype>().OrderBy(tree => Loc.GetString(tree.Name));
+        UpdateGraphControl();
     }
 
     public void UpdateState(CP14TradingPlatformUiState state)
     {
         _cacheState = state;
-        var ent = _e.GetEntity(state.User);
 
-        if (!_e.TryGetComponent<CP14TradingReputationComponent>(ent, out var repComp))
+        if (!_e.TryGetComponent<CP14TradingReputationComponent>(_player.LocalEntity, out var repComp))
             return;
 
-        _cachedUser = (ent, repComp);
+        _cachedUser = (_player.LocalEntity.Value, repComp);
 
         var plat = _e.GetEntity(state.Platform);
         if (!_e.TryGetComponent<CP14TradingPlatformComponent>(plat, out var platComp))
@@ -192,15 +178,10 @@ public sealed partial class CP14TradingPlatformWindow : DefaultWindow
             if (position.Faction != _selectedFaction)
                 continue;
 
-            var unlocked = _cachedUser.Value.Comp.UnlockedPositions;
-            var gained = unlocked.Contains(position);
-            var active = _tradingSystem.CanUnlockPosition((_cachedUser.Value.Owner, _cachedUser.Value.Comp), position);
-            var node = new CP14NodeTreeElement(position.ID, gained, active, position.UiPosition * 66, position.Icon);
+            var unlocked = _cachedUser.Value.Comp.Reputation[position.Faction] >= position.ReputationLevel;
+            var active = _tradingSystem.CanBuyPosition((_cachedUser.Value.Owner, _cachedUser.Value.Comp), position);
+            var node = new CP14NodeTreeElement(position.ID, unlocked, active, new Vector2(position.ReputationLevel.Float() * 50, position.UiPosition * 50) , position.Icon);
             nodeTreeElements.Add(node);
-            if (position.Prerequisite != null)
-            {
-                edges.Add((position.Prerequisite, position.ID));
-            }
         }
 
         GraphControl.UpdateState(
diff --git a/Content.Client/_CP14/UserInterface/Systems/Skill/CP14SkillUIController.cs b/Content.Client/_CP14/UserInterface/Systems/Skill/CP14SkillUIController.cs
index 28f90a4d2f..3dfd6f5667 100644
--- a/Content.Client/_CP14/UserInterface/Systems/Skill/CP14SkillUIController.cs
+++ b/Content.Client/_CP14/UserInterface/Systems/Skill/CP14SkillUIController.cs
@@ -11,6 +11,7 @@ using Content.Shared._CP14.Skill.Components;
 using Content.Shared._CP14.Skill.Prototypes;
 using Content.Shared._CP14.Skill.Restrictions;
 using Content.Shared.Input;
+using Content.Shared._CP14.Input;
 using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
@@ -53,7 +54,7 @@ public sealed class CP14SkillUIController : UIController, IOnStateEntered<Gamepl
         LayoutContainer.SetAnchorPreset(_window, LayoutContainer.LayoutPreset.CenterTop);
 
         CommandBinds.Builder
-            .Bind(ContentKeyFunctions.CP14OpenSkillMenu,
+            .Bind(CP14ContentKeyFunctions.CP14OpenSkillMenu,
                 InputCmdHandler.FromDelegate(_ => ToggleWindow()))
             .Register<CP14SkillUIController>();
 
diff --git a/Content.Server/_CP14/Alchemy/EntitySystems/CP14RandomReagentReactionsSystem.cs b/Content.Server/_CP14/Alchemy/EntitySystems/CP14RandomReagentReactionsSystem.cs
deleted file mode 100644
index 46253e01fb..0000000000
--- a/Content.Server/_CP14/Alchemy/EntitySystems/CP14RandomReagentReactionsSystem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Server.GameTicking.Events;
-using Content.Shared.Chemistry.Reaction;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server._CP14.Alchemy.EntitySystems;
-
-public sealed class CP14RandomReagentReactionsSystem : EntitySystem
-{
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
-    }
-
-    private void OnRoundStart(RoundStartingEvent ev)
-    {
-        foreach (var reaction in _proto.EnumeratePrototypes<ReactionPrototype>())
-        {
-            reaction.Cp14RandomProductIndex = _random.Next(reaction.Cp14RandomProducts.Count);
-        }
-    }
-}
diff --git a/Content.Server/_CP14/Demiplane/CP14DemiplaneSystem.Generation.cs b/Content.Server/_CP14/Demiplane/CP14DemiplaneSystem.Generation.cs
index 06958afa6c..d537876b5f 100644
--- a/Content.Server/_CP14/Demiplane/CP14DemiplaneSystem.Generation.cs
+++ b/Content.Server/_CP14/Demiplane/CP14DemiplaneSystem.Generation.cs
@@ -68,11 +68,19 @@ public sealed partial class CP14DemiplaneSystem
 
     private void GeneratorUsedInHand(Entity<CP14DemiplaneUsingOpenComponent> ent, ref UseInHandEvent args)
     {
+        if (args.Handled)
+            return;
+
         if (!TryComp<CP14DemiplaneDataComponent>(ent, out var generator))
             return;
 
+        args.Handled = true;
+
         UseGenerator((ent, generator), args.User);
+
+        QueueDel(ent);
     }
+
     //Ed: I hate this function.
     private void UseGenerator(Entity<CP14DemiplaneDataComponent> generator, EntityUid? user = null)
     {
@@ -130,10 +138,6 @@ public sealed partial class CP14DemiplaneSystem
             var connection = EnsureComp<CP14DemiplaneRiftComponent>(spawnedRift);
             AddDemiplaneRandomExitPoint(demiplane.Value, (spawnedRift, connection));
         }
-
-#if !DEBUG
-        QueueDel(generator); //wtf its crash debug build!
-#endif
     }
 
     private void OnVerbExamine(Entity<CP14DemiplaneDataComponent> ent, ref GetVerbsEvent<ExamineVerb> args)
diff --git a/Content.Server/_CP14/Trading/CP14StationEconomySystem.cs b/Content.Server/_CP14/Trading/CP14StationEconomySystem.cs
index 5bc87ced44..93b8f67b61 100644
--- a/Content.Server/_CP14/Trading/CP14StationEconomySystem.cs
+++ b/Content.Server/_CP14/Trading/CP14StationEconomySystem.cs
@@ -20,6 +20,19 @@ public sealed partial class CP14StationEconomySystem : CP14SharedStationEconomyS
         InitPriceEvents();
 
         SubscribeLocalEvent<CP14StationEconomyComponent, StationPostInitEvent>(OnStationPostInit);
+        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+    }
+
+    private void OnPrototypesReloaded(PrototypesReloadedEventArgs ev)
+    {
+        if (!ev.WasModified<CP14TradingPositionPrototype>())
+            return;
+
+        var query = EntityQueryEnumerator<CP14StationEconomyComponent>();
+        while (query.MoveNext(out var uid, out var economyComponent))
+        {
+            UpdatePricing((uid, economyComponent));
+        }
     }
 
     private void OnStationPostInit(Entity<CP14StationEconomyComponent> ent, ref StationPostInitEvent args)
diff --git a/Content.Server/_CP14/Trading/CP14TradingPlatformSystem.cs b/Content.Server/_CP14/Trading/CP14TradingPlatformSystem.cs
index 3f68a20de6..37a76c1f6d 100644
--- a/Content.Server/_CP14/Trading/CP14TradingPlatformSystem.cs
+++ b/Content.Server/_CP14/Trading/CP14TradingPlatformSystem.cs
@@ -31,11 +31,14 @@ public sealed partial class CP14TradingPlatformSystem : CP14SharedTradingPlatfor
         base.Initialize();
 
         SubscribeLocalEvent<CP14TradingPlatformComponent, CP14TradingPositionBuyAttempt>(OnBuyAttempt);
-        SubscribeLocalEvent<CP14SellingPlatformComponent, CP14MagicEnergyOverloadEvent>(OnMagicOverload);
+        SubscribeLocalEvent<CP14SellingPlatformComponent, CP14MagicEnergyLevelChangeEvent>(OnMagicChange);
     }
 
-    private void OnMagicOverload(Entity<CP14SellingPlatformComponent> ent, ref CP14MagicEnergyOverloadEvent args)
+    private void OnMagicChange(Entity<CP14SellingPlatformComponent> ent, ref CP14MagicEnergyLevelChangeEvent args)
     {
+        if (args.NewValue != args.MaxValue)
+            return;
+
         _magicEnergy.ClearEnergy(ent.Owner);
 
         if (!TryComp<ItemPlacerComponent>(ent, out var itemPlacer))
@@ -69,7 +72,10 @@ public sealed partial class CP14TradingPlatformSystem : CP14SharedTradingPlatfor
 
     public bool TryBuyPosition(Entity<CP14TradingReputationComponent?> user, Entity<CP14TradingPlatformComponent> platform, ProtoId<CP14TradingPositionPrototype> position)
     {
-        if (!CanBuyPosition(user, platform!, position))
+        if (Timing.CurTime < platform.Comp.NextBuyTime)
+            return false;
+
+        if (!CanBuyPosition(user, position))
             return false;
 
         if (!Proto.TryIndex(position, out var indexedPosition))
@@ -112,8 +118,8 @@ public sealed partial class CP14TradingPlatformSystem : CP14SharedTradingPlatfor
 
         if (indexedPosition.Service is not null)
             indexedPosition.Service.Buy(EntityManager, Proto, platform);
-        user.Comp.Reputation[indexedPosition.Faction] += (float)price / 10;
-        Dirty(user);
+
+        AddReputation(user, indexedPosition.Faction, (float)price / 100);
 
         _audio.PlayPvs(platform.Comp.BuySound, Transform(platform).Coordinates);
 
diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index 7873ffc5ec..f73aaf55a8 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -51,42 +51,11 @@ namespace Content.Shared.Chemistry.Reaction
         [DataField("requiredMixerCategories")]
         public List<ProtoId<MixingCategoryPrototype>>? MixingCategories;
 
-        // CP14 random reactions begin
         /// <summary>
         /// Reagents created when the reaction occurs.
         /// </summary>
         [DataField("products", customTypeSerializer:typeof(PrototypeIdDictionarySerializer<FixedPoint2, ReagentPrototype>))]
-        public Dictionary<string, FixedPoint2> _products = new(); // CP14 random reactions
-
-        public Dictionary<string, FixedPoint2> Products
-        {
-            get {
-                if (Cp14RandomProducts.Count == 0)
-                    return _products;
-                // New dict because we don't want to modify original products dict
-                Dictionary<string, FixedPoint2> res = new(_products);
-                foreach (var product in Cp14RandomProducts[Cp14RandomProductIndex])
-                {
-                    if (res.ContainsKey(product.Key))
-                        res[product.Key] += product.Value;
-                    else
-                        res[product.Key] = product.Value;
-                }
-                return res;
-            }
-            set {
-                _products = value;
-            }
-        }
-
-        public int Cp14RandomProductIndex = 0;
-
-        /// <summary>
-        /// Random reagents groups, one of which will be selected at the roundstart and will be used as a reaction product.
-        /// </summary>
-        [DataField("cp14RandomProducts")]
-        public List<Dictionary<string, FixedPoint2>> Cp14RandomProducts = new();
-        // CP14 random reactions end
+        public Dictionary<string, FixedPoint2> Products = new();
 
         /// <summary>
         /// Effects to be triggered when the reaction occurs.
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index b9eb91ca60..f10c99af2f 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -128,9 +128,5 @@ namespace Content.Shared.Input
         public static readonly BoundKeyFunction MappingRemoveDecal = "MappingRemoveDecal";
         public static readonly BoundKeyFunction MappingCancelEraseDecal = "MappingCancelEraseDecal";
         public static readonly BoundKeyFunction MappingOpenContextMenu = "MappingOpenContextMenu";
-
-        //CP14 keys
-        public static readonly BoundKeyFunction CP14OpenSkillMenu = "CP14OpenSkillMenu";
-        //CP14 keys end
     }
 }
diff --git a/Content.Shared/Interaction/SmartEquipSystem.cs b/Content.Shared/Interaction/SmartEquipSystem.cs
index 746bc994ee..55d20f202f 100644
--- a/Content.Shared/Interaction/SmartEquipSystem.cs
+++ b/Content.Shared/Interaction/SmartEquipSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Input;
+using Content.Shared._CP14.Input;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
@@ -35,6 +36,9 @@ public sealed class SmartEquipSystem : EntitySystem
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.SmartEquipBackpack, InputCmdHandler.FromDelegate(HandleSmartEquipBackpack, handle: false, outsidePrediction: false))
             .Bind(ContentKeyFunctions.SmartEquipBelt, InputCmdHandler.FromDelegate(HandleSmartEquipBelt, handle: false, outsidePrediction: false))
+            //CP14
+            .Bind(CP14ContentKeyFunctions.SmartEquipBelt2, InputCmdHandler.FromDelegate(HandleSmartEquipBelt2, handle: false, outsidePrediction: false))
+            //CP14 end
             .Register<SmartEquipSystem>();
     }
 
@@ -55,6 +59,11 @@ public sealed class SmartEquipSystem : EntitySystem
         HandleSmartEquip(session, "belt");
     }
 
+    private void HandleSmartEquipBelt2(ICommonSession? session)
+    {
+        HandleSmartEquip(session, "belt2");
+    }
+    //CP14 end
     private void HandleSmartEquip(ICommonSession? session, string equipmentSlot)
     {
         if (session is not { } playerSession)
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 4e0aa2f949..13f62e88ce 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -12,6 +12,7 @@ using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Implants.Components;
 using Content.Shared.Input;
+using Content.Shared._CP14.Input;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Inventory;
@@ -172,6 +173,9 @@ public abstract class SharedStorageSystem : EntitySystem
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.OpenBackpack, InputCmdHandler.FromDelegate(HandleOpenBackpack, handle: false))
             .Bind(ContentKeyFunctions.OpenBelt, InputCmdHandler.FromDelegate(HandleOpenBelt, handle: false))
+            //CP14
+            .Bind(CP14ContentKeyFunctions.OpenBelt2, InputCmdHandler.FromDelegate(HandleOpenBelt2, handle: false))
+            //CP14 end
             .Register<SharedStorageSystem>();
 
         Subs.CVar(_cfg, CCVars.NestedStorage, OnNestedStorageCvar, true);
@@ -1832,6 +1836,12 @@ public abstract class SharedStorageSystem : EntitySystem
     {
         HandleToggleSlotUI(session, "belt");
     }
+    //CP14
+    private void HandleOpenBelt2(ICommonSession? session)
+    {
+        HandleToggleSlotUI(session, "belt2");
+    }
+    //CP14 end
 
     private void HandleToggleSlotUI(ICommonSession? session, string slot)
     {
diff --git a/Content.Shared/_CP14/Input/CP14ContentKeyFunctions.cs b/Content.Shared/_CP14/Input/CP14ContentKeyFunctions.cs
new file mode 100644
index 0000000000..3a5442f181
--- /dev/null
+++ b/Content.Shared/_CP14/Input/CP14ContentKeyFunctions.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Input;
+
+namespace Content.Shared._CP14.Input
+{
+    [KeyFunctions]
+
+    public static class CP14ContentKeyFunctions
+    {
+        public static readonly BoundKeyFunction OpenBelt2 = "OpenBelt2";
+        public static readonly BoundKeyFunction SmartEquipBelt2 = "SmartEquipBelt2";
+        public static readonly BoundKeyFunction CP14OpenSkillMenu = "CP14OpenSkillMenu";
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellArea.cs b/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellArea.cs
new file mode 100644
index 0000000000..81c2f19367
--- /dev/null
+++ b/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellArea.cs
@@ -0,0 +1,64 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.Map;
+
+namespace Content.Shared._CP14.MagicSpell.Spells;
+
+public sealed partial class CP14SpellArea : CP14SpellEffect
+{
+    [DataField(required: true)]
+    public List<CP14SpellEffect> Effects { get; set; } = new();
+
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// How many entities can be subject to EntityEffect? Leave 0 to remove the restriction.
+    /// </summary>
+    [DataField]
+    public int MaxTargets = 0;
+
+    [DataField(required: true)]
+    public float Range = 1f;
+
+    [DataField]
+    public bool AffectCaster = false;
+
+    public override void Effect(EntityManager entManager, CP14SpellEffectBaseArgs args)
+    {
+        EntityCoordinates? targetPoint = null;
+
+        if (args.Target is not null &&
+            entManager.TryGetComponent<TransformComponent>(args.Target.Value, out var transformComponent))
+            targetPoint = transformComponent.Coordinates;
+        else if (args.Position is not null)
+            targetPoint = args.Position;
+
+        if (targetPoint is null)
+            return;
+
+        var lookup = entManager.System<EntityLookupSystem>();
+        var whitelist = entManager.System<EntityWhitelistSystem>();
+
+        var entitiesAround = lookup.GetEntitiesInRange(targetPoint.Value, Range, LookupFlags.Uncontained);
+
+        var count = 0;
+        foreach (var entity in entitiesAround)
+        {
+            if (entity == args.User && !AffectCaster)
+                continue;
+
+            if (Whitelist is not null && !whitelist.IsValid(Whitelist, entity))
+                continue;
+
+            foreach (var effect in Effects)
+            {
+                effect.Effect(entManager, new CP14SpellEffectBaseArgs(args.User, null, entity,  targetPoint));
+            }
+
+            count++;
+
+            if (MaxTargets > 0 && count >= MaxTargets)
+                break;
+        }
+    }
+}
diff --git a/Content.Shared/_CP14/Skill/CP14SharedSkillSystem.cs b/Content.Shared/_CP14/Skill/CP14SharedSkillSystem.cs
index cbe8cb04d9..1649c30677 100644
--- a/Content.Shared/_CP14/Skill/CP14SharedSkillSystem.cs
+++ b/Content.Shared/_CP14/Skill/CP14SharedSkillSystem.cs
@@ -244,6 +244,26 @@ public abstract partial class CP14SharedSkillSystem : EntitySystem
 
         return sb.ToString();
     }
+    /// <summary>
+    ///  Helper function to reset skills to only learned skills
+    /// </summary>
+    public bool TryResetSkills(EntityUid target,
+        CP14SkillStorageComponent? component = null)
+    {
+        if (!Resolve(target, ref component, false))
+        {
+            return false;
+        }
+        for(var i = component.LearnedSkills.Count - 1; i >= 0; i--)
+        {
+            if(HaveFreeSkill(target, component.LearnedSkills[i], component))
+            {
+                continue;
+            }
+            TryRemoveSkill(target, component.LearnedSkills[i], component);
+        }
+        return true;
+    }
 }
 
 [ByRefEvent]
diff --git a/Content.Shared/_CP14/Skill/CP14SkillSystem.Admin.cs b/Content.Shared/_CP14/Skill/CP14SkillSystem.Admin.cs
index dd49da8b2b..326377d8a4 100644
--- a/Content.Shared/_CP14/Skill/CP14SkillSystem.Admin.cs
+++ b/Content.Shared/_CP14/Skill/CP14SkillSystem.Admin.cs
@@ -6,6 +6,7 @@ using Content.Shared.Administration.Managers;
 using Content.Shared.FixedPoint;
 using Content.Shared.Verbs;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Shared._CP14.Skill;
 
@@ -89,5 +90,19 @@ public abstract partial class CP14SharedSkillSystem
                 },
             });
         }
+
+        //Reset/Remove All Skills
+        args.Verbs.Add(new Verb
+        {
+            Text = "Reset skills",
+            Message = "Remove all learned skills",
+            Category = VerbCategory.CP14AdminSkillRemove,
+            Icon = new SpriteSpecifier.Rsi(new("/Textures/_CP14/Interface/Misc/reroll.rsi"), "reroll"),
+            Act = () =>
+            {
+                TryResetSkills(target);
+            },
+        });
+
     }
 }
diff --git a/Content.Shared/_CP14/Trading/CP14AddGlobalReputationSpecial.cs b/Content.Shared/_CP14/Trading/CP14AddGlobalReputationSpecial.cs
new file mode 100644
index 0000000000..4e04bf5ef4
--- /dev/null
+++ b/Content.Shared/_CP14/Trading/CP14AddGlobalReputationSpecial.cs
@@ -0,0 +1,24 @@
+using Content.Shared._CP14.Trading.Prototypes;
+using Content.Shared._CP14.Trading.Systems;
+using Content.Shared.Roles;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CP14.Trading;
+
+public sealed partial class CP14AddGlobalReputationSpecial : JobSpecial
+{
+    [DataField]
+    public float Reputation = 1f;
+
+    public override void AfterEquip(EntityUid mob)
+    {
+        var entMan = IoCManager.Resolve<IEntityManager>();
+        var protoMan = IoCManager.Resolve<IPrototypeManager>();
+        var tradeSys = entMan.System<CP14SharedTradingPlatformSystem>();
+
+        foreach (var faction in protoMan.EnumeratePrototypes<CP14TradingFactionPrototype>())
+        {
+            tradeSys.AddReputation(mob, faction, Reputation);
+        }
+    }
+}
diff --git a/Content.Shared/_CP14/Trading/CP14TradingUI.cs b/Content.Shared/_CP14/Trading/CP14TradingUI.cs
index 57060bca04..1b8220118c 100644
--- a/Content.Shared/_CP14/Trading/CP14TradingUI.cs
+++ b/Content.Shared/_CP14/Trading/CP14TradingUI.cs
@@ -9,9 +9,8 @@ public enum CP14TradingUiKey
 }
 
 [Serializable, NetSerializable]
-public sealed class CP14TradingPlatformUiState(NetEntity user, NetEntity platform) : BoundUserInterfaceState
+public sealed class CP14TradingPlatformUiState(NetEntity platform) : BoundUserInterfaceState
 {
-    public NetEntity User = user;
     public NetEntity Platform = platform;
 }
 
diff --git a/Content.Shared/_CP14/Trading/Components/CP14TradingContractComponent.cs b/Content.Shared/_CP14/Trading/Components/CP14TradingContractComponent.cs
index fa7c98bfa2..77ef9d0b6d 100644
--- a/Content.Shared/_CP14/Trading/Components/CP14TradingContractComponent.cs
+++ b/Content.Shared/_CP14/Trading/Components/CP14TradingContractComponent.cs
@@ -7,12 +7,6 @@ namespace Content.Shared._CP14.Trading.Components;
 [RegisterComponent, Access(typeof(CP14SharedTradingPlatformSystem))]
 public sealed partial class CP14TradingContractComponent : Component
 {
-    [DataField]
-    public TimeSpan Delay = TimeSpan.FromSeconds(2);
-
     [DataField]
     public ProtoId<CP14TradingFactionPrototype> Faction;
-
-    [DataField]
-    public float StartReputation = 1f;
 }
diff --git a/Content.Shared/_CP14/Trading/Components/CP14TradingReputationComponent.cs b/Content.Shared/_CP14/Trading/Components/CP14TradingReputationComponent.cs
index bc564a7ab4..88f64b1712 100644
--- a/Content.Shared/_CP14/Trading/Components/CP14TradingReputationComponent.cs
+++ b/Content.Shared/_CP14/Trading/Components/CP14TradingReputationComponent.cs
@@ -18,7 +18,4 @@ public sealed partial class CP14TradingReputationComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public Dictionary<ProtoId<CP14TradingFactionPrototype>, FixedPoint2> Reputation = new();
-
-    [DataField, AutoNetworkedField]
-    public HashSet<ProtoId<CP14TradingPositionPrototype>> UnlockedPositions = new();
 }
diff --git a/Content.Shared/_CP14/Trading/Prototypes/CP14TradingPositionPrototype.cs b/Content.Shared/_CP14/Trading/Prototypes/CP14TradingPositionPrototype.cs
index 1403467230..ef261a3508 100644
--- a/Content.Shared/_CP14/Trading/Prototypes/CP14TradingPositionPrototype.cs
+++ b/Content.Shared/_CP14/Trading/Prototypes/CP14TradingPositionPrototype.cs
@@ -33,17 +33,14 @@ public sealed partial class CP14TradingPositionPrototype : IPrototype
     public ProtoId<CP14TradingFactionPrototype> Faction;
 
     [DataField]
-    public FixedPoint2 UnlockReputationCost = 1f;
+    public FixedPoint2 ReputationLevel = 0f;
 
     [DataField(required: true)]
-    public Vector2 UiPosition = default!;
+    public float UiPosition = default!;
 
     [DataField(required: true)]
     public CP14StoreBuyService? Service = null;
 
-    [DataField]
-    public ProtoId<CP14TradingPositionPrototype>? Prerequisite;
-
     [DataField]
     public int PriceMarkup = 1;
 
@@ -51,7 +48,7 @@ public sealed partial class CP14TradingPositionPrototype : IPrototype
     /// each round prices will differ within +X percent of the calculated value
     /// </summary>
     [DataField]
-    public float PriceFluctuation = 0.2f;
+    public float PriceFluctuation = 0.6f;
 }
 
 [ImplicitDataDefinitionForInheritors]
diff --git a/Content.Shared/_CP14/Trading/Systems/CP14SharedTradingPlatformSystem.UI.cs b/Content.Shared/_CP14/Trading/Systems/CP14SharedTradingPlatformSystem.UI.cs
index 52db72706e..6a533e2900 100644
--- a/Content.Shared/_CP14/Trading/Systems/CP14SharedTradingPlatformSystem.UI.cs
+++ b/Content.Shared/_CP14/Trading/Systems/CP14SharedTradingPlatformSystem.UI.cs
@@ -8,16 +8,9 @@ public abstract partial class CP14SharedTradingPlatformSystem
 {
     private void InitializeUI()
     {
-        SubscribeLocalEvent<CP14TradingPlatformComponent, CP14TradingPositionUnlockAttempt>(OnUnlockAttempt);
         SubscribeLocalEvent<CP14TradingPlatformComponent, BeforeActivatableUIOpenEvent>(OnBeforeUIOpen);
     }
 
-    private void OnUnlockAttempt(Entity<CP14TradingPlatformComponent> ent, ref CP14TradingPositionUnlockAttempt args)
-    {
-        TryUnlockPosition(args.Actor, args.Position);
-        UpdateUIState(ent, args.Actor);
-    }
-
     private void OnBeforeUIOpen(Entity<CP14TradingPlatformComponent> ent, ref BeforeActivatableUIOpenEvent args)
     {
         UpdateUIState(ent, args.User);
diff --git a/Content.Shared/_CP14/Trading/Systems/CP14SharedTradingPlatformSystem.cs b/Content.Shared/_CP14/Trading/Systems/CP14SharedTradingPlatformSystem.cs
index 57d7d77d3c..4f99f67f77 100644
--- a/Content.Shared/_CP14/Trading/Systems/CP14SharedTradingPlatformSystem.cs
+++ b/Content.Shared/_CP14/Trading/Systems/CP14SharedTradingPlatformSystem.cs
@@ -2,6 +2,8 @@ using Content.Shared._CP14.Trading.Components;
 using Content.Shared._CP14.Trading.Prototypes;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
@@ -16,6 +18,7 @@ public abstract partial class CP14SharedTradingPlatformSystem : EntitySystem
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
 
     public override void Initialize()
     {
@@ -40,12 +43,18 @@ public abstract partial class CP14SharedTradingPlatformSystem : EntitySystem
 
     private void OnContractUse(Entity<CP14TradingContractComponent> ent, ref UseInHandEvent args)
     {
+        if (args.Handled)
+            return;
         if (!Proto.TryIndex(ent.Comp.Faction, out var indexedFaction))
             return;
 
+        args.Handled = true;
+
         var repComp = EnsureComp<CP14TradingReputationComponent>(args.User);
-        repComp.Reputation.TryAdd(ent.Comp.Faction, ent.Comp.StartReputation);
+        repComp.Reputation.TryAdd(ent.Comp.Faction, 0);
+        _audio.PlayLocal(new SoundCollectionSpecifier("CP14CoinImpact"), args.User, args.User);
         _popup.PopupPredicted(Loc.GetString("cp14-trading-contract-use", ("name", Loc.GetString(indexedFaction.Name))), args.User, args.User);
+
         if (_net.IsServer)
             QueueDel(ent);
     }
@@ -55,68 +64,35 @@ public abstract partial class CP14SharedTradingPlatformSystem : EntitySystem
         if (!TryComp<CP14TradingReputationComponent>(user, out var repComp))
             return;
 
-        _userInterface.SetUiState(ent.Owner, CP14TradingUiKey.Key, new CP14TradingPlatformUiState(GetNetEntity(user), GetNetEntity(ent)));
+        _userInterface.SetUiState(ent.Owner, CP14TradingUiKey.Key, new CP14TradingPlatformUiState(GetNetEntity(ent)));
     }
 
-    public bool TryUnlockPosition(Entity<CP14TradingReputationComponent?> user, ProtoId<CP14TradingPositionPrototype> position)
+    public bool CanBuyPosition(Entity<CP14TradingReputationComponent?> user, ProtoId<CP14TradingPositionPrototype> position)
     {
-        if (!CanUnlockPosition(user, position))
+        if (!Resolve(user.Owner, ref user.Comp, false))
             return false;
-
         if (!Proto.TryIndex(position, out var indexedPosition))
             return false;
 
-        if (!Resolve(user.Owner, ref user.Comp, false))
+        if (user.Comp.Reputation[indexedPosition.Faction] < indexedPosition.ReputationLevel)
             return false;
 
-        user.Comp.Reputation[indexedPosition.Faction] -= indexedPosition.UnlockReputationCost;
-        user.Comp.UnlockedPositions.Add(position);
+        return true;
+    }
+
+    public void AddReputation(Entity<CP14TradingReputationComponent?> user,
+        ProtoId<CP14TradingFactionPrototype> faction, float rep)
+    {
+        if (!Resolve(user.Owner, ref user.Comp, false))
+            return;
+
+        if (!user.Comp.Reputation.ContainsKey(faction))
+            user.Comp.Reputation.Add(faction, rep);
+        else
+            user.Comp.Reputation[faction] += rep;
+
         Dirty(user);
-
-        return true;
     }
-
-    public bool CanUnlockPosition(Entity<CP14TradingReputationComponent?> user, ProtoId<CP14TradingPositionPrototype> position)
-    {
-        if (!Resolve(user.Owner, ref user.Comp, false))
-            return false;
-
-        if (!Proto.TryIndex(position, out var indexedPosition))
-            return false;
-
-        if (!user.Comp.Reputation.ContainsKey(indexedPosition.Faction))
-            return false;
-
-        if (user.Comp.UnlockedPositions.Contains(position))
-            return false;
-
-        if (indexedPosition.Prerequisite is not null && !user.Comp.UnlockedPositions.Contains(indexedPosition.Prerequisite.Value))
-            return false;
-
-        return user.Comp.Reputation.GetValueOrDefault(indexedPosition.Faction, 0f) >= indexedPosition.UnlockReputationCost;
-    }
-
-    public bool CanBuyPosition(Entity<CP14TradingReputationComponent?> user, Entity<CP14TradingPlatformComponent?> platform, ProtoId<CP14TradingPositionPrototype> position)
-    {
-        if (!Resolve(user.Owner, ref user.Comp, false))
-            return false;
-        if (!Resolve(platform.Owner, ref platform.Comp, false))
-            return false;
-
-        if (!user.Comp.UnlockedPositions.Contains(position))
-            return false;
-
-        if (Timing.CurTime < platform.Comp.NextBuyTime)
-            return false;
-
-        return true;
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed class CP14TradingPositionUnlockAttempt(ProtoId<CP14TradingPositionPrototype> position) : BoundUserInterfaceMessage
-{
-    public readonly ProtoId<CP14TradingPositionPrototype> Position = position;
 }
 
 [Serializable, NetSerializable]
diff --git a/Resources/Changelog/CP14_Changelog.yml b/Resources/Changelog/CP14_Changelog.yml
new file mode 100644
index 0000000000..e3e75cd19d
--- /dev/null
+++ b/Resources/Changelog/CP14_Changelog.yml
@@ -0,0 +1,141 @@
+Entries:
+- author: TheShuEd
+  changes:
+  - message: Added fun!
+    type: Add
+  - message: Removed fun!
+    type: Remove
+  - message: Changed fun!
+    type: Tweak
+  - message: Fixed fun!
+    type: Fix
+  id: 8052
+  time: '2025-06-02T18:40:15.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1359
+- author: TheShuEd
+  changes:
+  - message: Added fun!
+    type: Add
+  - message: Removed fun!
+    type: Remove
+  - message: Changed fun!
+    type: Tweak
+  - message: Fixed fun!
+    type: Fix
+  id: 8053
+  time: '2025-06-02T19:33:16.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1364
+- author: TheShuEd
+  changes:
+  - message: Added fun!
+    type: Add
+  - message: Removed fun!
+    type: Remove
+  - message: Changed fun!
+    type: Tweak
+  - message: Fixed fun!
+    type: Fix
+  id: 8054
+  time: '2025-06-02T20:00:16.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1365
+- author: TheShuEd
+  changes:
+  - message: "A new trade contract with the \u201CCozy Home\u201D store has been added.\
+      \ Now you can buy wallpaper, home decorations, and some other items."
+    type: Add
+  id: 8055
+  time: '2025-06-02T21:38:19.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1367
+- author: paige404
+  changes:
+  - message: Tweaked slime damage resistances and immunities. Elemental slimes are
+      now immune to their own elements, but weak to an opposing element. Electric
+      slimes take equal damage from both heat and cold, and have had their oppressive
+      stunlocking power somewhat reduced. Additionally, all slimes are now immune
+      to airloss damage.
+    type: Tweak
+  id: 8056
+  time: '2025-06-02T21:59:07.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1300
+- author: ArZarLordOfMango
+  changes:
+  - message: Fixed Guild moral book
+    type: Fix
+  id: 8057
+  time: '2025-06-02T22:04:33.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1368
+- author: TheKittehJesus
+  changes:
+  - message: Cash converters can be anchored on tables
+    type: Fix
+  id: 8058
+  time: '2025-06-03T06:41:17.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1371
+- author: TheShuEd
+  changes:
+  - message: Music magic no longer applies the effect on the musician. Tieflings with
+      Hell Ballad are now OP
+    type: Tweak
+  - message: The radius of action of the peace ballad has been increased by 2 times
+      and the maximum number of entities that can be affected has been increased from
+      4 to 8
+    type: Tweak
+  - message: The speed increase from the speed ballad is increased by 5%
+    type: Tweak
+  id: 8059
+  time: '2025-06-03T09:43:21.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1372
+- author: DeLTaAlarm0
+  changes:
+  - message: Added flippable open/closed table sign
+    type: Add
+  - message: Added workbench recipe for open/closed sign
+    type: Add
+  id: 8060
+  time: '2025-06-03T11:22:24.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1275
+- author: TheKittehJesus
+  changes:
+  - message: Added controls for quick pickup both belt slots! Check your controls,
+      as belt2 controls may be unbound.
+    type: Add
+  id: 8061
+  time: '2025-06-03T11:39:39.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1298
+- author: Mandranir
+  changes:
+  - message: dropper size is now 1x1
+    type: Fix
+  id: 8062
+  time: '2025-06-03T11:41:00.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1373
+- author: Nimfar11
+  changes:
+  - message: Adds a new artifact Skeleton Lockpick.
+    type: Add
+  id: 8063
+  time: '2025-06-03T12:37:25.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1374
+- author: KittyCat432
+  changes:
+  - message: Changed Healing solution to not "waste" any of its healing on types of
+      brute you do not have.
+    type: Tweak
+  id: 8064
+  time: '2025-06-03T14:10:33.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1340
+- author: TheShuEd
+  changes:
+  - message: All merchants now gain +1 reputation with each faction at the start of
+      the round, greatly expanding their range of goods.
+    type: Tweak
+  id: 8065
+  time: '2025-06-03T15:12:44.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1376
+- author: Nimfar11
+  changes:
+  - message: Adds new carpets in different colours.
+    type: Add
+  id: 8066
+  time: '2025-06-04T06:57:09.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1375
diff --git a/Resources/Locale/en-US/_CP14/changelog.ftl b/Resources/Locale/en-US/_CP14/changelog.ftl
new file mode 100644
index 0000000000..e2a21037bd
--- /dev/null
+++ b/Resources/Locale/en-US/_CP14/changelog.ftl
@@ -0,0 +1 @@
+changelog-tab-title-CP14_Changelog = CrystallEdge Changelog
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_CP14/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/_CP14/escape-menu/ui/options-menu.ftl
index c0c4375045..786cebd4df 100644
--- a/Resources/Locale/en-US/_CP14/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/_CP14/escape-menu/ui/options-menu.ftl
@@ -9,7 +9,7 @@ cp14-ui-options-main-graphics-label = Graphics
 cp14-ui-options-main-graphics-wave-shader = Wave shader
 
 cp14-ui-options-postprocess = Cosmetic Post-processing
-cp14-ui-options-postprocess-tooltip = 
+cp14-ui-options-postprocess-tooltip =
     When enabled, cosmetic post-processing effects such as
     additive lighting will be present. This does not control
     post-process effects that affect the game or otherwise
@@ -19,4 +19,6 @@ cp14-ui-options-postprocess-tooltip =
 ## Controls menu
 
 ui-options-header-cp14 = CrystallEdge
-ui-options-function-cp14-open-knowledge-menu = Open character knowledge menu.
\ No newline at end of file
+ui-options-function-cp14-open-skill-menu = Open character knowledge menu.
+ui-options-function-open-belt2 = Open belt 2
+ui-options-function-smart-equip-belt2 = Smart-equip to belt 2
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl b/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl
index d704c8e160..86f20be2c6 100644
--- a/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl
+++ b/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl
@@ -5,4 +5,4 @@ cp14-ghost-role-information-name-lurker = Lurker
 cp14-ghost-role-information-description-lurker = A spirit of night and hunger that preys on loners separated from their companions.
 
 cp14-ghost-role-information-name-raid-undead = Undead raid
-cp14-ghost-role-information-description-raid-undead = Lead the attack on the city by the forces of the dead. Destroy the demiplane communication crystal at any cost.
\ No newline at end of file
+cp14-ghost-role-information-description-raid-undead = Lead the attack on the city by the forces of the dead. Destroy the demiplane communication crystal at any cost.
diff --git a/Resources/Locale/en-US/_CP14/trading/factions.ftl b/Resources/Locale/en-US/_CP14/trading/factions.ftl
index 54e27532c7..bbbadb22a6 100644
--- a/Resources/Locale/en-US/_CP14/trading/factions.ftl
+++ b/Resources/Locale/en-US/_CP14/trading/factions.ftl
@@ -1,3 +1,6 @@
 cp14-trade-faction-contracts = Zellasian Trade Guild
 cp14-trade-faction-victoria-gardens = Victoria Gardens
-cp14-trade-faction-brad-potions = Brad's marvelous potions
\ No newline at end of file
+cp14-trade-faction-brad-potions = Brad's marvelous potions
+cp14-trade-faction-dwarf-mining = 'Dwarf Steel' mining branch
+cp14-trade-faction-thaumaturgy = Academy of Thaumaturgy
+cp14-trade-faction-home-decor = Cozy home
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_CP14/trading/ui.ftl b/Resources/Locale/en-US/_CP14/trading/ui.ftl
index 27a8c6991d..a8dd5a8f04 100644
--- a/Resources/Locale/en-US/_CP14/trading/ui.ftl
+++ b/Resources/Locale/en-US/_CP14/trading/ui.ftl
@@ -1,6 +1,3 @@
-cp14-trading-ui-button-unlock = Unlock contract
-cp14-trading-ui-button-unlock-tooltip = You contract to purchase the specified equipment or service by spending your reputation. After that, you can buy that equipment or service with money in unlimited quantities.
-
 cp14-trading-ui-button-buy = Buy
 cp14-trading-ui-button-buy-tooltip = You spend the funds on the trading platform and buy the specified equipment or service from the selected vendor, which also increases your reputation. The equipment will be instantly delivered to you by spatial magic, and the service will be rendered as soon as possible. 
 
diff --git a/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl b/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl
index 7f727e9a90..0d620ada43 100644
--- a/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl
+++ b/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl
@@ -5,4 +5,4 @@ cp14-ghost-role-information-name-lurker = Таящийся
 cp14-ghost-role-information-description-lurker = Дух ночи и голода, охотящийся за одиночками, отделившихся от своих товарищей.
 
 cp14-ghost-role-information-name-raid-undead = Рейд нежити
-cp14-ghost-role-information-description-raid-undead = Возглавьте атаку на город силами мертвых. Уничтожьте кристалл связи с демипланами любой ценой.
\ No newline at end of file
+cp14-ghost-role-information-description-raid-undead = Возглавьте атаку на город силами мертвых. Уничтожьте кристалл связи с демипланами любой ценой.
diff --git a/Resources/Locale/ru-RU/_CP14/trading/factions.ftl b/Resources/Locale/ru-RU/_CP14/trading/factions.ftl
index 21cd7a4781..51995ca5e4 100644
--- a/Resources/Locale/ru-RU/_CP14/trading/factions.ftl
+++ b/Resources/Locale/ru-RU/_CP14/trading/factions.ftl
@@ -1,3 +1,6 @@
 cp14-trade-faction-contracts = Торговая гильдия Зелласиан
 cp14-trade-faction-victoria-gardens = Сады Виктории
-cp14-trade-faction-brad-potions = Великолепные зелья Брада
\ No newline at end of file
+cp14-trade-faction-brad-potions = Великолепные зелья Брада
+cp14-trade-faction-dwarf-mining = Шахтерский филиал 'Дворфийская сталь'
+cp14-trade-faction-thaumaturgy = Тауматургическая академия
+cp14-trade-faction-home-decor = Уютный дом
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_CP14/trading/ui.ftl b/Resources/Locale/ru-RU/_CP14/trading/ui.ftl
index 953ab2b678..a512847922 100644
--- a/Resources/Locale/ru-RU/_CP14/trading/ui.ftl
+++ b/Resources/Locale/ru-RU/_CP14/trading/ui.ftl
@@ -1,6 +1,3 @@
-cp14-trading-ui-button-unlock = Разблокировать контракт
-cp14-trading-ui-button-unlock-tooltip = Вы заключаете контракт, затрачивая на это свою репутацию. После этого, вы можете покупать это снаряжение или услугу за деньги в неограниченном количестве.
-
 cp14-trading-ui-button-buy = Купить
 cp14-trading-ui-button-buy-tooltip = Вы тратите средства, расположенные на торговой платформе и закупаете указанное снаряжение или услугу у выбранного продавца, что так же увеличивает вашу репутацию. Снаряжение будет мгновенно доставлено вам путем пространственной магии, а услуга оказана в ближайшее время. 
 
diff --git a/Resources/Maps/_CP14/Frigid_Coast.yml b/Resources/Maps/_CP14/Frigid_Coast.yml
index ad9f3d733b..cefec82fb2 100644
--- a/Resources/Maps/_CP14/Frigid_Coast.yml
+++ b/Resources/Maps/_CP14/Frigid_Coast.yml
@@ -38027,7 +38027,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38086,7 +38086,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38146,7 +38146,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38205,7 +38205,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38265,7 +38265,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38325,7 +38325,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38385,7 +38385,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38444,7 +38444,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38503,7 +38503,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38563,7 +38563,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38623,7 +38623,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38682,7 +38682,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38741,7 +38741,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml
index 22d705ebcf..f258627fc7 100644
--- a/Resources/Maps/_CP14/comoss.yml
+++ b/Resources/Maps/_CP14/comoss.yml
@@ -47638,7 +47638,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
diff --git a/Resources/Maps/_CP14/comoss_d.yml b/Resources/Maps/_CP14/comoss_d.yml
index 9d7e15bf70..0188f5c009 100644
--- a/Resources/Maps/_CP14/comoss_d.yml
+++ b/Resources/Maps/_CP14/comoss_d.yml
@@ -104553,7 +104553,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -104616,7 +104616,7 @@ entities:
           showEnts: False
           occludes: False
           ent: 19735
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -104680,7 +104680,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -104745,7 +104745,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -104809,7 +104809,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
diff --git a/Resources/Maps/_CP14/dev_map.yml b/Resources/Maps/_CP14/dev_map.yml
index e3fbbe8f07..8a470a0343 100644
--- a/Resources/Maps/_CP14/dev_map.yml
+++ b/Resources/Maps/_CP14/dev_map.yml
@@ -151,7 +151,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -8.5,3.5
       parent: 2
-- proto: CP14AlchemyFurnaceDebug
+- proto: CP14AlchemyFurnace
   entities:
   - uid: 301
     components:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
index d6bd2e949a..9e37dcd57b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -18,8 +18,8 @@
         type: InstrumentBoundUserInterface
   - type: Item
     size: Normal
-  - type: StaticPrice
-    price: 200
+  #- type: StaticPrice
+  #  price: 200
 
 #These are for instruments that are larger, can't be picked up, or have collision
 - type: entity
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
index e78b4d2c56..89f949a23f 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
@@ -20,7 +20,7 @@
     amount: 1.5
   - !type:PlantAdjustHealth
     amount: 0.75
-  pricePerUnit: 0.2
+  pricePerUnit: 0.05
 
 - type: reagent
   id: Vitamin #Anything "healthy"
@@ -53,7 +53,7 @@
     amount: 0.5
   - !type:PlantAdjustHealth
     amount: 1.5
-  pricePerUnit: 0.25
+  pricePerUnit: 0.07
 
 - type: reagent
   id: Protein #Meat and beans
@@ -78,7 +78,7 @@
         - !type:OrganType
           type: CP14Vampire
           shouldHave: false
-  pricePerUnit: 0.3
+  pricePerUnit: 0.1
 
 - type: reagent
   id: Sugar #Candy and grains
diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
index 59c554de93..e3a65ab542 100644
--- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
@@ -46,6 +46,8 @@
       - id: HandLabeler #TODO custom cp14 labeler
       - id: CP14StampDenied
       - id: CP14StampApproved
+      - id: CP14ManaOperationGlove
+      - id: AppraisalTool
       - id: CP14PaperFolderRed
         amount: 2
       - id: CP14PaperFolderBlue
diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
index 984998b46a..0dc9cfb1dc 100644
--- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
@@ -30,13 +30,13 @@
     - !type:NestedSelector
       tableId: CP14StationCrateLootTools
       rolls: !type:RangeNumberSelector
-        range: 1, 5
+        range: 4, 5
     # Fluff
     - !type:NestedSelector
       tableId: CP14StationCrateLootFluff
-      prob: 0.33
+      prob: 0.5
       rolls: !type:RangeNumberSelector
-        range: 0, 2
+        range: 4, 5
 
 - type: entityTable
   id: CP14StationCrateLootTools
@@ -51,11 +51,17 @@
       - id: CP14Scissors
       - id: CP14Torch
       - id: CP14Lighter
-      - id: CP14ManaOperationGlove
       - id: CP14ModularIronShovel
+      - id: CP14KeyFile
       - id: CP14BaseMop
+      - id: CP14LockCopper
       - id: CP14ModularIronPickaxe
       - id: CP14ModularIronSickle
+      - !type:GroupSelector
+        children:
+        - id: CP14FluteInstrument
+        - id: CP14LyraInstrument
+        - id: CP14LuteInstrument
       - !type:GroupSelector
         children:
         - id: CP14Candle
@@ -88,9 +94,11 @@
   id: CP14StationCrateLootFluff
   table: !type:GroupSelector
     children:
+    - id: CP14PaperFolderBlue
+    - id: CP14PaperFolderRed
+    - id: CP14PenFeather
     - id: CP14FoodPotato
     - id: CP14FoodOnion
-    - id: CP14AgaricMushroom #dont eat
     - id: CP14Cloth10
     - id: CP14CrayonWhite
     - !type:GroupSelector
@@ -112,6 +120,17 @@
       - id: CP14DyePurple
       - id: CP14DyeBlack
       - id: CP14DyeBlue
+    - !type:GroupSelector
+      children:
+      - id: CP14BloodFlower
+      - id: CP14AgaricMushroom
+      - id: CP14ChromiumSlime
+        weight: 0.5
+      - id: CP14WildSage
+      - id: CP14LumiMushroom
+      - id: CP14BlueAmanita
+      - id: CP14Dayflin
+      - id: CP14AirLily
 
 - type: entityTable
   id: CP14RandomVials
diff --git a/Resources/Prototypes/_CP14/Damage/containers.yml b/Resources/Prototypes/_CP14/Damage/containers.yml
index 24308805c5..7817e90c0c 100644
--- a/Resources/Prototypes/_CP14/Damage/containers.yml
+++ b/Resources/Prototypes/_CP14/Damage/containers.yml
@@ -7,3 +7,12 @@
     - Airloss
     - Genetic
     - CP14Magic
+
+- type: damageContainer
+  id: CP14BiologicalAnaerobic
+  supportedGroups:
+  - Brute
+  - Burn
+  - Toxin
+  - Genetic
+  - CP14Magic
diff --git a/Resources/Prototypes/_CP14/Damage/modifier_sets.yml b/Resources/Prototypes/_CP14/Damage/modifier_sets.yml
index f8d5a82f9f..c4564329a2 100644
--- a/Resources/Prototypes/_CP14/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_CP14/Damage/modifier_sets.yml
@@ -123,6 +123,49 @@
     Heat: 0.2
     Cold: 1.4
 
+# Slimes
+# TODO: upstream a way to get modifier sets to inherit from each other
+
+- type: damageModifierSet
+  id: CP14Slime
+  coefficients:
+    Blunt: 0.6
+    Slash: 1.2
+    Piercing: 1.2
+    Cold: 1.5
+    Poison: 0.8
+
+- type: damageModifierSet
+  id: CP14SlimeElectric
+  coefficients:
+    Blunt: 0.6
+    Slash: 1.2
+    Piercing: 1.2
+    Heat: 1.2
+    Cold: 1.5
+    Shock: 0.0
+    Poison: 0.8
+
+- type: damageModifierSet
+  id: CP14SlimeFire
+  coefficients:
+    Blunt: 0.6
+    Slash: 1.2
+    Piercing: 1.2
+    Heat: 0.0
+    Cold: 2.0
+    Poison: 0.8
+
+- type: damageModifierSet
+  id: CP14SlimeIce
+  coefficients:
+    Blunt: 0.6
+    Slash: 1.2
+    Piercing: 1.2
+    Heat: 2.0
+    Cold: 0.0
+    Poison: 0.8
+
 # Species
 
 - type: damageModifierSet
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml
index 9d42ae7c4d..742902d664 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml
@@ -11,6 +11,7 @@
   - type: CP14MagicEffectManaCost
     manaCost: 1
   - type: CP14MagicEffect
+    magicType: Life
     effects:
     - !type:CP14SpellSpawnEntityOnTarget # TODO заставить работать только на нежить
       spawns:
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml
similarity index 56%
rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml
rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml
index 8a5a641620..dca7674f14 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml
@@ -1,16 +1,19 @@
 - type: entity
-  id: CP14ActionSpellCureFromDeath
-  name: Cure from death
-  description: You heal the target from all kinds of damage.
+  id: CP14ActionSpellResurrectionDead
+  name: Death resurrection
+  description: You resurrect the target and cure it from damage.
   components:
   - type: Sprite
     sprite: _CP14/Actions/Spells/necromancy.rsi
     state: cure_dead
   - type: CP14MagicEffectCastSlowdown
-    speedMultiplier: 0.7
+    speedMultiplier: 0.9
   - type: CP14MagicEffectManaCost
-    manaCost: 4
+    manaCost: 20
+  - type: CP14MagicEffectAliveTargetRequired
+    inverted: true
   - type: CP14MagicEffect
+    magicType: Life
     telegraphyEffects:
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
@@ -19,27 +22,27 @@
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
       - CP14ImpactEffectResurrection
-    - !type:CP14SpellResurrectionEffect # TODO заставить работать только на нежить
+    - !type:CP14SpellResurrectionEffect
     - !type:CP14SpellApplyEntityEffect
       effects:
       - !type:HealthChange
         damage:
           types:
-            Asphyxiation: -2
-            Bloodloss: -2
-            Blunt: -2
-            Cellular: -1
-            Caustic: -2
-            Cold: -1
-            Heat: -1
-            Piercing: -2
-            Poison: -2
-            Radiation: -2
-            Shock: -2
-            Slash: -2
-  - type: CP14MagicEffectSomaticAspect
+            Asphyxiation: -500
+            Bloodloss: -100
+            Blunt: -25
+            Caustic: -25
+            Cold: -25
+            Heat: -50
+            Piercing: -25
+            Poison: -25
+            Radiation: -25
+            Shock: -25
+            Slash: -25
+      - !type:Jitter
   - type: CP14MagicEffectVerbalAspect
-    startSpeech: "Surge, hominem mortuum!"
+    startSpeech: "Surge..."
+    endSpeech: "Hominem mortuum"
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneResurrection
   - type: EntityTargetAction
@@ -49,14 +52,15 @@
     range: 10
     itemIconStyle: BigAction
     interactOnMiss: false
+    canTargetSelf: false
     sound: !type:SoundPathSpecifier
       path: /Audio/Magic/rumble.ogg
     icon:
       sprite: _CP14/Actions/Spells/necromancy.rsi
       state: cure_dead
-    event: !type:CP14ToggleableEntityTargetActionEvent
-      cooldown: 2
-      castTime: 10
+    event: !type:CP14DelayedEntityTargetActionEvent
+      cooldown: 10
+      castDelay: 2
       breakOnMove: false
       breakOnDamage: false
 
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml
index 37dee93fe1..07124f226a 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml
@@ -13,9 +13,24 @@
   - type: CP14MagicEffect
     magicType: Fire
     effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14AreaEntityEffectHellBallade
+    - !type:CP14SpellArea
+      range: 3
+      maxTargets: 4
+      whitelist:
+        components:
+        - MobState
+      effects:
+      - !type:CP14SpellSpawnEntityOnTarget
+        spawns:
+        - CP14ImpactEffectHellBallade
+      - !type:CP14SpellApplyEntityEffect
+        effects:
+        - !type:Jitter
+        - !type:FlammableReaction
+          multiplier: 0.5
+        - !type:AdjustTemperature
+          amount: 500
+        - !type:Ignite
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneHellBallade
@@ -32,32 +47,6 @@
       castTime: 120
       hidden: true
 
-- type: entity
-  id: CP14AreaEntityEffectHellBallade
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: TimedDespawn
-    lifetime: 1.6
-  - type: CP14AreaEntityEffect
-    range: 3
-    maxTargets: 4
-    whitelist:
-      components:
-      - MobState
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectHellBallade
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:Jitter
-      - !type:FlammableReaction
-        multiplier: 0.5
-      - !type:AdjustTemperature
-        amount: 500
-      - !type:Ignite
-
 - type: entity
   id: CP14ImpactEffectHellBallade
   parent: CP14BaseMagicImpact
@@ -85,4 +74,3 @@
     - state: notes_3
       color: "#eea911"
       shader: unshaded
-
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml
index a6c12d8eb6..733e2ea291 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml
@@ -13,9 +13,30 @@
   - type: CP14MagicEffect
     magicType: Life
     effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14AreaEntityEffectHealBallade
+    - !type:CP14SpellArea
+      range: 3
+      maxTargets: 4
+      whitelist:
+        components:
+        - MobState
+      effects:
+      - !type:CP14SpellSpawnEntityOnTarget
+        spawns:
+        - CP14ImpactEffectHealthBallade
+      - !type:CP14SpellApplyEntityEffect
+        effects:
+        - !type:HealthChange
+          damage:
+            types:
+              Slash: -0.70
+              Blunt: -0.70
+              Piercing: -0.70
+              Cold: -0.40
+              Heat: -0.40
+              Shock: -0.40
+              Poison: -0.25
+              Bloodloss: -0.40
+              Caustic: -0.30
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneHealBallade
@@ -32,38 +53,6 @@
       castTime: 120
       hidden: true
 
-- type: entity
-  id: CP14AreaEntityEffectHealBallade
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: TimedDespawn
-    lifetime: 1.6
-  - type: CP14AreaEntityEffect
-    range: 3
-    maxTargets: 4
-    whitelist:
-      components:
-      - MobState
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectHealthBallade
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:HealthChange
-        damage:
-          types:
-            Slash: -0.70
-            Blunt: -0.70
-            Piercing: -0.70
-            Cold: -0.40
-            Heat: -0.40
-            Shock: -0.40
-            Poison: -0.25
-            Bloodloss: -0.40
-            Caustic: -0.30
-
 - type: entity
   id: CP14ImpactEffectHealthBallade
   parent: CP14BaseMagicImpact
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml
index 501c9dce9e..f53689b817 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml
@@ -13,9 +13,23 @@
   - type: CP14MagicEffect
     magicType: Life
     effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14AreaEntityEffectPeaceBallade
+    - !type:CP14SpellArea
+      range: 4
+      maxTargets: 8
+      whitelist:
+        components:
+        - MobState
+      effects:
+      - !type:CP14SpellSpawnEntityOnTarget
+        spawns:
+        - CP14ImpactEffectPeaceBallade
+      - !type:CP14SpellApplyEntityEffect
+        effects:
+        - !type:GenericStatusEffect
+          key: Pacified
+          component: Pacified
+          type: Add
+          time: 1.8
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
     proto: CP14RunePeaceBallade
@@ -32,31 +46,6 @@
       castTime: 120
       hidden: true
 
-- type: entity
-  id: CP14AreaEntityEffectPeaceBallade
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: TimedDespawn
-    lifetime: 1.6
-  - type: CP14AreaEntityEffect
-    range: 3
-    maxTargets: 4
-    whitelist:
-      components:
-      - MobState
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectPeaceBallade
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:GenericStatusEffect
-        key: Pacified
-        component: Pacified
-        type: Add
-        time: 1.8
-
 - type: entity
   id: CP14ImpactEffectPeaceBallade
   parent: CP14BaseMagicImpact
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
index f611bb5c47..397fc99a76 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
@@ -74,3 +74,11 @@
       color: "#db35c8"
       shader: unshaded
 
+- type: entity
+  parent: CP14BaseSpellScrollHealing
+  id: CP14SpellScrollSheepPolymorph
+  name: sheep polymorph spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellSheepPolymorph
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml
index d26e07f5cb..a7c1954006 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml
@@ -13,9 +13,23 @@
   - type: CP14MagicEffect
     magicType: Life
     effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14AreaEntityEffectSpeedBallade
+    - !type:CP14SpellArea
+      affectCaster: true
+      range: 5
+      maxTargets: 4
+      whitelist:
+        components:
+        - MobState
+      effects:
+      - !type:CP14SpellSpawnEntityOnTarget
+        spawns:
+        - CP14ImpactEffectSpeedBallade
+      - !type:CP14SpellApplyEntityEffect
+        effects:
+        - !type:MovespeedModifier
+          walkSpeedModifier: 1.2
+          sprintSpeedModifier: 1.2
+          statusLifetime: 1.8
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneSpeedBallade
@@ -32,30 +46,6 @@
       castTime: 120
       hidden: true
 
-- type: entity
-  id: CP14AreaEntityEffectSpeedBallade
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: TimedDespawn
-    lifetime: 1.6
-  - type: CP14AreaEntityEffect
-    range: 3
-    maxTargets: 4
-    whitelist:
-      components:
-      - MobState
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectSpeedBallade
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:MovespeedModifier
-        walkSpeedModifier: 1.15
-        sprintSpeedModifier: 1.15
-        statusLifetime: 1.8
-
 - type: entity
   id: CP14ImpactEffectSpeedBallade
   parent: CP14BaseMagicImpact
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
index 32306890a4..2a3b34c6e2 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
@@ -89,3 +89,11 @@
       tags:
       - HideContextMenu
 
+- type: entity
+  parent: CP14BaseSpellScrollLight
+  id: CP14SpellScrollSearchOfLife
+  name: search of life spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellSearchOfLife
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml
index e7cff32540..c5a8a1b528 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml
@@ -13,9 +13,22 @@
     canModifyManacost: false
   - type: CP14MagicEffect
     effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14AreaEntityEffectMagicBallade
+    - !type:CP14SpellArea
+      range: 5
+      maxTargets: 5
+      whitelist:
+        components:
+        - CP14MagicEnergyContainer
+        - CP14MagicEnergyCrystalSlot
+      effects:
+      - !type:CP14SpellSpawnEntityOnTarget
+        spawns:
+        - CP14ImpactEffectMagicBallade
+      - !type:CP14SpellApplyEntityEffect
+        effects:
+        - !type:CP14ManaChange
+          manaDelta: 1.2
+          safe: true
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneMagicBallade
@@ -32,30 +45,6 @@
       castTime: 120
       hidden: true
 
-- type: entity
-  id: CP14AreaEntityEffectMagicBallade
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: TimedDespawn
-    lifetime: 1.6
-  - type: CP14AreaEntityEffect
-    range: 5
-    maxTargets: 5
-    whitelist:
-      components:
-      - CP14MagicEnergyContainer
-      - CP14MagicEnergyCrystalSlot
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectMagicBallade
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:CP14ManaChange
-        manaDelta: 1.2
-        safe: true
-
 - type: entity
   id: CP14ImpactEffectMagicBallade
   parent: CP14BaseMagicImpact
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml
index aa230363a5..db9ef6acac 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml
@@ -94,4 +94,6 @@
     event: !type:CP14DelayedEntityTargetActionEvent
       cooldown: 5
       castDelay: 0.4
-
+      distanceThreshold: 1.5
+      breakOnMove: false
+      breakOnDamage: false
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Slime/jump.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Slime/jump.yml
new file mode 100644
index 0000000000..532e5f505e
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Slime/jump.yml
@@ -0,0 +1,28 @@
+- type: entity
+  id: CP14ActionSpellSlimeJump
+  name: Slime jump
+  description: Jump! JUMP!
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/slime.rsi
+    state: jump
+  - type: CP14MagicEffectCastSlowdown
+    speedMultiplier: 0.1
+  - type: CP14MagicEffect
+    effects:
+    - !type:CP14SpellThrowUserTo
+      throwPower: 8
+  - type: EntityWorldTargetAction
+    useDelay: 8
+    range: 10
+    checkCanAccess: false
+    itemIconStyle: BigAction
+    icon:
+      sprite: _CP14/Actions/Spells/slime.rsi
+      state: jump
+    event: !type:CP14DelayedEntityWorldTargetActionEvent
+      hidden: true
+      breakOnMove: false
+      breakOnDamage: false
+      castDelay: 1
+    raiseOnUser: true
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml
index 524131e7d3..0914fade75 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml
@@ -88,5 +88,4 @@
   components:
   - type: CP14SpellStorage
     spells:
-    - CP14ActionSpellBeerCreation
-
+    - CP14ActionSpellBeerCreation
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/scrolls.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/scrolls.yml
index 482e08cede..ba42c68f50 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/scrolls.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/scrolls.yml
@@ -63,6 +63,8 @@
     energy: 30
     maxEnergy: 50
   - type: CP14MagicUnsafeDamage
+  - type: StaticPrice
+    price: 5
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/head.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/head.yml
index da6ea73ab5..b12bb5561d 100644
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/head.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/head.yml
@@ -4,6 +4,7 @@
   id: CP14ClothingHeadSlimeCrown
   name: slime crown
   description: Earl of Ooze. Grand Duke of Goo. Lord of the Slimes.
+  categories: [ DoNotMap ]
   components:
   - type: Sprite
     sprite: _CP14/Clothing/Head/slime_crown.rsi
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/base.yml
index d0dc59409b..3f773d245c 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/base.yml
@@ -52,8 +52,8 @@
       params:
         volume: 3
   - type: Damageable
-    damageContainer: CP14Biological
-    damageModifierSet: Slime
+    damageContainer: CP14BiologicalAnaerobic
+    damageModifierSet: CP14Slime
   - type: MeleeWeapon
     altDisarm: false
     soundHit:
@@ -72,6 +72,8 @@
     speechSounds: Slime
   - type: TypingIndicator
     proto: slime
+  - type: ReplacementAccent
+    accent: slimes
   - type: SolutionContainerManager
     solutions:
       slime:
@@ -91,6 +93,9 @@
         solution: slime
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  # TODO: shouldn't be openable by others
+  # TODO: custom sound for opening and closing--shouldn't be a chest
+  # TODO: allow player-controlled slime to open its own storage?
   - type: EntityStorage
     isCollidableWhenOpen: true
     enteringOffset: 0, 0
@@ -98,6 +103,9 @@
     showContents: true
     occludesLight: false
   - type: CP14MagicCasterSlowdown
+  - type: Tag
+    tags:
+    - FootstepSound
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:GroupSelector
@@ -110,32 +118,3 @@
           - id: CP14ScrapIron
           - id: CP14CopperCoin1
             weight: 3
-
-- type: entity
-  id: CP14ActionSpellSlimeJump
-  name: Slime jump
-  description: Jump! JUMP!
-  components:
-  - type: Sprite
-    sprite: _CP14/Actions/Spells/physical.rsi
-    state: kick #TODO
-  - type: CP14MagicEffectCastSlowdown
-    speedMultiplier: 0.1
-  - type: CP14MagicEffect
-    effects:
-    - !type:CP14SpellThrowUserTo
-      throwPower: 8
-  - type: EntityWorldTargetAction
-    useDelay: 8
-    range: 10
-    checkCanAccess: false
-    itemIconStyle: BigAction
-    icon:
-      sprite: _CP14/Actions/Spells/physical.rsi
-      state: kick #TODO
-    event: !type:CP14DelayedEntityWorldTargetActionEvent
-      hidden: true
-      breakOnMove: false
-      breakOnDamage: false
-      castDelay: 1
-    raiseOnUser: true
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/electric.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/electric.yml
index 2efe1a6cc9..756c6636e4 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/electric.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/electric.yml
@@ -23,26 +23,23 @@
         - ReagentId: CP14EssenceEnergia
           Quantity: 30
   - type: MeleeWeapon
-    altDisarm: false
-    soundHit:
-        path: /Audio/Weapons/punch3.ogg
-    angle: 0
-    animation: WeaponArcPunch
     damage:
       types:
         Blunt: 3
         Shock: 3
   - type: CP14SpellEffectOnHit
-    prob: 0.3
+    prob: 0.15
     effects:
     - !type:CP14SpellApplyEntityEffect
       effects:
       - !type:Electrocute
-        electrocuteTime: 1
+        electrocuteTime: 0.5
         electrocuteDamageScale: 1
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
       - CP14ElectrifiedEffect
+  - type: Damageable
+    damageModifierSet: CP14SlimeElectric
   - type: Destructible
     thresholds:
     - trigger:
@@ -102,6 +99,5 @@
     - !type:CP14SpellApplyEntityEffect
       effects:
       - !type:Electrocute
-        electrocuteTime: 3.5
+        electrocuteTime: 2
         electrocuteDamageScale: 1
-
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/fire.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/fire.yml
index 688b73972e..6e804f2353 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/fire.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/fire.yml
@@ -25,15 +25,19 @@
         - ReagentId: CP14BasicEffectDamageHeat
           Quantity: 10
   - type: MeleeWeapon
-    altDisarm: false
-    soundHit:
-        path: /Audio/Weapons/punch3.ogg
-    angle: 0
-    animation: WeaponArcPunch
     damage:
       types:
         Blunt: 3
         Heat: 3
+  - type: Damageable
+    damageModifierSet: CP14SlimeFire
+  - type: Temperature
+    coldDamage:
+      types:
+        Cold: 1
+    heatDamage:
+      types:
+        Heat: 0
   - type: Destructible
     thresholds:
     - trigger:
@@ -100,4 +104,3 @@
       - !type:AdjustTemperature
         amount: 6000
       - !type:Ignite
-
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml
index 6aef3e0a08..0ee2469749 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml
@@ -20,14 +20,9 @@
         reagents:
         - ReagentId: CP14ChromiumSlime
           Quantity: 20
-        - ReagentId: CP14EssenceWater
+        - ReagentId: CP14EssenceFrost
           Quantity: 30
   - type: MeleeWeapon
-    altDisarm: false
-    soundHit:
-        path: /Audio/Weapons/punch3.ogg
-    angle: 0
-    animation: WeaponArcPunch
     damage:
       types:
         Blunt: 3
@@ -49,6 +44,15 @@
       - !type:AdjustTemperature
         amount: -6000
       - !type:ExtinguishReaction
+  - type: Damageable
+    damageModifierSet: CP14SlimeIce
+  - type: Temperature
+    coldDamage:
+      types:
+        Cold: 0
+    heatDamage:
+      types:
+        Heat: 3
   - type: Destructible
     thresholds:
     - trigger:
@@ -114,4 +118,3 @@
       - !type:AdjustTemperature
         amount: -82000
       - !type:ExtinguishReaction
-
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml
index c75edef6f2..577a28c475 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml
@@ -8,6 +8,12 @@
   - type: NpcFactionMember
     factions:
     - CP14Monster
+  - type: CP14SkillStorage
+    experienceMaxCap: 0
+    freeLearnedSkills:
+    - SwordMastery
+    - RapierMastery
+    - SkimitarMastery
 
 - type: entity
   id: CP14MobUndeadSkeletonHalberdT1
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml
index 8db6c3d617..1260c6be37 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: CP14MobUndeadSkeletonDemiplaneT2
-  parent: CP14BaseMobSkeleton
+  parent: CP14MobUndeadSkeletonDemiplaneT1 
   name: skeleton
   abstract: true
   components:
@@ -77,20 +77,38 @@
   - type: Loadout
     prototypes:
     - CP14MobSkeletonWizardT2
-  - type: CP14MagicEnergyDraw
-    energy: 1
-    delay: 1
+  - type: CP14MagicEnergyContainer
+    magicAlert: CP14MagicEnergy
+    maxEnergy: 200
+    energy: 200
+    unsafeSupport: true
+  - type: PassiveDamage
+    allowedStates:
+    - Alive
+    damage:
+      types:
+        CP14ManaDepletion: -0.1
+  - type: CP14SkillStorage
+    experienceMaxCap: 0
+    freeLearnedSkills:
+    - SwordMastery
+    - RapierMastery
+    - SkimitarMastery
+    - HydrosophistryT1
+    - HydrosophistryT2
+    - MetamagicT1
+    - MetamagicT2
+    - CP14ActionSpellFreeze
+    - CP14ActionSpellIceShards
+    - CP14ActionSpellManaConsumeElf
+    - CP14ActionSpellManaGiftElf
+    - CP14ActionSpellMagicSplitting
+    - CP14ActionSpellManaTrance
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
-    - CP14ActionSpellFreeze
-    - CP14ActionSpellIceShards
-    - CP14ActionSpellIceDagger
-    - CP14ActionSpellCureFromDeath
+    - CP14ActionSpellResurrectionDead
     - CP14ActionSpellShadowStep
-    - CP14ActionSpellShadowSwap
-    - CP14ActionSpellShadowGrab
-
 - type: entity
   id: CP14MobUndeadSkeletonBardT2
   parent: CP14MobUndeadSkeletonDemiplaneT2
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml
index 365e533fd3..e7aaac5a88 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml
@@ -39,7 +39,7 @@
     offset: 1
     table: !type:GroupSelector
       rolls: !type:RangeNumberSelector
-        range: 1, 5
+        range: 3, 5
       children:
       - id: CP14MobUndeadZombie
         weight: 2
@@ -50,6 +50,32 @@
     tags:
     - FootstepSound
     - CP14RaidLeader
+  - type: CP14SkillStorage
+    experienceMaxCap: 0
+    freeLearnedSkills:
+    - SwordMastery
+    - RapierMastery
+    - SkimitarMastery
+    - MetamagicT1
+    - MetamagicT2
+    - HydrosophistryT1
+    - HydrosophistryT2
+    - PyrokineticT1
+    - PyrokineticT2
+    - CP14ActionSpellFireball
+    - CP14ActionSpellFreeze
+    - CP14ActionSpellIceShards
+    - CP14ActionSpellManaConsumeElf
+    - CP14ActionSpellManaGiftElf
+    - CP14ActionSpellMagicSplitting
+    - CP14ActionSpellManaTrance
+  - type: CP14SpellStorage
+    grantAccessToSelf: true
+    spells:
+    - CP14ActionSpellResurrectionDead
+  - type: Loadout
+    prototypes:
+    - CP14MobSkeletonWizardTownRaid
 
 - type: entity
   id: CP14SpawnPointTownRaidUndeadEasy
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
index 5b59fa0468..b7c92bfd61 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
@@ -43,7 +43,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
@@ -210,7 +210,7 @@
     attributes:
       proper: true
   - type: MobPrice
-    price: 1500 # Kidnapping a living person and selling them for cred is a good move.
+    price: 150 # Kidnapping a living person and selling them for cred is a good move.
     deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
   - type: Tag
     tags:
@@ -365,7 +365,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
@@ -400,6 +400,7 @@
   - BaseMob
   - CP14MobDamageable
   - CP14MobMagical
+  - CP14BaseMobSpecies
   id: CP14BaseMobSpeciesNoLife
   categories: [ ForkFiltered ]
   abstract: true
@@ -438,7 +439,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml
index 97562ed48b..7add9ee392 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml
@@ -38,7 +38,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml
index 7f77825451..f880521dcd 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml
@@ -42,7 +42,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
@@ -154,7 +154,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
index 1d9e596b7d..becd0b64d2 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
@@ -34,7 +34,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml
index cfb5210a03..3f57ff36f3 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml
@@ -36,7 +36,7 @@
     - map: [ "cloak" ]
     - map: [ "outerClothing" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/base.yml
index 74bb29c248..5b13e55d92 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/base.yml
@@ -109,7 +109,6 @@
 - type: entity
   parent:
   - CP14MobDamageable
-  - MobRespirator
   - MobAtmosStandard
   - CP14SimpleSpaceMobNoLifeBase
   id: CP14SimpleMobNoLifeBase
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/Books/books.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/Books/books.yml
index e9831b30fa..177ffba5f7 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/Books/books.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/Books/books.yml
@@ -18,4 +18,4 @@
     - state: bookmark_short
       map: [ "overlay" ]
   - type: Paper
-    content: cp14-book-text-guild_moral
+    content: cp14-book-text-guild-moral
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml
index 414863fdad..5a72d18309 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml
@@ -35,6 +35,8 @@
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   id: CP14PaperFolderBlue
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml
index d7c67914d2..727a31bcc8 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml
@@ -60,6 +60,8 @@
   - type: Tag
     tags:
     - Document
+  - type: StaticPrice
+    price: 2
 
 - type: entity
   parent: CP14BasePaper
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml
index ef76f2b54e..59ad523ee2 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml
@@ -22,6 +22,11 @@
       collection: PaperScribbles
       params:
         variation: 0.1
+  - type: StaticPrice
+    price: 3
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 0 #Parenting from vanilla moment
 
 # TODO: Чернильницу нужно доделать. Перо должно быть видно, пока оно внутри чернильницы. Предмет должен быть через ItemSlots, чтобы перо вставлять забирать можно было кликом. Нужно добавить прикольные звуки вставляния, выставляния. И добавить механ, который будет требовать периодически макать перо в чернильницу.
 - type: entity
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml
index 4ce8143a60..67a7591969 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml
@@ -39,3 +39,36 @@
   - type: CP14TradingContract
     faction: BradPotions
 
+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractDwarfMining
+  description: Trading contract with the "Dwarf Steel" mining branch. Allows you to purchase various ore and mining tools.
+  suffix: Dwarf Miners
+  components:
+  - type: Sprite
+    state: dwarf_mining
+  - type: CP14TradingContract
+    faction: DwarfMining
+
+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractThaumaturgy
+  description: Trading contract with the "Academy of Thaumaturgy". Allows you to purchase various omagic device, tools and scrolls.
+  suffix: Thaumaturgy
+  components:
+  - type: Sprite
+    state: magic
+  - type: CP14TradingContract
+    faction: Thaumaturgy
+
+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractHomeDecor
+  description: Trading contract with the "Cozy House" store. Allows you to buy various decorations and nice things to furnish your home.
+  suffix: Home Decor
+  components:
+  - type: Sprite
+    state: house
+  - type: CP14TradingContract
+    faction: HomeDecor
+
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml
index c0879d7be3..471858391b 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml
@@ -21,6 +21,8 @@
     tags:
     - CP14Wheat
     - CP14FarmFood
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   id: CP14Cotton
@@ -45,3 +47,5 @@
   - type: Tag
     tags:
     - CP14FarmFood
+  - type: StaticPrice
+    price: 1
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/tools.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/tools.yml
index 2d1621d51d..5f00232078 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/tools.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/tools.yml
@@ -32,6 +32,19 @@
     materialComposition:
       CP14Mithril: 10
 
+- type: entity
+  parent: CP14BaseLockpick
+  id: CP14LockpickSkeletonArtifact
+  name: lockpick skeleton
+  description: A lockpick made from the bone of an unknown creature, it can open anything... though not immediately.
+  categories: [ DoNotMap ]
+  suffix: Artifact
+  components:
+  - type: CP14Lockpick
+    health: 1000
+  - type: Sprite
+    state: lockpick_skeleton
+
 - type: entity
   parent: BaseItem
   id: CP14KeyFile
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml
index d06372a927..03a2fad0d1 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml
@@ -10,6 +10,9 @@
   - type: Sprite
     sprite: _CP14/Objects/Materials/string.rsi
     state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Cloth: 5
 
 - type: entity
   id: CP14Web
@@ -34,6 +37,9 @@
         icon2: ""
         icon3: ""
         icon4: ""
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Cloth: 2
 
 - type: entity
   id: CP14Cloth1
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/bell.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/bell.yml
index 65c630a8c0..3afc029b2e 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/bell.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/bell.yml
@@ -11,6 +11,8 @@
   - type: Tag
     tags:
       - Payload
+  - type: StaticPrice
+    price: 5
   - type: InteractionPopup
     successChance: 1
     interactSuccessSound:
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/openclosed_sign.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/openclosed_sign.yml
new file mode 100644
index 0000000000..76a447a5d7
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/openclosed_sign.yml
@@ -0,0 +1,84 @@
+- type: entity
+  id: CP14OpenSign
+  name: flip sign "Open"
+  description: A small double-sided sign that can be turned over
+  parent: 
+  - BaseItem
+  - CP14BaseFlammable
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Misc/openclosed_sign.rsi
+    layers:
+      - state: table_sign
+      - state: en_open_sign
+        map: [signState]
+  - type: Item
+    size: Small
+  - type: Flippable
+    mirrorEntity: CP14ClosedSign
+  - type: Appearance
+  - type: InteractionOutline
+  - type: CP14LocalizationVisuals
+    mapStates:
+      signState:
+        ru-RU: ru_open_sign
+        en-US: en_open_sign
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 6
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14Ash1:
+            min: 1
+            max: 2
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14WoodenPlanks1:
+            min: 1
+            max: 1
+
+- type: entity
+  id: CP14ClosedSign
+  name: flip sign "Closed"
+  description: A small double-sided sign that can be turned over
+  parent: 
+  - CP14OpenSign
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Misc/openclosed_sign.rsi
+    layers:
+      - state: table_sign
+      - state: en_close_sign
+        map: [signState]
+  - type: Flippable
+    mirrorEntity: CP14OpenSign
+  - type: CP14LocalizationVisuals
+    mapStates:
+      signState:
+        ru-RU: ru_close_sign
+        en-US: en_close_sign
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
index 41cf52e079..5c289cc429 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
@@ -231,6 +231,8 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 2
     fillBaseName: liq-
+  - type: Item
+    size: Tiny
 
 - type: entity
   id: CP14Syringe
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml
index 99b62b29e6..d1f78ad13e 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml
@@ -39,4 +39,7 @@
       - state: label
         visible: false
         map: ["enum.PaperLabelVisuals.Layer"]
-
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 10
+      CP14Gold: 10
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml
index 497fcc0193..bb5e2c1717 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml
@@ -15,6 +15,8 @@
   - type: Tag
     tags:
     - CP14EnergyCrystal
+  - type: StaticPrice
+    price: 10
 
 - type: entity
   id: CP14EnergyCrystalMedium
@@ -25,7 +27,6 @@
   - type: Sprite
     layers:
       - state: medium
-      - state: medium_connector
   - type: CP14MagicEnergyContainer
     energy: 50
     maxEnergy: 50
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml
index 1e1eb82917..a0eb014081 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml
@@ -57,6 +57,8 @@
       collection: MetalThud
     cPAnimationLength: 0.25
     cPAnimationOffset: -1.3
+  - type: StaticPrice
+    price: 50
   - type: NetworkConfigurator
   - type: ActivatableUI
     key: enum.NetworkConfiguratorUiKey.List
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml
index 2261c4a623..a40b6a5579 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml
@@ -60,6 +60,10 @@
   - type: Tag
     tags:
     - CP14Torch
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Cloth: 10
 
 - type: entity
   parent: CP14Torch
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Wallpaper/general.yml b/Resources/Prototypes/_CP14/Entities/Objects/Wallpaper/general.yml
index f87dec2bdd..0c2066f386 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Wallpaper/general.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Wallpaper/general.yml
@@ -11,6 +11,8 @@
     sprite: _CP14/Structures/Wallpaper/icons.rsi
   - type: Stack
     count: 30
+  - type: StackPrice
+    price: 0.5
 
 - type: entity
   id: CP14WallpaperBlack
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml
index 50ca9df508..1030bc0f89 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml
@@ -43,5 +43,4 @@
   - type: CP14ModularCraftAutoAssemble
     details:
     - BladeIronDagger
-    - InlayQuartzElectric
-
+    - InlayQuartzElectric
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml
index 3ab26f71d5..a96e33eb95 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml
@@ -13,3 +13,49 @@
     details:
     - BladeIronSkimitar
 
+- type: entity
+  id: CP14ModularCopperSkimitar
+  parent: CP14ModularGripWooden
+  name: copper skimitar
+  description: the gold standard of edged weapons. Medium length, comfortable grip. No frills.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeCopperSkimitar
+
+- type: entity
+  id: CP14ModularIronSkimitarTundra
+  parent: CP14ModularGripWooden
+  name: Skimitar Tundra
+  description: the gold standard of edged weapons. Medium length, comfortable grip. It has "tundra" engraved on it.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeIronSkimitar
+    - InlayQuartzWater
+
+- type: entity
+  id: CP14ModularGoldSkimitarAgony
+  parent: CP14ModularGripWooden
+  name: Skimitar Agony
+  description: the gold standard of edged weapons. Medium length, comfortable grip. It has "agony" engraved on it.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeGoldSkimitar
+    - InlayQuartzElectric
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml
index 4b657997aa..9e688eb4bb 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml
@@ -8,7 +8,7 @@
   - type: CP14WaveShader
     speed: 2.5
     dis: 4
-  - type: SpriteFade
+  #- type: SpriteFade #Hard to attack
   - type: Clickable
   - type: Sprite
     noRot: true
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/carpets.yml
index a082a80fbb..7b090d836f 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/carpets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/carpets.yml
@@ -1,6 +1,8 @@
 - type: entity
   id: CP14CarpetBase
-  parent: BaseStructure
+  parent:
+  - BaseStructure
+  - CP14BaseFlammableSpreadingStrong
   name: carpet
   description: "Fancy walking surface."
   categories: [ ForkFiltered ]
@@ -57,3 +59,42 @@
   - type: Icon
     sprite: _CP14/Structures/Furniture/Carpets/red_carpet.rsi
 
+- type: entity
+  id: CP14CarpetCyan
+  parent: CP14CarpetBase
+  suffix: Cyan
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Carpets/cyan_carpet.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Carpets/cyan_carpet.rsi
+
+- type: entity
+  id: CP14CarpetGreen
+  parent: CP14CarpetBase
+  suffix: Green
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Carpets/green_carpet.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Carpets/green_carpet.rsi
+
+- type: entity
+  id: CP14CarpetOrange
+  parent: CP14CarpetBase
+  suffix: Orange
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Carpets/orange_carpet.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Carpets/orange_carpet.rsi
+
+- type: entity
+  id: CP14CarpetPink
+  parent: CP14CarpetBase
+  suffix: Pink
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Carpets/pink_carpet.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Carpets/pink_carpet.rsi
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml
index 404576cfaf..e5951deeb2 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml
@@ -23,7 +23,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "mask" ]
@@ -90,7 +90,7 @@
         showEnts: False
         occludes: False
         ent: null
-      belt1: !type:ContainerSlot
+      belt: !type:ContainerSlot
         showEnts: False
         occludes: False
         ent: null
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml
index e0f8094483..34668159a8 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml
@@ -49,6 +49,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/plant_rustle.ogg
+  - type: StaticPrice
+    price: 15
 
 - type: entity
   id: CP14PottedPlant1
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml
index 0996bbbf05..b726cdc973 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml
@@ -35,6 +35,7 @@
     radius: 2
     energy: 2
   - type: CP14Workbench
+    workbenchRadius: 0.5
     craftSound:
       collection: CP14Sawing #TODO
     recipeTags:
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/cash_converter.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/cash_converter.yml
index 6643e948d9..244519bac8 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/cash_converter.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/cash_converter.yml
@@ -46,7 +46,5 @@
           bounds: "-0.4,-0.4,0.4,0.4"
         density: 190
         mask:
-        - MachineMask
-        layer:
-          - MachineLayer
+        - TabletopMachineMask
 
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml
index 9c87244067..552f6aaaf2 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml
@@ -15,7 +15,6 @@
     sprite: _CP14/Structures/Specific/Economy/buy_platform.rsi
     state: base
   - type: ActivatableUI
-    singleUser: true
     key: enum.CP14TradingUiKey.Key
   - type: Clickable
   - type: InteractionOutline
@@ -90,7 +89,6 @@
   - type: CP14MagicEnergyDraw
     energy: -1
     delay: 3 # 5m to full restore
-  - type: CP14MagicUnsafeDamage
   - type: CP14MagicEnergyExaminable
 
 - type: entity
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml
index 856c2da767..fe65ae7370 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml
@@ -52,7 +52,7 @@
       paper_label: !type:ContainerSlot
   - type: ItemSlots
   - type: StaticPrice
-    price: 50
+    price: 5
   - type: CP14Lock #Empty, for installing new locks
   - type: Lock
     locked: false
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml
index 4690ca2bd7..2f2ecc1717 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml
@@ -41,3 +41,9 @@
     node: CP14CrateCoffin
     containers:
     - entity_storage
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 30
+      CP14Cloth: 20
+  - type: EntityStorage
+    capacity: 1
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/well.yml b/Resources/Prototypes/_CP14/Entities/Structures/well.yml
index b352041586..d9aa4e6a84 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/well.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/well.yml
@@ -28,3 +28,47 @@
     solution: pool
   - type: Drink
     solution: pool
+
+- type: entity
+  id: CP14StoneWellBroken
+  parent: CP14StoneWell
+  categories: [ ForkFiltered ]
+  name: broken well
+  description: A barely surviving well that's been through too much, maybe there's still water left.
+  components:
+  - type: Sprite
+    noRot: true
+    offset: 0, 0.3
+    drawdepth: Mobs
+    sprite: _CP14/Structures/Specific/Farming/well.rsi
+    layers:
+    - state: broken
+  - type: SolutionContainerManager
+    solutions:
+      pool:
+        maxVol: 999
+        reagents:
+        - ReagentId: Water
+          Quantity: 200
+
+- type: entity
+  id: CP14StoneWellGrovelling
+  parent: CP14StoneWell
+  categories: [ ForkFiltered ]
+  name: grovelling well
+  description: A well ruined by time, overgrown with moss and grass, perhaps there was at least a couple of buckets of water left there.
+  components:
+  - type: Sprite
+    noRot: true
+    offset: 0, 0.3
+    drawdepth: Mobs
+    sprite: _CP14/Structures/Specific/Farming/well.rsi
+    layers:
+    - state: grovelling
+  - type: SolutionContainerManager
+    solutions:
+      pool:
+        maxVol: 999
+        reagents:
+        - ReagentId: Water
+          Quantity: 50
diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml
index 8744ef7de5..8eedb4f3ef 100644
--- a/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml
+++ b/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml
@@ -72,7 +72,7 @@
       strippingWindowPos: 2,2
       displayName: Cloak
     # Main hotbar
-    - name: belt1
+    - name: belt
       slotTexture: belt
       slotFlags: BELT
       slotGroup: SecondHotbar
diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml
index 8f299476a4..46a24d1d37 100644
--- a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml
+++ b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml
@@ -72,7 +72,7 @@
       strippingWindowPos: 2,2
       displayName: Cloak
     # Main hotbar
-    - name: belt1
+    - name: belt
       slotTexture: belt
       slotFlags: BELT
       slotGroup: SecondHotbar
diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml
index 8e108bac5d..c5274ea95e 100644
--- a/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml
+++ b/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml
@@ -66,7 +66,7 @@
       strippingWindowPos: 2,2
       displayName: Cloak
     # Main hotbar
-    - name: belt1
+    - name: belt
       slotTexture: belt
       slotFlags: BELT
       slotGroup: SecondHotbar
diff --git a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml
index a72ee5e71d..344ca979c9 100644
--- a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml
@@ -6,6 +6,18 @@
   equipment:
     pants: CP14ClothingPantsLoincloth
 
+- type: startingGear
+  id: CP14MobSkeletonWizardTownRaid
+  equipment:
+    outerClothing: CP14ClothingOuterClothingBoneArmor
+    cloak: CP14ClothingCloakBoneMage
+    head: CP14ClothingHeadTriangularHatGolden
+    shirt: CP14ClothingShirtCottonBlack
+    pants: CP14ClothingPantsBrown
+    shoes: CP14LongLeatherBoots
+    belt: CP14ModularSkeletonSwordUpgrade
+    neck: CP14ModularIronPickaxe
+
 # TIER 1
 
 - type: startingGear
@@ -24,7 +36,7 @@
     outerClothing: CP14ClothingOuterClothingBoneArmor
     cloak: CP14ClothingCloakBone
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularSkeletonSword
+    belt: CP14ModularSkeletonSword
     shoes: CP14ClothingShoesSandals
     head: CP14ClothingHeadMetalHeadband
   inhand:
@@ -35,7 +47,7 @@
   equipment:
     mask: CP14ClothingMaskSinner
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularIronDagger
+    belt: CP14ModularIronDagger
     belt2: CP14ModularIronDagger
 
 - type: startingGear
@@ -44,7 +56,7 @@
     shirt: CP14ClothingWarriorsGarbDress
     pants: CP14ClothingPantsLoincloth
     neck: CP14BowCombat
-    belt1: CP14ClothingBeltQuiverCopperArrow
+    belt: CP14ClothingBeltQuiverCopperArrow
 
 # TIER 2
 
@@ -66,7 +78,7 @@
     cloak: CP14ClothingCloakBone
     mask: CP14ClothingMaskSteelMask
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularSkeletonSwordUpgrade
+    belt: CP14ModularSkeletonSwordUpgrade
     shoes: CP14ClothingShoesSandals
   inhand:
     - CP14BaseShield
@@ -77,7 +89,7 @@
     outerClothing: CP14ClothingOuterClothingBoneArmor
     mask: CP14ClothingMaskBoneHornedMask
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularIronDaggerTundra
+    belt: CP14ModularIronDaggerTundra
     belt2: CP14ModularIronDaggerAgony
     shoes: CP14ClothingShoesSandals
 
@@ -89,7 +101,7 @@
     shirt: CP14ClothingShirtCottonBlack
     pants: CP14ClothingPantsBrown
     neck: CP14BowCombat
-    belt1: CP14ClothingBeltQuiverIronArrow
+    belt: CP14ClothingBeltQuiverIronArrow
     belt2: CP14ModularSkeletonSword
     shoes: CP14LongLeatherBoots
 
@@ -103,9 +115,7 @@
     pants: CP14ClothingPantsBrown
     shoes: CP14LongLeatherBoots
     ring2: CP14ClothingCloakAmuletMana
-    belt1: CP14ModularSkeletonSword
-  inhand:
-    - CP14ManaOperationGlove
+    belt: CP14ModularSkeletonSword
 
 - type: startingGear
   id: CP14MobSkeletonBardT2
diff --git a/Resources/Prototypes/_CP14/Maps/comoss.yml b/Resources/Prototypes/_CP14/Maps/comoss.yml
index ca180cc0a7..cba7f61de1 100644
--- a/Resources/Prototypes/_CP14/Maps/comoss.yml
+++ b/Resources/Prototypes/_CP14/Maps/comoss.yml
@@ -21,7 +21,7 @@
             CP14Alchemist: [ 2, 2 ]
             CP14Blacksmith: [ 2, 2 ]
             CP14Innkeeper: [ 3, 4 ]
-            #CP14Merchant: [2, 2]
+            CP14Merchant: [2, 2]
             #Guard
             CP14Guard: [8, 8]
             CP14GuardCommander: [1, 1]
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
index 3f031afbd6..a193428aa1 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
@@ -32,7 +32,6 @@
     storedOffsetBonus: 0, 5
   - !type:EditModularSlots
     addSlots:
-    - Garde
     - BladeInlay
 
 - type: modularPart
diff --git a/Resources/Prototypes/_CP14/Reagents/target_effects.yml b/Resources/Prototypes/_CP14/Reagents/target_effects.yml
index 26e8856466..2c8eac1358 100644
--- a/Resources/Prototypes/_CP14/Reagents/target_effects.yml
+++ b/Resources/Prototypes/_CP14/Reagents/target_effects.yml
@@ -25,10 +25,9 @@
       effects:
       - !type:ModifyBleedAmount
         amount: -2
-      - !type:HealthChange
+      - !type:EvenHealthChange
         damage:
-          groups:
-            Brute: -6
+          Brute: -6
   pricePerUnit: 2
 
 - type: reagent
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml
index f980e2f899..e3a04cdedc 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml
@@ -11,7 +11,7 @@
             - !type:SnapToGrid
           steps:
             - material: CP14WoodenPlanks
-              amount: 2
+              amount: 3
               doAfter: 2
             - material: CP14Cloth
               amount: 2
@@ -26,7 +26,7 @@
           completed:
             - !type:SpawnPrototype
               prototype: CP14WoodenPlanks1
-              amount: 2
+              amount: 3
             - !type:SpawnPrototype
               prototype: CP14Cloth1
               amount: 2
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml
index 829994c1b7..1a61ddadae 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml
@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssencePoison: 0.5
-  cp14RandomProducts:
-  - CP14EssenceWater: 0.5
-  - CP14EssenceEarth: 0.5
+    CP14EssenceEarth: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml
index fc250938d4..4641e92c9b 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml
@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssenceAir: 0.5
-  cp14RandomProducts:
-  - CP14EssenceWater: 0.5
-  - CP14EssenceLife: 0.5
+    CP14EssenceWater: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml
index 91e8fac9ff..74a23c373c 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml
@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssenceMagic: 0.5
-  cp14RandomProducts:
-  - CP14EssenceWater: 0.5
-  - CP14EssenceLife: 0.5
+    CP14EssenceWater: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml
index 634a853755..a1db16afcc 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml
@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssenceFire: 0.5
-  cp14RandomProducts:
-  - CP14EssenceLife: 0.5
-  - CP14EssenceMotion: 0.5
+    CP14EssenceMotion: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml
index 1c70c03d72..d55ccd3d2e 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml
@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssenceCrystal: 0.5
-  cp14RandomProducts:
-  - CP14EssenceOrder: 0.5
-  - CP14EssenceChaos: 0.5
+    CP14EssenceOrder: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml
index 3b99336804..43b70a0406 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml
@@ -10,41 +10,38 @@
       amount: 1
   products:
     CP14EssenceLight: 0.5
-  cp14RandomProducts:
-  - CP14EssenceWater: 0.5
-  - CP14EssenceEarth: 0.5
+    CP14EssenceEarth: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 
 # Idea: Full randomness
 
-- type: reaction
-  id: CP14LumiMushroomAdmixture
-  minTemp: 500
-  reactants:
-    CP14LumiMushroom:
-      amount: 1
-    CP14BasicEffectEmpty:
-      amount: 1
-  cp14RandomProducts:
-  - CP14BasicEffectHealBrute: 2
-  - CP14BasicEffectDamageBrute: 2
-  - CP14BasicEffectHealHeat: 2
-  - CP14BasicEffectDamageHeat: 2
-  - CP14BasicEffectHealCold: 2
-  - CP14BasicEffectDamageCold: 2
-  - CP14BasicEffectHealPoison: 2
-  - CP14BasicEffectDamagePoison: 2
-  - CP14BasicEffectHealAirloss: 2
-  - CP14BasicEffectDamageAirloss: 2
-  - CP14BasicEffectBloodRestore: 2
-  - CP14BasicEffectBloodAbsorption: 2
-  - CP14BasicEffectSatiateHunger: 2
-  - CP14BasicEffectSatiateThirst: 2
-  - CP14BasicEffectHealMana: 2
-  - CP14BasicEffectDamageMana: 2
-  - CP14BasicEffectSpeedUp: 2
-  - CP14BasicEffectSpeedDown: 2
-  - CP14BasicEffectSleep: 2
-  - CP14BasicEffectUnsleep: 2
-
+#- type: reaction
+#  id: CP14LumiMushroomAdmixture
+#  minTemp: 500
+#  reactants:
+#    CP14LumiMushroom:
+#      amount: 1
+#    CP14BasicEffectEmpty:
+#      amount: 1
+#  cp14RandomProducts:
+#  - CP14BasicEffectHealBrute: 2
+#  - CP14BasicEffectDamageBrute: 2
+#  - CP14BasicEffectHealHeat: 2
+#  - CP14BasicEffectDamageHeat: 2
+#  - CP14BasicEffectHealCold: 2
+#  - CP14BasicEffectDamageCold: 2
+#  - CP14BasicEffectHealPoison: 2
+#  - CP14BasicEffectDamagePoison: 2
+#  - CP14BasicEffectHealAirloss: 2
+#  - CP14BasicEffectDamageAirloss: 2
+#  - CP14BasicEffectBloodRestore: 2
+#  - CP14BasicEffectBloodAbsorption: 2
+#  - CP14BasicEffectSatiateHunger: 2
+#  - CP14BasicEffectSatiateThirst: 2
+#  - CP14BasicEffectHealMana: 2
+#  - CP14BasicEffectDamageMana: 2
+#  - CP14BasicEffectSpeedUp: 2
+#  - CP14BasicEffectSpeedDown: 2
+#  - CP14BasicEffectSleep: 2
+#  - CP14BasicEffectUnsleep: 2
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml
index 2f542bc0e9..3f4f632700 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml
@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssenceEarth: 0.5
-  cp14RandomProducts:
-  - CP14EssenceOrder: 0.5
-  - CP14EssenceChaos: 0.5
+    CP14EssenceOrder: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 
diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml
index f660b6bb02..44e46aed1d 100644
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml
@@ -264,3 +264,14 @@
     protoId: CP14String
     count: 1
   result: CP14LuteInstrument
+
+- type: CP14Recipe
+  id: CP14OpenSign
+  tag: CP14RecipeWorkbench
+  craftTime: 2
+  requirements:
+  - !type:StackGroupResource
+    group: WoodenPlanks
+    count: 2
+  result: CP14OpenSign
+
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml
index c7539dea05..bc03f5a4f3 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml
@@ -26,7 +26,7 @@
     - CP14EnergyCrystalMedium
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingAlchemist
     neck: CP14MagicHealingStaff
 
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml
index 09d67f3627..be68284c3e 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml
@@ -20,5 +20,4 @@
     - CP14EnergyCrystalMedium
   equipment:
     keys: CP14BaseKeyRing
-    belt1: CP14WalletFilledTest
-
+    belt: CP14WalletFilledTest
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml
index 13086a9b8b..cdc121f474 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml
@@ -26,6 +26,5 @@
     - CP14EnergyCrystalMedium
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingBlacksmith
-
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml
index 942cf6c469..a43046c7eb 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml
@@ -13,6 +13,5 @@
     back:
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingInnkeeper
-
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml
index f0fc2a714d..f81a879190 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml
@@ -15,5 +15,5 @@
   id: CP14GuardGear
   equipment:
     keys: CP14KeyRingGuard
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
 
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml
index 6371e83d5e..5f848b2975 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml
@@ -24,5 +24,4 @@
   id: CP14GuardCommanderGear
   equipment:
     keys: CP14KeyRingGuardCommander
-    belt1: CP14WalletFilledTest
-
+    belt: CP14WalletFilledTest
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
index 0f66c09a5f..978cd0a483 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
@@ -15,5 +15,4 @@
     - CP14EnergyCrystalMedium
   equipment:
     keys: CP14BaseKeyRing
-    belt1: CP14WalletFilledTest
-
+    belt: CP14WalletFilledTest
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml
index 04c998844f..5800f6f78f 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml
@@ -32,7 +32,7 @@
     back:
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingGuildmaster
     belt2: CP14ModularGuildmasterRapier
 
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml
index ec35c552b7..f62212e0cc 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml
@@ -10,6 +10,8 @@
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 3600 # 1 hours
+  special:
+    - !type:CP14AddGlobalReputationSpecial
 
 - type: startingGear
   id: CP14MerchantGear
@@ -18,6 +20,6 @@
     - CP14EnergyCrystalMedium
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledMerchant
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingMerchant
 
diff --git a/Resources/Prototypes/_CP14/Trading/brad_potions.yml b/Resources/Prototypes/_CP14/Trading/brad_potions.yml
index d29cb47bcc..d92d5aff34 100644
--- a/Resources/Prototypes/_CP14/Trading/brad_potions.yml
+++ b/Resources/Prototypes/_CP14/Trading/brad_potions.yml
@@ -1,77 +1,21 @@
+
+# Rep 0
+
 - type: cp14TradingPosition
   id: CP14VialSmallHealingBrute
   faction: BradPotions
-  uiPosition: 0, 0
+  uiPosition: 0
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
     state: vial
   service: !type:CP14BuyItemsService
     product: CP14VialSmallHealingBrute
 
-- type: cp14TradingPosition
-  id: CP14VialSmallHealingPoison
-  faction: BradPotions
-  uiPosition: 0, 1
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallHealingPoison
-
-- type: cp14TradingPosition
-  id: CP14VialSmallHealingAirloss
-  faction: BradPotions
-  uiPosition: 0, 2
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallHealingAirloss
-
-- type: cp14TradingPosition
-  id: CP14VialSmallHealingBlood
-  faction: BradPotions
-  uiPosition: 0, 3
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallHealingBlood
-
-- type: cp14TradingPosition
-  id: CP14VialSmallSpeedUp
-  faction: BradPotions
-  uiPosition: 1, 0
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallSpeedUp
-
-- type: cp14TradingPosition
-  id: CP14VialSmallRainbow
-  faction: BradPotions
-  uiPosition: 1, 1
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallRainbow
-
-- type: cp14TradingPosition
-  id: CP14VialSmallHealingManaDepletion
-  faction: BradPotions
-  uiPosition: 1, 2
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallHealingManaDepletion
-
 - type: cp14TradingPosition
   id: CP14VialSmallHealingMana
   faction: BradPotions
-  uiPosition: 1, 3
+  reputationLevel: 0
+  uiPosition: 1
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
     state: vial
@@ -79,12 +23,10 @@
     product: CP14VialSmallHealingMana
 
 
-
-
 - type: cp14TradingPosition
   id: CP14VialTiny
   faction: BradPotions
-  uiPosition: 3, 0
+  uiPosition: 3
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi
     state: vial
@@ -93,83 +35,21 @@
 
 - type: cp14TradingPosition
   id: CP14VialTinyReinforced
-  prerequisite: CP14VialTiny
   priceMarkup: 1
   faction: BradPotions
-  uiPosition: 3, 1
+  uiPosition: 4
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi
     state: vial
   service: !type:CP14BuyItemsService
     product: CP14VialTinyReinforced
 
-- type: cp14TradingPosition
-  id: CP14VialSmall
-  prerequisite: CP14VialTiny
-  priceMarkup: 1
-  faction: BradPotions
-  uiPosition: 4, 0
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmall
-
-- type: cp14TradingPosition
-  id: CP14VialSmallReinforced
-  prerequisite: CP14VialSmall
-  priceMarkup: 2
-  faction: BradPotions
-  uiPosition: 4, 1
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallReinforced
-
-- type: cp14TradingPosition
-  id: CP14VialMedium
-  prerequisite: CP14VialSmall
-  priceMarkup: 2
-  faction: BradPotions
-  uiPosition: 5, 0
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialMedium
-
-- type: cp14TradingPosition
-  id: CP14VialMediumReinforced
-  prerequisite: CP14VialMedium
-  priceMarkup: 3
-  faction: BradPotions
-  uiPosition: 5, 1
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialMediumReinforced
-
-
-
-
-- type: cp14TradingPosition
-  id: CP14Cauldron
-  priceMarkup: 5
-  faction: BradPotions
-  uiPosition: 7, 0
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/cauldron.rsi
-    state: icon
-  service: !type:CP14BuyItemsService
-    product: CP14Cauldron
 
 - type: cp14TradingPosition
   id: CP14Pestle
   priceMarkup: 2
   faction: BradPotions
-  uiPosition: 8, 0
+  uiPosition: 6
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
     state: pestle
@@ -180,18 +60,67 @@
   id: CP14Mortar
   priceMarkup: 2
   faction: BradPotions
-  uiPosition: 9, 0
+  uiPosition: 7
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
     state: mortar_base
   service: !type:CP14BuyItemsService
     product: CP14Mortar
 
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingBlood
+  faction: BradPotions
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingBlood
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingManaDepletion
+  faction: BradPotions
+  reputationLevel: 1
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingManaDepletion
+
+- type: cp14TradingPosition
+  id: CP14VialSmall
+  reputationLevel: 1
+  priceMarkup: 1
+  faction: BradPotions
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmall
+
+- type: cp14TradingPosition
+  id: CP14VialSmallReinforced
+  reputationLevel: 1
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallReinforced
+
 - type: cp14TradingPosition
   id: CP14Dropper
   priceMarkup: 1
+  reputationLevel: 1
   faction: BradPotions
-  uiPosition: 7, 1
+  uiPosition: 6
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/dropper.rsi
     state: dropper
@@ -201,12 +130,107 @@
 - type: cp14TradingPosition
   id: CP14Syringe
   priceMarkup: 2
+  reputationLevel: 1
   faction: BradPotions
-  uiPosition: 8, 1
+  uiPosition: 7
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/syringe.rsi
     state: base
   service: !type:CP14BuyItemsService
     product: CP14Syringe
 
+# Rep 2
 
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingPoison
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingPoison
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingAirloss
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingAirloss
+
+
+- type: cp14TradingPosition
+  id: CP14VialMedium
+  reputationLevel: 2
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialMedium
+
+- type: cp14TradingPosition
+  id: CP14VialMediumReinforced
+  reputationLevel: 2
+  priceMarkup: 3
+  faction: BradPotions
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialMediumReinforced
+
+- type: cp14TradingPosition
+  id: CP14Cauldron
+  priceMarkup: 5
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/cauldron.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14Cauldron
+
+- type: cp14TradingPosition
+  id: CP14BaseAlchemyBomb
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14BaseAlchemyBomb
+
+# Rep 3
+
+- type: cp14TradingPosition
+  id: CP14VialSmallSpeedUp
+  faction: BradPotions
+  reputationLevel: 3
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallSpeedUp
+
+- type: cp14TradingPosition
+  id: CP14VialSmallRainbow
+  faction: BradPotions
+  reputationLevel: 3
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallRainbow
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Trading/contracts.yml b/Resources/Prototypes/_CP14/Trading/contracts.yml
index 3745892682..a357cc77a5 100644
--- a/Resources/Prototypes/_CP14/Trading/contracts.yml
+++ b/Resources/Prototypes/_CP14/Trading/contracts.yml
@@ -1,8 +1,7 @@
 - type: cp14TradingPosition
   id: CP14TradeContractVictoriaGardens
   faction: ContractGuild
-  uiPosition: 0, 0
-  unlockReputationCost: 1
+  uiPosition: 0
   icon:
     sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
     state: victoria_garden
@@ -13,8 +12,7 @@
 - type: cp14TradingPosition
   id: CP14TradeContractBradPotions
   faction: ContractGuild
-  uiPosition: 0, 1
-  unlockReputationCost: 1
+  uiPosition: 1
   icon:
     sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
     state: brad_potions
@@ -22,3 +20,35 @@
     product: CP14TradeContractBradPotions
     count: 1
 
+- type: cp14TradingPosition
+  id: CP14TradeContractDwarfMining
+  faction: ContractGuild
+  uiPosition: 2
+  icon:
+    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
+    state: dwarf_mining
+  service: !type:CP14BuyItemsService
+    product: CP14TradeContractDwarfMining
+    count: 1
+
+- type: cp14TradingPosition
+  id: CP14TradeContractThaumaturgy
+  faction: ContractGuild
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
+    state: magic
+  service: !type:CP14BuyItemsService
+    product: CP14TradeContractThaumaturgy
+    count: 1
+
+- type: cp14TradingPosition
+  id: CP14TradeContractHomeDecor
+  faction: ContractGuild
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
+    state: house
+  service: !type:CP14BuyItemsService
+    product: CP14TradeContractHomeDecor
+    count: 1
diff --git a/Resources/Prototypes/_CP14/Trading/cozy_house.yml b/Resources/Prototypes/_CP14/Trading/cozy_house.yml
new file mode 100644
index 0000000000..a1bf3d4f8a
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Trading/cozy_house.yml
@@ -0,0 +1,287 @@
+
+# Rep 0
+
+- type: cp14TradingPosition
+  id: CP14Candle
+  faction: HomeDecor
+  uiPosition: 0
+  icon:
+    sprite: Objects/Misc/candles.rsi
+    state: candle-big
+  service: !type:CP14BuyItemsService
+    product: CP14Candle
+
+- type: cp14TradingPosition
+  id: CP14Bell
+  faction: HomeDecor
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Misc/bell.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14Bell
+
+- type: cp14TradingPosition
+  id: CP14KeyCopperBlank
+  faction: HomeDecor
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: key_copper
+  service: !type:CP14BuyItemsService
+    product: CP14KeyCopperBlank
+
+- type: cp14TradingPosition
+  id: CP14LockCopper
+  faction: HomeDecor
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: lock_copper
+  service: !type:CP14BuyItemsService
+    product: CP14LockCopper
+
+
+
+- type: cp14TradingPosition
+  id: CP14WallpaperBlack
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: black
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperBlack
+
+- type: cp14TradingPosition
+  id: CP14WallpaperGreen
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: green
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperGreen
+
+- type: cp14TradingPosition
+  id: CP14WallpaperPurple
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: purple
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperPurple
+
+- type: cp14TradingPosition
+  id: CP14WallpaperRed
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: red
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperRed
+
+- type: cp14TradingPosition
+  id: CP14WallpaperWhite
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 10
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: white
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperWhite
+
+- type: cp14TradingPosition
+  id: CP14WallpaperWhite2
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 11
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: white2
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperWhite2
+
+- type: cp14TradingPosition
+  id: CP14WallpaperYellow
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 12
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: yellow
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperYellow
+
+- type: cp14TradingPosition
+  id: CP14PottedPlant1
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Structures/Furniture/flowerpots.rsi
+    state: plant1
+  service: !type:CP14BuyItemsService
+    product: CP14PottedPlant1
+
+- type: cp14TradingPosition
+  id: CP14PottedPlant3
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 15
+  icon:
+    sprite: _CP14/Structures/Furniture/flowerpots.rsi
+    state: plant3
+  service: !type:CP14BuyItemsService
+    product: CP14PottedPlant3
+
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14CandleRed
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: Objects/Misc/candles.rsi
+    state: candle-big
+  service: !type:CP14BuyItemsService
+    product: CP14CandleRed
+
+- type: cp14TradingPosition
+  id: CP14CandleBlack
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 1
+  icon:
+    sprite: Objects/Misc/candles.rsi
+    state: candle-big
+  service: !type:CP14BuyItemsService
+    product: CP14CandleBlack
+
+- type: cp14TradingPosition
+  id: CP14KeyIronBlank
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: key_iron
+  service: !type:CP14BuyItemsService
+    product: CP14KeyIronBlank
+
+- type: cp14TradingPosition
+  id: CP14LockIron
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: lock_iron
+  service: !type:CP14BuyItemsService
+    product: CP14LockIron
+
+
+
+- type: cp14TradingPosition
+  id: CP14WallpaperBank
+  faction: HomeDecor
+  priceMarkup: 5
+  reputationLevel: 1
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: bank
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperBank
+
+- type: cp14TradingPosition
+  id: CP14WallpaperBank2
+  faction: HomeDecor
+  priceMarkup: 5
+  reputationLevel: 1
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: bank2
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperBank2
+
+
+
+- type: cp14TradingPosition
+  id: CP14PottedPlant2
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Structures/Furniture/flowerpots.rsi
+    state: plant2
+  service: !type:CP14BuyItemsService
+    product: CP14PottedPlant2
+
+- type: cp14TradingPosition
+  id: CP14PottedPlant4
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 15
+  icon:
+    sprite: _CP14/Structures/Furniture/flowerpots.rsi
+    state: plant4
+  service: !type:CP14BuyItemsService
+    product: CP14PottedPlant4
+
+# Rep 2
+
+- type: cp14TradingPosition
+  id: CP14KeyGoldBlank
+  faction: HomeDecor
+  reputationLevel: 2
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: key_gold
+  service: !type:CP14BuyItemsService
+    product: CP14KeyGoldBlank
+
+- type: cp14TradingPosition
+  id: CP14LockGold
+  faction: HomeDecor
+  reputationLevel: 2
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: lock_gold
+  service: !type:CP14BuyItemsService
+    product: CP14LockGold
+
+# Rep 3
+
+- type: cp14TradingPosition
+  id: CP14KeyMithrilBlank
+  faction: HomeDecor
+  reputationLevel: 3
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: key_mithril
+  service: !type:CP14BuyItemsService
+    product: CP14KeyMithrilBlank
+
+- type: cp14TradingPosition
+  id: CP14LockMithril
+  faction: HomeDecor
+  reputationLevel: 3
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: lock_mithril
+  service: !type:CP14BuyItemsService
+    product: CP14LockMithril
diff --git a/Resources/Prototypes/_CP14/Trading/dwarf_mining.yml b/Resources/Prototypes/_CP14/Trading/dwarf_mining.yml
new file mode 100644
index 0000000000..ff863cea0d
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Trading/dwarf_mining.yml
@@ -0,0 +1,138 @@
+
+# Rep 0
+
+- type: cp14TradingPosition
+  id: CP14OreCopper5
+  faction: DwarfMining
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Materials/copper_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreCopper5
+
+- type: cp14TradingPosition
+  id: CP14CopperBar5
+  faction: DwarfMining
+  priceMarkup: 5
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Materials/copper_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14CopperBar5
+
+- type: cp14TradingPosition
+  id: CP14GlassSheet5
+  faction: DwarfMining
+  uiPosition: 5
+  icon:
+    sprite: _CP14/Objects/Materials/glass.rsi
+    state: glass_2
+  service: !type:CP14BuyItemsService
+    product: CP14GlassSheet5
+
+- type: cp14TradingPosition
+  id: CP14Torch
+  faction: DwarfMining
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Objects/Tools/torch.rsi
+    state: torch-unlit
+  service: !type:CP14BuyItemsService
+    product: CP14Torch
+
+- type: cp14TradingPosition
+  id: CP14ModularIronPickaxe
+  faction: DwarfMining
+  priceMarkup: 15
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+    state: tool
+  service: !type:CP14BuyItemsService
+    product: CP14ModularIronPickaxe
+
+- type: cp14TradingPosition
+  id: CP14ModularIronShovel
+  faction: DwarfMining
+  priceMarkup: 10
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+    state: tool
+  service: !type:CP14BuyItemsService
+    product: CP14ModularIronShovel
+
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14OreIron5
+  faction: DwarfMining
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Materials/iron_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreIron5
+
+- type: cp14TradingPosition
+  id: CP14IronBar5
+  faction: DwarfMining
+  reputationLevel: 1
+  priceMarkup: 5
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Materials/iron_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14IronBar5
+
+# Rep 2
+
+- type: cp14TradingPosition
+  id: CP14OreGold5
+  faction: DwarfMining
+  reputationLevel: 2
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Materials/gold_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreGold5
+
+- type: cp14TradingPosition
+  id: CP14OreMithril5
+  faction: DwarfMining
+  reputationLevel: 2
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Materials/mithril_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreMithril5
+
+- type: cp14TradingPosition
+  id: CP14GoldBar5
+  faction: DwarfMining
+  reputationLevel: 2
+  priceMarkup: 5
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Materials/gold_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14GoldBar5
+
+- type: cp14TradingPosition
+  id: CP14MithrilBar5
+  faction: DwarfMining
+  reputationLevel: 2
+  priceMarkup: 5
+  uiPosition: 5
+  icon:
+    sprite: _CP14/Objects/Materials/mithril_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14MithrilBar5
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Trading/factions.yml b/Resources/Prototypes/_CP14/Trading/factions.yml
index 2d3b916b70..17d5141cf3 100644
--- a/Resources/Prototypes/_CP14/Trading/factions.yml
+++ b/Resources/Prototypes/_CP14/Trading/factions.yml
@@ -5,9 +5,25 @@
 
 - type: cp14TradingFaction
   id: VictoriaGardens
+  color: "#67db67"
   name: cp14-trade-faction-victoria-gardens
 
 - type: cp14TradingFaction
   id: BradPotions
+  color: "#ad67db"
   name: cp14-trade-faction-brad-potions
 
+- type: cp14TradingFaction
+  id: DwarfMining
+  color: "#b05a3e"
+  name: cp14-trade-faction-dwarf-mining
+
+- type: cp14TradingFaction
+  id: Thaumaturgy
+  color: "#a43ae0"
+  name: cp14-trade-faction-thaumaturgy
+
+- type: cp14TradingFaction
+  id: HomeDecor
+  color: "#95f542"
+  name: cp14-trade-faction-home-decor
diff --git a/Resources/Prototypes/_CP14/Trading/thaumaturgy.yml b/Resources/Prototypes/_CP14/Trading/thaumaturgy.yml
new file mode 100644
index 0000000000..e3a55570c2
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Trading/thaumaturgy.yml
@@ -0,0 +1,258 @@
+
+# Rep 0
+
+- type: cp14TradingPosition
+  id: CP14EnergyCrystalMediumEmpty
+  faction: Thaumaturgy
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Thaumaturgy/crystal.rsi
+    state: medium
+  service: !type:CP14BuyItemsService
+    product: CP14EnergyCrystalMediumEmpty
+
+- type: cp14TradingPosition
+  id: CP14Paper
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 2
+  icon:
+    sprite: _CP14/Objects/Bureaucracy/paper.rsi
+    state: paper
+  service: !type:CP14BuyItemsService
+    product: CP14Paper
+
+- type: cp14TradingPosition
+  id: CP14PenFeather
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Bureaucracy/pens.rsi
+    state: feather
+  service: !type:CP14BuyItemsService
+    product: CP14PenFeather
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollShadowGrab
+  faction: Thaumaturgy
+  priceMarkup: 5
+  reputationLevel: 0
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Actions/Spells/dimension.rsi
+    state: shadow_grab
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollShadowGrab
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollFlameCreation
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: flame_creation
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollFlameCreation
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollBloodPurification
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_poison
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollBloodPurification
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollSheepPolymorph
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 10
+  icon:
+    sprite: _CP14/Actions/Spells/misc.rsi
+    state: polymorph
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollSheepPolymorph
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollSearchOfLife
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 11
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: search_of_life
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollSearchOfLife
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollSphereOfLight
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 12
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: sphere_of_light
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollSphereOfLight
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollWaterCreation
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: water_creation
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollWaterCreation
+
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14ManaOperationGlove
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Thaumaturgy/powerline_gauntlet.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14ManaOperationGlove
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollDemiplaneInfiltration
+  priceMarkup: 5 #Unique trade spells
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Actions/Spells/dimension.rsi
+    state: rift_arrow
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollDemiplaneInfiltration
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollEarthWall
+  faction: Thaumaturgy
+  priceMarkup: 2
+  reputationLevel: 1
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Actions/Spells/earth.rsi
+    state: earth_wall
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollEarthWall
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollCureBurn
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_burn
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollCureBurn
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollCureWounds
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 10
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_wounds
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollCureWounds
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollFlashLight
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 11
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: flash_light
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollFlashLight
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollMagicSplitting
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 13
+  icon:
+    sprite: _CP14/Actions/Spells/meta.rsi
+    state: counter_spell
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollMagicSplitting
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollIceShards
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: ice_shards
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollIceShards
+
+# Rep 2
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollFireball
+  faction: Thaumaturgy
+  reputationLevel: 2
+  priceMarkup: 5
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: fireball
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollFireball
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollBeerCreation
+  faction: Thaumaturgy
+  priceMarkup: 5
+  reputationLevel: 2
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: beer_creation
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollBeerCreation
+
+# Rep 3
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollResurrection
+  faction: Thaumaturgy
+  reputationLevel: 3
+  priceMarkup: 5
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Actions/Spells/necromancy.rsi
+    state: resurrection
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollResurrection
+
+# Rep 4
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollShadowStep
+  priceMarkup: 15 #Unique trade spells
+  faction: Thaumaturgy
+  reputationLevel: 4
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Actions/Spells/dimension.rsi
+    state: shadow_step
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollShadowStep
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Trading/victoria_gardens.yml b/Resources/Prototypes/_CP14/Trading/victoria_gardens.yml
index d9a512d115..5bec1f8210 100644
--- a/Resources/Prototypes/_CP14/Trading/victoria_gardens.yml
+++ b/Resources/Prototypes/_CP14/Trading/victoria_gardens.yml
@@ -1,7 +1,9 @@
+# Rep 0
+
 - type: cp14TradingPosition
   id: CP14FoodCabbage
   faction: VictoriaGardens
-  uiPosition: 0, 0
+  uiPosition: 0
   icon:
     sprite: _CP14/Objects/Flora/Farm/cabbage.rsi
     state: base1
@@ -9,21 +11,10 @@
     product: CP14FoodCabbage
     count: 3
 
-- type: cp14TradingPosition
-  id: CP14FoodPumpkin
-  faction: VictoriaGardens
-  uiPosition: 0, 1
-  icon:
-    sprite: _CP14/Objects/Flora/Farm/pumpkin.rsi
-    state: base1
-  service: !type:CP14BuyItemsService
-    product: CP14FoodPumpkin
-    count: 3
-
 - type: cp14TradingPosition
   id: CP14FoodPotato
   faction: VictoriaGardens
-  uiPosition: 0, 2
+  uiPosition: 1
   icon:
     sprite: _CP14/Objects/Flora/Farm/potato.rsi
     state: base1
@@ -34,7 +25,7 @@
 - type: cp14TradingPosition
   id: CP14FoodCucumber
   faction: VictoriaGardens
-  uiPosition: 0, 3
+  uiPosition: 2
   icon:
     sprite: _CP14/Objects/Flora/Farm/cucumber.rsi
     state: base1
@@ -45,7 +36,7 @@
 - type: cp14TradingPosition
   id: CP14FoodTomatoes
   faction: VictoriaGardens
-  uiPosition: 1, 0
+  uiPosition: 3
   icon:
     sprite: _CP14/Objects/Flora/Farm/tomatoes.rsi
     state: base1
@@ -53,21 +44,10 @@
     product: CP14FoodTomatoes
     count: 3
 
-- type: cp14TradingPosition
-  id: CP14FoodApple
-  faction: VictoriaGardens
-  uiPosition: 1, 1
-  icon:
-    sprite: _CP14/Objects/Flora/Farm/apple.rsi
-    state: base1
-  service: !type:CP14BuyItemsService
-    product: CP14FoodApple
-    count: 3
-
 - type: cp14TradingPosition
   id: CP14FoodPepper
   faction: VictoriaGardens
-  uiPosition: 1, 2
+  uiPosition: 4
   icon:
     sprite: _CP14/Objects/Flora/Farm/pepper.rsi
     state: base1
@@ -78,7 +58,7 @@
 - type: cp14TradingPosition
   id: CP14FoodOnion
   faction: VictoriaGardens
-  uiPosition: 1, 3
+  uiPosition: 5
   icon:
     sprite: _CP14/Objects/Flora/Farm/onion.rsi
     state: base1
@@ -86,3 +66,28 @@
     product: CP14FoodOnion
     count: 3
 
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14FoodApple
+  faction: VictoriaGardens
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Flora/Farm/apple.rsi
+    state: base1
+  service: !type:CP14BuyItemsService
+    product: CP14FoodApple
+    count: 3
+
+- type: cp14TradingPosition
+  id: CP14FoodPumpkin
+  faction: VictoriaGardens
+  reputationLevel: 1
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Flora/Farm/pumpkin.rsi
+    state: base1
+  service: !type:CP14BuyItemsService
+    product: CP14FoodPumpkin
+    count: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml b/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml
index cc2400929b..0673a93b39 100644
--- a/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml
+++ b/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml
@@ -49,3 +49,8 @@
   tags:
   - CP14UniqueSpawnDemiplanetLoot
 
+- type: uniqueSpawn
+  id: CP14LockpickSkeletonArtifact
+  entity: CP14LockpickSkeletonArtifact
+  tags:
+  - CP14UniqueSpawnDemiplanetLoot
diff --git a/Resources/Textures/_CP14/Actions/Spells/slime.rsi/jump.png b/Resources/Textures/_CP14/Actions/Spells/slime.rsi/jump.png
new file mode 100644
index 0000000000..664e7e3dec
Binary files /dev/null and b/Resources/Textures/_CP14/Actions/Spells/slime.rsi/jump.png differ
diff --git a/Resources/Textures/_CP14/Actions/Spells/slime.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/slime.rsi/meta.json
new file mode 100644
index 0000000000..2f88275c41
--- /dev/null
+++ b/Resources/Textures/_CP14/Actions/Spells/slime.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Created by omsoyk (Discord) & paige404 (GitHub)",
+  "states": [
+    {
+      "name": "jump"
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/meta.json
index 6a97a4146c..18f8c847b4 100644
--- a/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/meta.json
+++ b/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/meta.json
@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json
index 6619325526..2e5060139c 100644
--- a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json
+++ b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json
@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-left.png
new file mode 100644
index 0000000000..c0d6809572
Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-right.png
new file mode 100644
index 0000000000..41ec821b49
Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json
index 91784c23bb..e10b801c52 100644
--- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json
+++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json
@@ -13,6 +13,14 @@
         {
             "name": "equipped-CLOAK",
             "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/en_close_sign.png b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/en_close_sign.png
new file mode 100644
index 0000000000..fcbbf7d1b2
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/en_close_sign.png differ
diff --git a/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/en_open_sign.png b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/en_open_sign.png
new file mode 100644
index 0000000000..39616860c0
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/en_open_sign.png differ
diff --git a/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/meta.json b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/meta.json
new file mode 100644
index 0000000000..085724b721
--- /dev/null
+++ b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "copyright": "Created by deenke",
+    "license": "CC-BY-SA-4.0",
+    "states": [
+        {
+            "name": "table_sign"
+        },
+	{
+            "name": "ru_open_sign"
+        },
+	{
+            "name": "en_open_sign"
+        },
+	{
+            "name": "ru_close_sign"
+        },
+	{
+            "name": "en_close_sign"
+        }
+    ]
+}
diff --git a/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/ru_close_sign.png b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/ru_close_sign.png
new file mode 100644
index 0000000000..758c40dfd4
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/ru_close_sign.png differ
diff --git a/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/ru_open_sign.png b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/ru_open_sign.png
new file mode 100644
index 0000000000..7889497b5a
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/ru_open_sign.png differ
diff --git a/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/table_sign.png b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/table_sign.png
new file mode 100644
index 0000000000..8f2be392c4
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/openclosed_sign.rsi/table_sign.png differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/meta.json
index 2a39519ae5..93aff700bd 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json
index 2a39519ae5..93aff700bd 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json
index bf596b0ec3..52baa4ce56 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json
index 2a39519ae5..93aff700bd 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json
index 2a39519ae5..93aff700bd 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json
index 2a39519ae5..52baa4ce56 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
@@ -22,6 +22,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "tool"
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/tool.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/tool.png
new file mode 100644
index 0000000000..bf76eeb893
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/tool.png differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json
index 0103caf9e3..55c514f983 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json
index bf596b0ec3..52baa4ce56 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json
index 2a39519ae5..93aff700bd 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json
index 8a6dedae1a..56da788355 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by iwordoloni (Discord) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json
index 2a39519ae5..93aff700bd 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json
index 2239e3ce26..a85319c765 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json
index 0103caf9e3..55c514f983 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json
index be51eceff7..80763a737c 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json
@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/meta.json
index 2a39519ae5..93aff700bd 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/meta.json
index 2a39519ae5..93aff700bd 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json
index 0d7bf1d8d4..2b67e71db0 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json
@@ -19,7 +19,7 @@
       "directions": 4
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/meta.json
index 863d13c314..84f19afffb 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/meta.json
@@ -19,7 +19,7 @@
       "directions": 4
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json
index 863d13c314..84f19afffb 100644
--- a/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json
@@ -19,7 +19,7 @@
       "directions": 4
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/dwarf_mining.png b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/dwarf_mining.png
new file mode 100644
index 0000000000..46e9d741ff
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/dwarf_mining.png differ
diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/house.png b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/house.png
new file mode 100644
index 0000000000..21989b7938
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/house.png differ
diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/magic.png b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/magic.png
new file mode 100644
index 0000000000..96a754388b
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/magic.png differ
diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json
index 12f2d5a4b7..52f084133e 100644
--- a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json
@@ -15,6 +15,15 @@
     },
     {
       "name": "brad_potions"
+    },
+    {
+      "name": "dwarf_mining"
+    },
+    {
+      "name": "magic"
+    },
+    {
+      "name": "house"
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium.png b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium.png
index 94e26d9d33..b6f34faa83 100644
Binary files a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium.png and b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium.png differ
diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium_connector.png b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium_connector.png
deleted file mode 100644
index 179cea0e25..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium_connector.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/meta.json
index 265b8b03ba..7772c8e888 100644
--- a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/meta.json
@@ -9,9 +9,6 @@
   "states": [
     {
       "name": "medium"
-    },
-    {
-      "name": "medium_connector"
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/light_equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/light_equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/light_equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/light_equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/meta.json
index b075d72d4c..1026a90f27 100644
--- a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/meta.json
@@ -19,7 +19,7 @@
       "directions": 4
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
@@ -38,7 +38,7 @@
       "directions": 4
     },
     {
-      "name": "light_equipped-BELT1",
+      "name": "light_equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/meta.json
index e5f88b24fb..5db2da0ce0 100644
--- a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/meta.json
@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json
index 5d324b239e..d1dc463ccb 100644
--- a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json
@@ -20,7 +20,7 @@
       "name": "wielded-arrow"
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/lockpick_skeleton.png b/Resources/Textures/_CP14/Objects/keys.rsi/lockpick_skeleton.png
new file mode 100644
index 0000000000..43cf712608
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/keys.rsi/lockpick_skeleton.png differ
diff --git a/Resources/Textures/_CP14/Objects/keys.rsi/meta.json b/Resources/Textures/_CP14/Objects/keys.rsi/meta.json
index 46c8461f54..54a5324dea 100644
--- a/Resources/Textures/_CP14/Objects/keys.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/keys.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-4.0",
-  "copyright": "Created by TheShuEd (Github) ",
+  "copyright": "Created by TheShuEd (Github), lockpick_skeleton by Vojner (discord)",
   "states": [
     {
       "name": "file"
@@ -40,6 +40,9 @@
     {
       "name": "lockpick_mithril"
     },
+    {
+      "name": "lockpick_skeleton"
+    },
     {
       "name": "keyring"
     },
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_0.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_0.png
index b129e31693..46ba9efdc6 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_0.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_0.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_1.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_1.png
index eac3d45c2f..2f463ae68b 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_1.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_1.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_2.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_2.png
index 6eeaa38251..46ba9efdc6 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_2.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_2.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_3.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_3.png
index 3b31acd998..b066109da6 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_3.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_4.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_4.png
index c8bb950a08..ec54bb28bc 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_4.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_4.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_5.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_5.png
index 9d1dae5142..609e8bd1cc 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_5.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_6.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_6.png
index 16d6184a51..55a8eb3401 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_6.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_6.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_7.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_7.png
index c267ba05d8..175a9d2502 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_7.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_7.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/full.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/full.png
index 58d76d599a..e80f1ee255 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/full.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/full.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/meta.json
index 6da0175d0e..31fb4ce5b5 100644
--- a/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by TheShuEd (github)",
+  "copyright": "Created by vladimir.s",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_0.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_0.png
new file mode 100644
index 0000000000..a062403d68
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_0.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_1.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_1.png
new file mode 100644
index 0000000000..957d61260e
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_1.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_2.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_2.png
new file mode 100644
index 0000000000..a062403d68
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_2.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_3.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_3.png
new file mode 100644
index 0000000000..8369379d08
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_4.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_4.png
new file mode 100644
index 0000000000..883b3cf70b
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_4.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_5.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_5.png
new file mode 100644
index 0000000000..1de5bd7e6a
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_6.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_6.png
new file mode 100644
index 0000000000..7396046291
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_6.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_7.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_7.png
new file mode 100644
index 0000000000..1deef2f169
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_7.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/full.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/full.png
new file mode 100644
index 0000000000..64a3fa7e29
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/full.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/meta.json
new file mode 100644
index 0000000000..80e281c5a5
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Furniture/Carpets/cyan_carpet.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by vladimir.s & recolor by omsoyk",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "carpet_0",
+      "directions": 4
+    },
+    {
+      "name": "carpet_1",
+      "directions": 4
+    },
+    {
+      "name": "carpet_2",
+      "directions": 4
+    },
+    {
+      "name": "carpet_3",
+      "directions": 4
+    },
+    {
+      "name": "carpet_4",
+      "directions": 4
+    },
+    {
+      "name": "carpet_5",
+      "directions": 4
+    },
+    {
+      "name": "carpet_6",
+      "directions": 4
+    },
+    {
+      "name": "carpet_7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_0.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_0.png
new file mode 100644
index 0000000000..f605184319
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_0.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_1.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_1.png
new file mode 100644
index 0000000000..cf357e758a
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_1.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_2.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_2.png
new file mode 100644
index 0000000000..f605184319
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_2.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_3.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_3.png
new file mode 100644
index 0000000000..0708613310
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_4.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_4.png
new file mode 100644
index 0000000000..9ae210f994
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_4.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_5.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_5.png
new file mode 100644
index 0000000000..d1beeb5310
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_6.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_6.png
new file mode 100644
index 0000000000..50afbfb90d
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_6.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_7.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_7.png
new file mode 100644
index 0000000000..e92c09ef22
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/carpet_7.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/full.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/full.png
new file mode 100644
index 0000000000..a80463d512
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/full.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/meta.json
new file mode 100644
index 0000000000..80e281c5a5
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Furniture/Carpets/green_carpet.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by vladimir.s & recolor by omsoyk",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "carpet_0",
+      "directions": 4
+    },
+    {
+      "name": "carpet_1",
+      "directions": 4
+    },
+    {
+      "name": "carpet_2",
+      "directions": 4
+    },
+    {
+      "name": "carpet_3",
+      "directions": 4
+    },
+    {
+      "name": "carpet_4",
+      "directions": 4
+    },
+    {
+      "name": "carpet_5",
+      "directions": 4
+    },
+    {
+      "name": "carpet_6",
+      "directions": 4
+    },
+    {
+      "name": "carpet_7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_0.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_0.png
new file mode 100644
index 0000000000..d96cf11939
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_0.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_1.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_1.png
new file mode 100644
index 0000000000..7317142b57
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_1.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_2.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_2.png
new file mode 100644
index 0000000000..d96cf11939
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_2.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_3.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_3.png
new file mode 100644
index 0000000000..37f3737b33
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_4.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_4.png
new file mode 100644
index 0000000000..5a4f59755b
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_4.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_5.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_5.png
new file mode 100644
index 0000000000..16f919c5d9
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_6.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_6.png
new file mode 100644
index 0000000000..4350b12e70
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_6.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_7.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_7.png
new file mode 100644
index 0000000000..ac53739f18
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_7.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/full.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/full.png
new file mode 100644
index 0000000000..03cd378c88
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/full.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/meta.json
new file mode 100644
index 0000000000..80e281c5a5
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Furniture/Carpets/orange_carpet.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by vladimir.s & recolor by omsoyk",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "carpet_0",
+      "directions": 4
+    },
+    {
+      "name": "carpet_1",
+      "directions": 4
+    },
+    {
+      "name": "carpet_2",
+      "directions": 4
+    },
+    {
+      "name": "carpet_3",
+      "directions": 4
+    },
+    {
+      "name": "carpet_4",
+      "directions": 4
+    },
+    {
+      "name": "carpet_5",
+      "directions": 4
+    },
+    {
+      "name": "carpet_6",
+      "directions": 4
+    },
+    {
+      "name": "carpet_7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_0.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_0.png
new file mode 100644
index 0000000000..1c0520087c
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_0.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_1.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_1.png
new file mode 100644
index 0000000000..e547374a4a
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_1.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_2.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_2.png
new file mode 100644
index 0000000000..1c0520087c
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_2.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_3.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_3.png
new file mode 100644
index 0000000000..eab715a528
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_4.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_4.png
new file mode 100644
index 0000000000..0b943e4d99
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_4.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_5.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_5.png
new file mode 100644
index 0000000000..70f3fb2d55
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_6.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_6.png
new file mode 100644
index 0000000000..01086e0724
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_6.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_7.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_7.png
new file mode 100644
index 0000000000..8d2a4e11d0
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/carpet_7.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/full.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/full.png
new file mode 100644
index 0000000000..21a6cfb565
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/full.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/meta.json
new file mode 100644
index 0000000000..80e281c5a5
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Furniture/Carpets/pink_carpet.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by vladimir.s & recolor by omsoyk",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "carpet_0",
+      "directions": 4
+    },
+    {
+      "name": "carpet_1",
+      "directions": 4
+    },
+    {
+      "name": "carpet_2",
+      "directions": 4
+    },
+    {
+      "name": "carpet_3",
+      "directions": 4
+    },
+    {
+      "name": "carpet_4",
+      "directions": 4
+    },
+    {
+      "name": "carpet_5",
+      "directions": 4
+    },
+    {
+      "name": "carpet_6",
+      "directions": 4
+    },
+    {
+      "name": "carpet_7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_0.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_0.png
index 5a7c0b686a..67103f715e 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_0.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_0.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_1.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_1.png
index 66a92b847a..08fa11ffb4 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_1.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_1.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_2.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_2.png
index b36a2646bd..67103f715e 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_2.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_2.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_3.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_3.png
index 60e1e50b85..42b4d58761 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_3.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_4.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_4.png
index fb6ed0774d..d5464d3233 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_4.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_4.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_5.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_5.png
index b16f6f3d66..6b4ae3890e 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_5.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_6.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_6.png
index 10547d5189..a6e98c4ef7 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_6.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_6.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_7.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_7.png
index abe95a8ff9..557ec2c7f0 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_7.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_7.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/full.png b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/full.png
index 0e1310caf1..cf437fc44e 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/full.png and b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/full.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/meta.json
index 6da0175d0e..80e281c5a5 100644
--- a/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by TheShuEd (github)",
+  "copyright": "Created by vladimir.s & recolor by omsoyk",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/base.png b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/base.png
index 9c791ce98e..98200b521e 100644
Binary files a/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/base.png and b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/base.png differ
diff --git a/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/meta.json
index d985b0816d..549c953753 100644
--- a/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-4.0",
-  "copyright": "Created by TheShuEd ",
+  "copyright": "Created by TheShuEd, base by resprite Jaraten",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/broken.png b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/broken.png
new file mode 100644
index 0000000000..d3af58cec8
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/broken.png differ
diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/grovelling.png b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/grovelling.png
new file mode 100644
index 0000000000..367648bce5
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/grovelling.png differ
diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png
index 23f5d0bbb7..0493ef1827 100644
Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png and b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png differ
diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json
index 45007d99a5..5c171bd5e5 100644
--- a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "Created by omsoyk",
+    "copyright": "Created by omsoyk and gogenych",
     "size": {
         "x": 64,
         "y": 64
@@ -9,6 +9,12 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "grovelling"
+        },
+        {
+            "name": "broken"
         }
     ]
 }
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 1e2eec7302..7087224474 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -90,6 +90,13 @@ binds:
 - function: CP14OpenSkillMenu
   type: State
   key: R
+- function: OpenBelt2
+  type: State
+  key: F
+- function: SmartEquipBelt2
+  type: State
+  key: F
+  mod1: Shift
 # CP14 Zone end
 - function: ShowEscapeMenu
   type: State
diff --git a/Tools/actions_changelogs_since_last_run.py b/Tools/actions_changelogs_since_last_run.py
index 8df972d258..46c923baf1 100755
--- a/Tools/actions_changelogs_since_last_run.py
+++ b/Tools/actions_changelogs_since_last_run.py
@@ -23,7 +23,7 @@ GITHUB_API_URL = os.environ.get("GITHUB_API_URL", "https://api.github.com")
 DISCORD_SPLIT_LIMIT = 2000
 DISCORD_WEBHOOK_URL = os.environ.get("DISCORD_WEBHOOK_URL")
 
-CHANGELOG_FILE = "Resources/Changelog/Changelog.yml"
+CHANGELOG_FILE = "Resources/Changelog/CP14_Changelog.yml"
 
 TYPES_TO_EMOJI = {"Fix": "🐛", "Add": "🆕", "Remove": "❌", "Tweak": "⚒️"}
 
@@ -173,7 +173,7 @@ def changelog_entries_to_message_lines(entries: Iterable[ChangelogEntry]) -> lis
     message_lines = []
 
     for contributor_name, group in itertools.groupby(entries, lambda x: x["author"]):
-        message_lines.append(f"**{contributor_name}** updated:\n")
+        message_lines.append(f"`{contributor_name}` updated:\n")
 
         for entry in group:
             url = entry.get("url")