Merge remote-tracking branch 'upstream/master' into ed-2025-02-03-upstream-stable

# Conflicts:
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs

.github/FUNDING.yml

@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+custom: ['https://boosty.to/theshued']

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,36 +1,17 @@
-<!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline -->
-
 ## About the PR
-<!-- What did you change? -->
+<!-- What did you change in this PR? -->
+<!-- Что вы изменили в своем пулл реквесте? -->
 
 ## Why / Balance
-<!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. -->
-
-## Technical details
-<!-- Summary of code changes for easier review. -->
+<!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. -->
+<!-- Зачем нужно это изменение? Прикрепите любые обсуждения или проблемы здесь. Опишите, как это повлияет на текущий баланс игры. -->
 
 ## Media
-<!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). 
-Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->
-
-## Requirements
-<!-- Confirm the following by placing an X in the brackets [X]: -->
-- [ ] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
-- [ ] I have added media to this PR or it does not require an ingame showcase.
-<!-- You should understand that not following the above may get your PR closed at maintainer’s discretion -->
-
-## Breaking changes
-<!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them.
-This will be posted in #codebase-changes. -->
-
-**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!
+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.
+-->
+<!--
+Пулл реквесты, которые несут за собой игровые изменения (добавления одежды, предметов и так далее) требуют чтобы вы прикрепили скриншоты или видеоролики, демонстрирующие эти изменения.
+Небольшие исправления не считаются.
 -->

.github/rsi-schema.json

@@ -75,15 +75,17 @@
       "license":{
          "$id":"#/properties/license",
          "default":"",
-         "description":"The license for the associated icon states. Restricted to SS14-compatible asset licenses.",
+         "description":"The license for the associated icon states. Restricted to CP14-compatible asset licenses.",
          "enum":[
             "CC-BY-SA-3.0",
             "CC-BY-SA-4.0",
+            "CC0-1.0",
             "CC-BY-NC-3.0",
             "CC-BY-NC-4.0",
             "CC-BY-NC-SA-3.0",
             "CC-BY-NC-SA-4.0",
-            "CC0-1.0"
+            "CC0-1.0",
+            "CLA"
          ],
          "examples":[
             "CC-BY-SA-3.0"

.github/workflows/CP14Publish.yml

@@ -0,0 +1,20 @@
+name: Publish
+
+concurrency:
+  group: publish
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Send POST-request
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.BUILD_HOST }}
+        username: ${{ secrets.BUILD_USER }}
+        password: ${{ secrets.BUILD_PASS }}
+        port: 22
+        script: sh update.sh &> /dev/null

.github/workflows/cla.yml

@@ -0,0 +1,38 @@
+name: "CLA Assistant"
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened,closed,synchronize]
+    paths:
+      - '**CP14**'
+
+# explicitly configure permissions, in case your GITHUB_TOKEN workflow permissions are set to read-only in repository settings
+permissions:
+  actions: write
+  contents: write # this can be 'read' if the signatures are in remote repository
+  pull-requests: write
+  statuses: write
+
+jobs:
+  CLAAssistant:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "CLA Assistant"
+        if: ((github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target') && github.actor != 'TheShuEd'
+        uses: contributor-assistant/github-action@v2.6.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # the below token should have repo scope and must be manually added by you in the repository's secret
+          # This token is required only if you have configured to store the signatures in a remote repository/organization
+          # PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+        with:
+          path-to-signatures: 'signatures/version1/cla.json'
+          path-to-document: 'https://github.com/crystallpunk-14/crystall-punk-14/blob/master/CLA.md' # e.g. a CLA or a DCO document
+          # branch should not be protected
+          branch: 'master'
+          allowlist: TheShuEd,bot*
+
+         # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
+          #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
+          #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'

.github/workflows/validate-rgas.yml

@@ -21,5 +21,5 @@ jobs:
       with:
         schema: RobustToolbox/Schemas/rga.yml
         path_pattern: .*attributions.ya?ml$
-        validators_path: RobustToolbox/Schemas/rga_validators.py
-        validators_requirements: RobustToolbox/Schemas/rga_requirements.txt
+        validators_path: Schemas/rga_validators.py
+        validators_requirements: Schemas/rga_requirements.txt

.github/workflows/validate-rsis.yml

@@ -23,4 +23,4 @@ jobs:
           pip3 install --ignore-installed --user pillow jsonschema
       - name: Validate RSIs
         run: |
-          python3 RobustToolbox/Schemas/validate_rsis.py Resources/
+          python3 Schemas/validate_rsis.py Resources/

.gitignore

@@ -306,3 +306,4 @@ Resources/MapImages
 
 # Direnv stuff
 .direnv/
+/Tools/_CP14/LocalizationHelper/last_launch

CLA.md

@@ -0,0 +1,80 @@
+# CrystallEdge Contributor License Agreement
+### Version 1.0
+##### Thank you for your interest in contributing to CrystallEdge ("We" or "Us").
+
+##### The purpose of this contributor agreement ("Agreement") is for Your protection as a Contributor in addition to the protection of our community.
+
+##### If you wish to contact us regarding licensing matters we can be reached at crystalledge14@gmail.com
+
+## How to use this Contributor Agreement
+
+##### If You are an employee and have created the Contribution as part of your employment, You need to have Your employer approve this Agreement or sign the Entity version of this document as well.
+## 1.  Definitions
+- _**"You"**_ means the individual Copyright owner who Submits a Contribution to Us.
+- _**"Contribution(s)"**_ means any work(s) of authorship, including any original modifications or additions to an existing work of authorships, Submitted by You to Us, where You are the author, holder of copyright, or Licensee under an Approved License specified by Us.
+- _**"Copyright"**_ means all rights protecting works of authorship, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence.
+- **_"Material"_** means the software or documentation made available by Us to third parties. When this Agreement covers more than one software project, the Material means the software or documentation to which the Contributions were Submitted. After You Submit the Contributions, theymay be included in the Material.
+- **_"Submit"_** means any act by which Contributions are transferred to Us by You by means of tangible or intangible media, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us, but excluding any transfer that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+- **_"Documentation"_** means any non-software portion of Contributions.
+- **_"Approved License"_** means any License specified by CrystallEdge to be Approved or “Compatible” with the Project the Contributions are Submitted to.
+## 2.  Representations
+
+### 2.1  Representation of legal age
+
+##### You represent that you are older than 16 years of age, and if required by law, have authorization by a legal guardian to enter this agreement.
+
+### 2.2  Assurance of legal rights
+
+##### You represent and assure that You have sufficient rights to your Contribution and are legally entitled to enter this Agreement and grant the licenses specified below or an Approved license if Your Contribution or portions thereof are provided to You under one of the Approved Licenses.
+
+### 2.3  Third Party Contributions
+
+##### If You act on behalf of Your employer or other third party You represent that You are authorized and have the right to Submit the Contribution on behalf of Your employer or the mentioned third party.
+
+### 2.4 Compliance and Non-infringement
+##### You represent and warrant that each of your Contributions:
+- Is and will remain an original work of authorship;
+- to the best of Your knowledge, does not and will not infringe any third party’s copyright, trademark, patent, or other intellectual property rights;
+- In part or in whole, is licensed under one of the Approved Licenses or is an original work you have the rights to.
+- includes the complete and correct details of any license, third-party license, patent, trademark, necessary attributions or other restriction associated with all or any part of Your Contribution in a conspicuous location;
+- complies and will continue to comply with all applicable laws, including export control laws and regulations;
+
+### 2.5  Mixed license Contributions
+
+##### Subject to the terms and conditions of this agreement, specifically section 2, if there is a conflict between the grants in section 3, 4 and a Contribution under an Approved License, the terms of the Approved License supersede.
+## 2.6 Employee or Representative Submissions
+
+##### If You Submit as a company, You agree that a) Your employees, contractors, and representatives may Submit Contributions on Your behalf; and b) the individual signing this Agreement on Your behalf has the necessary authority including the authority to bind You to the Agreement.
+
+## 3. License grant
+###   3.1  Copyright license to Us
+##### Subject to the terms and conditions of this Agreement, You hereby grant to Us a worldwide, royalty-free, NON-exclusive, perpetual and irrevocable (except as stated in Sections 2.4 and 8.2) license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, under the Copyright covering the Contributions to use the Contributions by all means, including, but not limited to:
+- publish the Contributions,
+- modify the Contributions,
+- prepare derivative works based upon or containing the Contributions and/or to combine the Contributions with other Materials,
+- reproduce the Contributions in original or modified form,
+- distribute, to make the Contributions available to the public, display and publicly perform the Contributions in original or modified form.
+##   3.2  Moral rights
+##### Moral Rights remain unaffected to the extent they are recognized and not waivable by applicable law. Notwithstanding, You may add your name to the attribution mechanism customary used in the Materials you Contribute to, such as the header of the source code files of Your Contributions, and We will respect this attribution when using Your Contributions.
+## 4. Patents
+###   4.1  Patent license
+##### Subject to the terms and conditions of this Agreement You hereby grant to Us and to recipients of Materials distributed by Us a worldwide, royalty-free, non-exclusive, perpetual and irrevocable (except as stated in Section 3.2) patent license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contributions and the Contributions in combination with any Material (and portions of such combination). This license applies to all patents owned or controlled by You, whether already acquired or hereafter acquired, that would be infringed by making, having made, using, selling, offering for sale, importing or otherwise transferring of Your Contribution(s) alone or by combination of Your Contribution(s) with any Material.
+###   4.2  Revocation of patent license
+##### You reserve the right to revoke the patent license stated in section 3.1 if We make any infringement claim that is targeted at your Contribution(s) and not asserted for a Defensive Purpose. An assertion of claims of the Patents shall be considered for a "Defensive Purpose" if the claims are asserted against an entity that has filed, maintained, threatened, or voluntarily participated in a patent infringement lawsuit against Us or any of Our licensees.
+## 5. Disclaimer
+####   CONTRIBUTIONS ARE PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US AND BY US TO YOU. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION AND EXTENT TO THE MINIMUM PERIOD AND EXTENT PERMITTED BY LAW.
+## 6. Consequential damage waiver
+####   TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR WE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
+## 7. Approximation of disclaimer and damage waiver
+####   IF THE DISCLAIMER AND DAMAGE WAIVER MENTIONED IN SECTION 4. AND SECTION 5. CANNOT BE GIVEN LEGAL EFFECT UNDER APPLICABLE LOCAL LAW, REVIEWING COURTS SHALL APPLY LOCAL LAW THAT MOST CLOSELY APPROXIMATES AN ABSOLUTE WAIVER OF ALL CIVIL OR CONTRACTUAL LIABILITY IN CONNECTION WITH THE CONTRIBUTION.
+## 8. Term
+#####   8.1  This Agreement shall come into effect upon Your acceptance of the terms and conditions, either by replying to the CLA Bot or by sending a signed copy to crystalledge14@gmail.com with the subject: "\<your name\>  CLA"
+#####   8.2  In the event of a termination of this Agreement Sections 4, 5, 6, 7 and 8 shall survive such termination and shall remain in full force thereafter. For the avoidance of doubt, Approved (sub)licenses that have already been granted for Contributions at the date of the termination shall remain in full force after the termination of this Agreement.
+## 9. Miscellaneous
+#####   9.1  This Agreement and all disputes, claims, actions, suits or other proceedings arising out of this agreement or relating in any way to it shall be governed by the laws of Russia excluding its private international law provisions.
+#####   9.2  This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.
+#####   9.3  In case of Your death, this agreement shall continue with Your heirs. In case of more than one heir, all heirs must exercise their rights through a commonly authorized person.
+#####   9.4  If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and that is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.
+#####   9.5  You agree to notify Us of any facts or circumstances of which you become aware that would make this Agreement inaccurate in any respect.
+#####   9.6  Any Substantive modifications to this Agreement will result in a new version being created, to continue Contributing you must agree to the latest version of the Agreement, which supersedes any previous versions. 
+#####   9.7  CrystallEdge will provide notification of any new version of this agreement being created, if you do not agree to the new version of the Agreement the previous Agreement remains binding.

Content.Client/Atmos/Components/FireVisualsComponent.cs

@@ -32,7 +32,7 @@ public sealed partial class FireVisualsComponent : Component
     public float MaxLightRadius = 4f;
 
     [DataField("lightColor")]
-    public Color LightColor = Color.Orange;
+    public Color LightColor = Color.FromSrgb( new Color(239, 181, 20)); //CP14 fire color in art style pallette
 
     /// <summary>
     ///     Client side point-light entity. We use this instead of directly adding a light to

Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs

@@ -117,6 +117,7 @@ public sealed partial class ContentAudioSystem
 
     private void OnRoundEndMessage(RoundEndMessageEvent ev)
     {
+        OnRoundEndMessageAmbientLoop(); //CP14
         // If scoreboard shows then just stop the music
         _ambientMusicStream = _audio.Stop(_ambientMusicStream);
         _nextAudio = TimeSpan.FromMinutes(3);

Content.Client/Audio/ContentAudioSystem.CP14AmbientLoop.cs

@@ -0,0 +1,128 @@
+using System.Linq;
+using Content.Client.Gameplay;
+using Content.Shared.Audio;
+using Content.Shared.CCVar;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
+
+namespace Content.Client.Audio;
+
+public sealed partial class ContentAudioSystem
+{
+    private const float AmbientLoopFadeInTime = 1f;
+    private const float AmbientLoopFadeOutTime = 4f;
+
+    private Dictionary<CP14AmbientLoopPrototype, EntityUid> _loopStreams = new();
+
+    private TimeSpan _nextUpdateTime = TimeSpan.Zero;
+    private readonly TimeSpan _updateFrequency = TimeSpan.FromSeconds(1f);
+
+    private void CP14InitializeAmbientLoops()
+    {
+        Subs.CVar(_configManager, CCVars.AmbientMusicVolume, AmbienceCVarChangedAmbientMusic, true);
+    }
+
+    private void AmbienceCVarChangedAmbientMusic(float obj)
+    {
+        _volumeSlider = SharedAudioSystem.GainToVolume(obj);
+
+        foreach (var loop in _loopStreams)
+        {
+            _audio.SetVolume(loop.Value, loop.Key.Sound.Params.Volume + _volumeSlider);
+        }
+    }
+
+   private void OnRoundEndMessageAmbientLoop()
+   {
+       foreach (var loop in _loopStreams)
+       {
+           StopAmbientLoop(loop.Key);
+       }
+   }
+
+   private void CP14UpdateAmbientLoops()
+   {
+       return; //DISABLED UNTIL CLIENT ERROR SPAM FIXED
+
+       if (_timing.CurTime <= _nextUpdateTime)
+           return;
+
+       _nextUpdateTime = _timing.CurTime + _updateFrequency;
+
+
+       if (_state.CurrentState is not GameplayState)
+           return;
+
+       var requiredLoops = GetAmbientLoops();
+
+       foreach (var loop in _loopStreams)
+       {
+           if (!requiredLoops.Contains(loop.Key))  //If ambient is playing and it shouldn't, stop it.
+               StopAmbientLoop(loop.Key);
+       }
+
+       foreach (var loop in requiredLoops)
+       {
+           if (!_loopStreams.ContainsKey(loop)) //If it's not playing, but should, run it
+               StartAmbientLoop(loop);
+       }
+   }
+
+   private void StartAmbientLoop(CP14AmbientLoopPrototype proto)
+   {
+       if (_loopStreams.ContainsKey(proto))
+           return;
+
+       var newLoop = _audio.PlayGlobal(
+           proto.Sound,
+           Filter.Local(),
+           false,
+           AudioParams.Default
+               .WithLoop(true)
+               .WithVolume(proto.Sound.Params.Volume + _volumeSlider)
+               .WithPlayOffset(_random.NextFloat(0f, 100f)));
+
+       if (newLoop is null)
+           return;
+
+       _loopStreams.Add(proto, newLoop.Value.Entity);
+
+       FadeIn(newLoop.Value.Entity, newLoop.Value.Component, AmbientLoopFadeInTime);
+   }
+
+   private void StopAmbientLoop(CP14AmbientLoopPrototype proto)
+   {
+       if (!_loopStreams.TryGetValue(proto, out var audioEntity))
+           return;
+
+       FadeOut(audioEntity, duration: AmbientLoopFadeOutTime);
+       _loopStreams.Remove(proto);
+   }
+
+   /// <summary>
+   /// Checks the player's environment, and returns a list of all ambients that should currently be playing around the player
+   /// </summary>
+   /// <returns></returns>
+   private List<CP14AmbientLoopPrototype> GetAmbientLoops()
+   {
+       List<CP14AmbientLoopPrototype> list = new();
+
+       var player = _player.LocalEntity;
+
+       if (player == null)
+           return list;
+
+       var ambientLoops = _proto.EnumeratePrototypes<CP14AmbientLoopPrototype>().ToList();
+
+       foreach (var loop in ambientLoops)
+       {
+           if (_rules.IsTrue(player.Value, _proto.Index(loop.Rules)))
+           {
+               list.Add(loop);
+           }
+       }
+
+       return list;
+   }
+}

Content.Client/Audio/ContentAudioSystem.cs

@@ -29,13 +29,14 @@ public sealed partial class ContentAudioSystem : SharedContentAudioSystem
     public const float AmbientMusicMultiplier = 3f;
     public const float LobbyMultiplier = 3f;
     public const float InterfaceMultiplier = 2f;
-    
+
     public override void Initialize()
     {
         base.Initialize();
 
         UpdatesOutsidePrediction = true;
         InitializeAmbientMusic();
+        CP14InitializeAmbientLoops(); //CP14 ambient loops
         InitializeLobbyMusic();
         SubscribeNetworkEvent<RoundRestartCleanupEvent>(OnRoundCleanup);
     }
@@ -82,6 +83,7 @@ public sealed partial class ContentAudioSystem : SharedContentAudioSystem
             return;
 
         UpdateAmbientMusic();
+        CP14UpdateAmbientLoops(); //CP14
         UpdateLobbyMusic();
         UpdateFades(frameTime);
     }

Content.Client/Clothing/ClientClothingSystem.cs

@@ -30,7 +30,7 @@ public sealed class ClientClothingSystem : ClothingSystem
     /// For some context, im currently refactoring inventory. Part of that is slots not being indexed by a massive enum anymore, but by strings.
     /// Problem here: Every rsi-state is using the old enum-names in their state. I already used the new inventoryslots ALOT. tldr: its this or another week of renaming files.
     /// </summary>
-    private static readonly Dictionary<string, string> TemporarySlotMap = new()
+    public static readonly Dictionary<string, string> TemporarySlotMap = new() //CP14 Public
     {
         {"head", "HELMET"},
         {"eyes", "EYES"},
@@ -40,13 +40,20 @@ public sealed class ClientClothingSystem : ClothingSystem
         {Jumpsuit, "INNERCLOTHING"},
         {"neck", "NECK"},
         {"back", "BACKPACK"},
-        {"belt", "BELT"},
+        {"belt1", "BELT1"},
+        {"belt2", "BELT2"},
         {"gloves", "HAND"},
         {"shoes", "FEET"},
         {"id", "IDCARD"},
         {"pocket1", "POCKET1"},
         {"pocket2", "POCKET2"},
         {"suitstorage", "SUITSTORAGE"},
+        {"ring1", "RING1"},
+        {"ring2", "RING2"},
+        {"pants", "PANTS"},
+        {"shirt", "SHIRT"},
+        {"cloak", "CLOAK"},
+        {"keys", "KEYS"},
     };
 
     [Dependency] private readonly IResourceCache _cache = default!;

Content.Client/Construction/UI/ConstructionMenuPresenter.cs

@@ -185,6 +185,9 @@ namespace Content.Client.Construction.UI
                 if (recipe.Hide)
                     continue;
 
+                if (!recipe.CrystallPunkAllowed) //CrystallEdge clearing recipes
+                    continue;
+
                 if (_playerManager.LocalSession == null
                 || _playerManager.LocalEntity == null
                 || _whitelistSystem.IsWhitelistFail(recipe.EntityWhitelist, _playerManager.LocalEntity.Value))

Content.Client/Crayon/UI/CrayonBoundUserInterface.cs

@@ -29,7 +29,7 @@ namespace Content.Client.Crayon.UI
 
         private void PopulateCrayons()
         {
-            var crayonDecals = _protoManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("crayon"));
+            var crayonDecals = _protoManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("CP14crayon")); //CP14 crayon
             _menu?.Populate(crayonDecals.ToList());
         }
 

Content.Client/Entry/EntryPoint.cs

@@ -1,3 +1,5 @@
+using Content.Client._CP14.Discord;
+using Content.Client._CP14.JoinQueue;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -12,6 +14,7 @@ using Content.Client.IoC;
 using Content.Client.Launcher;
 using Content.Client.Lobby;
 using Content.Client.MainMenu;
+using Content.Client.Overlays;
 using Content.Client.Parallax.Managers;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Radiation.Overlays;
@@ -22,6 +25,7 @@ using Content.Client.Stylesheets;
 using Content.Client.Viewport;
 using Content.Client.Voting;
 using Content.Shared.Ame.Components;
+using Content.Shared.CCVar;
 using Content.Shared.Gravity;
 using Content.Shared.Localizations;
 using Robust.Client;
@@ -41,6 +45,10 @@ namespace Content.Client.Entry
 {
     public sealed class EntryPoint : GameClient
     {
+        //CP14
+        [Dependency] private readonly DiscordAuthManager _discordAuth = default!;
+        [Dependency] private readonly JoinQueueManager _joinQueueManager = default!;
+        //CP14 end
         [Dependency] private readonly IBaseClient _baseClient = default!;
         [Dependency] private readonly IGameController _gameController = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
@@ -158,6 +166,11 @@ namespace Content.Client.Entry
 
             _parallaxManager.LoadDefaultParallax();
 
+            //CP14
+            _overlayManager.AddOverlay(new CP14BasePostProcessOverlay());
+            _discordAuth.Initialize();
+            _joinQueueManager.Initialize();
+            //CP14 end
             _overlayManager.AddOverlay(new SingularityOverlay());
             _overlayManager.AddOverlay(new RadiationPulseOverlay());
             _chatManager.Initialize();

Content.Client/Ghost/GhostSystem.cs

@@ -132,7 +132,12 @@ namespace Content.Client.Ghost
             _actions.RemoveAction(uid, component.ToggleLightingActionEntity);
             _actions.RemoveAction(uid, component.ToggleFoVActionEntity);
             _actions.RemoveAction(uid, component.ToggleGhostsActionEntity);
-            _actions.RemoveAction(uid, component.ToggleGhostHearingActionEntity);
+            //_actions.RemoveAction(uid, component.ToggleGhostHearingActionEntity); //Dont need in CP14
+            //CP14
+            _actions.RemoveAction(uid, component.CP14ZLevelUpActionEntity);
+            _actions.RemoveAction(uid, component.CP14ZLevelDownActionEntity);
+            _actions.RemoveAction(uid, component.CP14ToggleRoofActionEntity);
+            //CP14 end
 
             if (uid != _playerManager.LocalEntity)
                 return;

Content.Client/Guidebook/Controls/GuideReagentReaction.xaml

@@ -1,4 +1,6 @@
 <BoxContainer xmlns="https://spacestation14.io"
+              Orientation="Vertical"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
               Orientation="Vertical"
               HorizontalAlignment="Stretch"
               HorizontalExpand="True"
@@ -28,6 +30,23 @@
                            VerticalAlignment="Center"
                            Access="Public"
                            Visible="False" />
+            <!-- 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" />
+                <controls:SplitBar MinHeight="10">
+                </controls:SplitBar>
+            </BoxContainer>
+            <!-- CP14 random reactions end -->
         </BoxContainer>
     </BoxContainer>
     <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5" />

Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.Message;
+using Content.Client.UserInterface.Controls; // CP14 random reactions
 using Content.Client.UserInterface.ControlExtensions;
 using Content.Shared.Atmos.Prototypes;
 using Content.Shared.Chemistry.Components;
@@ -37,13 +38,36 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
         var reactantsLabel = ReactantsLabel;
         SetReagents(prototype.Reactants, ref reactantsLabel, protoMan);
         var productLabel = ProductsLabel;
-        var products = new Dictionary<string, FixedPoint2>(prototype.Products);
+        var products = new Dictionary<string, FixedPoint2>(prototype._products); // CP14 random reactions
         foreach (var (reagent, reactantProto) in prototype.Reactants)
         {
             if (reactantProto.Catalyst)
                 products.Add(reagent, reactantProto.Amount);
         }
         SetReagents(products, ref productLabel, protoMan);
+        // CP14 random reagents begin
+        foreach (var randomVariation in prototype.Cp14RandomProducts)
+        {
+            // If there aren't any variations, this label will be not visible
+            RandomVariationsLabel.Visible = true;
+            var randomProductLabel = new RichTextLabel {
+                HorizontalAlignment=HAlignment.Left,
+                VerticalAlignment=VAlignment.Center,
+            };
+            var randomProducts = new Dictionary<string, FixedPoint2>(randomVariation);
+            RandomVariations.AddChild(randomProductLabel);
+            RandomVariations.AddChild(new SplitBar
+            {
+                MinHeight = 10,
+            });
+            foreach (var (reagent, reactantProto) in prototype.Reactants)
+            {
+                if (reactantProto.Catalyst)
+                    randomProducts.Add(reagent, reactantProto.Amount);
+            }
+            SetReagents(randomProducts, ref randomProductLabel, protoMan);
+        }
+        // CP14 random reagents end
 
         var mixingCategories = new List<MixingCategoryPrototype>();
         if (prototype.MixingCategories != null)

Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs

@@ -5,6 +5,7 @@ using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
 using Content.Client.UserInterface.Systems.Info;
 using Content.Shared.Guidebook;
+using Content.Shared.Localizations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -157,6 +158,9 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler
         var parent = forcedRoot == null ? null : AddEntry(forcedRoot.Value, null, addedEntries);
         foreach (var entry in GetSortedEntries(roots))
         {
+            if (!entry.CrystallPunkAllowed) continue; //CrystallEdge guidebook filter
+            if (entry.LocFilter is not null && entry.LocFilter != ContentLocalizationManager.Culture) continue; //CrystallEdge guidebook filter
+
             AddEntry(entry.Id, parent, addedEntries);
         }
 

Content.Client/Guidebook/GuidebookSystem.cs

@@ -32,6 +32,7 @@ public sealed class GuidebookSystem : EntitySystem
     [Dependency] private readonly RgbLightControllerSystem _rgbLightControllerSystem = default!;
     [Dependency] private readonly SharedPointLightSystem _pointLightSystem = default!;
     [Dependency] private readonly TagSystem _tags = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!; //CrystallEdge guidebook filter
 
     public event Action<List<ProtoId<GuideEntryPrototype>>,
         List<ProtoId<GuideEntryPrototype>>?,
@@ -46,6 +47,7 @@ public sealed class GuidebookSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
+        SubscribeLocalEvent<GuideHelpComponent, MapInitEvent>(OnCrystallEdgeMapInit); //CrystallEdge guidebook filter
         SubscribeLocalEvent<GuideHelpComponent, GetVerbsEvent<ExamineVerb>>(OnGetVerbs);
         SubscribeLocalEvent<GuideHelpComponent, ActivateInWorldEvent>(OnInteract);
 
@@ -55,6 +57,21 @@ public sealed class GuidebookSystem : EntitySystem
             OnGuidebookControlsTestGetAlternateVerbs);
     }
 
+    //CrystallEdge guidebook filter
+    private void OnCrystallEdgeMapInit(Entity<GuideHelpComponent> ent, ref MapInitEvent args)
+    {
+        foreach (var guide in ent.Comp.Guides)
+        {
+            var guideProto = _proto.Index(guide);
+            if (!guideProto.CrystallPunkAllowed) //REMOVE unnecessary guidebook
+            {
+                RemComp<GuideHelpComponent>(ent);
+                return;
+            }
+        }
+    }
+    //CrystallEdge guidebook filter end
+
     /// <summary>
     /// Gets a user entity to use for verbs and examinations. If the player has no attached entity, this will use a
     /// dummy client-side entity so that users can still use the guidebook when not attached to anything (e.g., in the

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

@@ -85,8 +85,19 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
         if (protoId == null)
             return;
 
+        //if (sexMorph)
+        //    protoId = HumanoidVisualLayersExtension.GetSexMorph(key, component.Sex, protoId);
+
+        //CP14 female bodies support
         if (sexMorph)
-            protoId = HumanoidVisualLayersExtension.GetSexMorph(key, component.Sex, protoId);
+        {
+            var tempProto = HumanoidVisualLayersExtension.GetSexMorph(key, component.Sex, protoId);
+            if (_prototypeManager.TryIndex<HumanoidSpeciesSpriteLayer>(tempProto, out _))
+            {
+                protoId = tempProto;
+            }
+        }
+        //CP14 female bodies support end
 
         var proto = _prototypeManager.Index<HumanoidSpeciesSpriteLayer>(protoId);
         component.BaseLayers[key] = proto;

Content.Client/Input/ContentContexts.cs

@@ -123,6 +123,10 @@ namespace Content.Client.Input
             common.AddFunction(ContentKeyFunctions.OpenDecalSpawnWindow);
             common.AddFunction(ContentKeyFunctions.OpenAdminMenu);
             common.AddFunction(ContentKeyFunctions.OpenGuidebook);
+
+            //CP14 Keys
+            human.AddFunction(ContentKeyFunctions.CP14OpenKnowledgeMenu);
+            //CP14 Keys end
         }
     }
 }

Content.Client/IoC/ClientContentIoC.cs

@@ -1,3 +1,5 @@
+using Content.Client._CP14.Discord;
+using Content.Client._CP14.JoinQueue;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -33,6 +35,10 @@ namespace Content.Client.IoC
         {
             var collection = IoCManager.Instance!;
 
+            //CP14
+            collection.Register<DiscordAuthManager>();
+            collection.Register<JoinQueueManager>();
+            //CP14 end
             collection.Register<IParallaxManager, ParallaxManager>();
             collection.Register<IChatManager, ChatManager>();
             collection.Register<ISharedChatManager, ChatManager>();

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -9,6 +9,7 @@ using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Sprite;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Guidebook;
+using Content.Shared._CP14.Humanoid;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
 using Content.Shared.GameTicking;
@@ -1133,6 +1134,22 @@ namespace Content.Client.Lobby.UI
                     Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithSkinColor(color));
                     break;
                 }
+                // CP14 - Custom HumanoidSkinColor - Start
+                case HumanoidSkinColor.TieflingHues:
+                {
+                    if (!RgbSkinColorContainer.Visible)
+                    {
+                        Skin.Visible = false;
+                        RgbSkinColorContainer.Visible = true;
+                    }
+
+                    var color = CP14SkinColor.MakeTieflingHueValid(_rgbSkinColorSelector.Color);
+
+                    Markings.CurrentSkinColor = color;
+                    Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithSkinColor(color));
+                    break;
+                }
+                // CP14 - Custom HumanoidSkinColor - End
             }
 
             ReloadProfilePreview();
@@ -1360,6 +1377,19 @@ namespace Content.Client.Lobby.UI
 
                     break;
                 }
+                // CP14 - Custom HumanoidSkinColor - Start
+                case HumanoidSkinColor.TieflingHues:
+                {
+                    if (!RgbSkinColorContainer.Visible)
+                    {
+                        Skin.Visible = false;
+                        RgbSkinColorContainer.Visible = true;
+                    }
+
+                    _rgbSkinColorSelector.Color = CP14SkinColor.MakeTieflingHueValid(Profile.Appearance.SkinColor);
+                    break;
+                }
+                // CP14 - Custom HumanoidSkinColor - End
             }
 
         }

Content.Client/Mapping/MappingScreen.xaml

@@ -8,7 +8,7 @@
     VerticalExpand="False"
     VerticalAlignment="Bottom"
     HorizontalAlignment="Center">
-    <SplitContainer Name="ScreenContainer" HorizontalExpand="True"
+    <controls:RecordedSplitContainer Name="ScreenContainer" HorizontalExpand="True"
                                      VerticalExpand="True" SplitWidth="0"
                                      StretchDirection="TopLeft">
         <BoxContainer Orientation="Vertical" VerticalExpand="True" Name="SpawnContainer" MinWidth="200" SetWidth="600">
@@ -82,5 +82,5 @@
                 </BoxContainer>
             </PanelContainer>
         </LayoutContainer>
-    </SplitContainer>
+    </controls:RecordedSplitContainer>
 </mapping:MappingScreen>

Content.Client/Mapping/MappingScreen.xaml.cs

@@ -197,6 +197,7 @@ public sealed partial class MappingScreen : InGameScreen
 
     public override void SetChatSize(Vector2 size)
     {
+        ScreenContainer.DesiredSplitCenter = size.X;
         ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
     }
 

Content.Client/Options/UI/OptionsMenu.xaml

@@ -1,5 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
+            xmlns:options="clr-namespace:Content.Client._CP14.Options"
             Title="{Loc 'ui-options-title'}"
             MinSize="800 450">
     <TabContainer Name="Tabs" Access="Public">
@@ -9,5 +10,8 @@
         <tabs:AudioTab Name="AudioTab" />
         <tabs:AccessibilityTab Name="AccessibilityTab" />
         <tabs:AdminOptionsTab Name="AdminOptionsTab" />
+        <!-- CP14-options-menu-start -->
+        <options:CP14OptionsMenuMainTab Name="CP14OptionsMenuTab"/>
+        <!-- CP14-options-menu-end -->
     </TabContainer>
 </DefaultWindow>

Content.Client/Options/UI/OptionsMenu.xaml.cs

@@ -22,6 +22,10 @@ namespace Content.Client.Options.UI
             Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-accessibility"));
             Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-admin"));
 
+            // CP14-options-menu-start
+            Tabs.SetTabTitle(5, Loc.GetString("cp14-ui-options-tab-main"));
+            // CP14-options-menu-end
+
             UpdateTabs();
         }
 

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -265,6 +265,11 @@ namespace Content.Client.Options.UI.Tabs
             AddButton(EngineKeyFunctions.HideUI);
             AddButton(ContentKeyFunctions.InspectEntity);
 
+            //CP14
+            AddHeader("ui-options-header-cp14");
+            AddButton(ContentKeyFunctions.CP14OpenKnowledgeMenu);
+            //CP14 end
+
             foreach (var control in _keyControls.Values)
             {
                 UpdateKeyControl(control);

Content.Client/Overlays/StencilOverlay.Weather.cs

@@ -62,7 +62,7 @@ public sealed partial class StencilOverlay
 
         // Draw the rain
         worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilDraw").Instance());
-        _parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, Vector2.Zero, modulate: (weatherProto.Color ?? Color.White).WithAlpha(alpha));
+        _parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, weatherProto.OffsetSpeed, modulate: (weatherProto.Color ?? Color.White).WithAlpha(alpha*weatherProto.Alpha)); //CP14 alpha and offset scrolling
 
         worldHandle.SetTransform(Matrix3x2.Identity);
         worldHandle.UseShader(null);

Content.Client/Overlays/StencilOverlay.cs

@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Client.Parallax;
 using Content.Client.Weather;
+using Content.Shared._CP14.DayCycle.Components;
 using Content.Shared.Salvage;
 using Content.Shared.Weather;
 using Robust.Client.GameObjects;
@@ -74,6 +75,14 @@ public sealed partial class StencilOverlay : Overlay
             DrawRestrictedRange(args, restrictedRangeComponent, invMatrix);
         }
 
+
+        //CP14 Overlays
+        if (_entManager.TryGetComponent<CP14CloudShadowsComponent>(mapUid, out var shadows))
+        {
+            DrawCloudShadows(args, shadows, invMatrix);
+        }
+        //CP14 Overlays end
+
         args.WorldHandle.UseShader(null);
         args.WorldHandle.SetTransform(Matrix3x2.Identity);
     }

Content.Client/Stylesheets/StyleNano.cs

@@ -96,12 +96,12 @@ namespace Content.Client.Stylesheets
         public static readonly Color DangerousRedFore = Color.FromHex("#BB3232");
         public static readonly Color DisabledFore = Color.FromHex("#5A5A5A");
 
-        public static readonly Color ButtonColorDefault = Color.FromHex("#464966");
+        public static readonly Color ButtonColorDefault = Color.FromHex("#664e46");
         public static readonly Color ButtonColorDefaultRed = Color.FromHex("#D43B3B");
-        public static readonly Color ButtonColorHovered = Color.FromHex("#575b7f");
+        public static readonly Color ButtonColorHovered = Color.FromHex("#7f6357");
         public static readonly Color ButtonColorHoveredRed = Color.FromHex("#DF6B6B");
-        public static readonly Color ButtonColorPressed = Color.FromHex("#3e6c45");
-        public static readonly Color ButtonColorDisabled = Color.FromHex("#30313c");
+        public static readonly Color ButtonColorPressed = Color.FromHex("#4a332b");
+        public static readonly Color ButtonColorDisabled = Color.FromHex("#3c3330");
 
         public static readonly Color ButtonColorCautionDefault = Color.FromHex("#ab3232");
         public static readonly Color ButtonColorCautionHovered = Color.FromHex("#cf2f2f");

Content.Client/UserInterface/Controls/RecordedSplitContainer.cs

@@ -0,0 +1,29 @@
+using System.Numerics;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.UserInterface.Controls;
+
+/// <summary>
+///     A split container that performs an action when the split resizing is finished.
+/// </summary>
+public sealed class RecordedSplitContainer : SplitContainer
+{
+    public double? DesiredSplitCenter;
+
+    protected override Vector2 ArrangeOverride(Vector2 finalSize)
+    {
+        if (ResizeMode == SplitResizeMode.RespectChildrenMinSize
+            && DesiredSplitCenter != null
+            && !finalSize.Equals(Vector2.Zero))
+        {
+            SplitFraction = (float) DesiredSplitCenter.Value;
+
+            if (!Size.Equals(Vector2.Zero))
+            {
+                DesiredSplitCenter = null;
+            }
+        }
+
+        return base.ArrangeOverride(finalSize);
+    }
+}

Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml

@@ -14,7 +14,7 @@
     VerticalExpand="False"
     VerticalAlignment="Bottom"
     HorizontalAlignment="Center">
-    <SplitContainer Name="ScreenContainer" HorizontalExpand="True" VerticalExpand="True" SplitWidth="0" StretchDirection="TopLeft">
+    <controls:RecordedSplitContainer Name="ScreenContainer" HorizontalExpand="True" VerticalExpand="True" SplitWidth="0" StretchDirection="TopLeft">
         <LayoutContainer Name="ViewportContainer" HorizontalExpand="True" VerticalExpand="True">
             <controls:MainViewport Name="MainViewport"/>
             <widgets:GhostGui Name="Ghost" Access="Protected" />
@@ -26,7 +26,7 @@
             </BoxContainer>
             <alerts:AlertsUI Name="Alerts" Access="Protected" />
         </LayoutContainer>
-        <PanelContainer Name="SeparatedChatPanel" MinWidth="300">
+        <PanelContainer HorizontalExpand="True" MinWidth="300">
             <PanelContainer.PanelOverride>
                 <graphics:StyleBoxFlat BackgroundColor="#2B2C3B" />
             </PanelContainer.PanelOverride>
@@ -36,5 +36,5 @@
                 <chat:ChatBox VerticalExpand="True" HorizontalExpand="True" Name="Chat" Access="Protected" MinSize="0 0"/>
             </BoxContainer>
         </PanelContainer>
-    </SplitContainer>
+    </controls:RecordedSplitContainer>
 </screens:SeparatedChatGameScreen>

Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs

@@ -40,6 +40,7 @@ public sealed partial class SeparatedChatGameScreen : InGameScreen
 
     public override void SetChatSize(Vector2 size)
     {
+        ScreenContainer.DesiredSplitCenter = size.X;
         ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
     }
 }

Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml

@@ -1,6 +1,6 @@
 <widgets:AlertsUI xmlns="https://spacestation14.io"
                   xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Alerts.Widgets"
-                  MinSize="64 64">
+                  MinSize="96 96">
     <PanelContainer HorizontalAlignment="Right" VerticalAlignment="Top">
         <BoxContainer Name="AlertContainer" Access="Public" Orientation="Vertical" />
     </PanelContainer>

Content.Client/UserInterface/Systems/Character/CharacterUIController.cs

@@ -173,8 +173,8 @@ public sealed class CharacterUIController : UIController, IOnStateEntered<Gamepl
                 conditionControl.ProgressTexture.Progress = condition.Progress;
                 var titleMessage = new FormattedMessage();
                 var descriptionMessage = new FormattedMessage();
-                titleMessage.AddText(condition.Title);
-                descriptionMessage.AddText(condition.Description);
+                titleMessage.TryAddMarkup(condition.Title, out _); //CP14 colored objective text support
+                descriptionMessage.TryAddMarkup(condition.Description, out _); //CP14 colored objective text support
 
                 conditionControl.Title.SetMessage(titleMessage);
                 conditionControl.Description.SetMessage(descriptionMessage);

Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs

@@ -24,6 +24,7 @@ public sealed class GameTopMenuBarUIController : UIController
     [Dependency] private readonly SandboxUIController _sandbox = default!;
     [Dependency] private readonly GuidebookUIController _guidebook = default!;
     [Dependency] private readonly EmotesUIController _emotes = default!;
+    [Dependency] private readonly CP14KnowledgeUIController _knowledge = default!; //CP14
 
     private GameTopMenuBar? GameTopMenuBar => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>();
 
@@ -47,6 +48,7 @@ public sealed class GameTopMenuBarUIController : UIController
         _action.UnloadButton();
         _sandbox.UnloadButton();
         _emotes.UnloadButton();
+        _knowledge.UnloadButton(); //CP14
     }
 
     public void LoadButtons()
@@ -60,5 +62,6 @@ public sealed class GameTopMenuBarUIController : UIController
         _action.LoadButton();
         _sandbox.LoadButton();
         _emotes.LoadButton();
+        _knowledge.LoadButton(); //CP14
     }
 }

Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml

@@ -33,6 +33,18 @@
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
         />
+    <!-- CP14 UI part -->
+    <ui:MenuButton
+        Name="CP14KnowledgeButton"
+        Access="Internal"
+        Icon="{xe:Tex '/Textures/Interface/students-cap.svg.192dpi.png'}"
+        ToolTip="{Loc 'cp14-game-hud-open-knowledge-menu-button-tooltip'}"
+        BoundKey = "{x:Static is:ContentKeyFunctions.CP14OpenKnowledgeMenu}"
+        MinSize="42 64"
+        HorizontalExpand="True"
+        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+    />
+    <!-- CP14 UI part end -->
     <ui:MenuButton
         Name="CharacterButton"
         Access="Internal"

Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs

@@ -163,8 +163,9 @@ public sealed class ItemGridPiece : Control, IEntityControl
         }
 
         // typically you'd divide by two, but since the textures are half a tile, this is done implicitly
-        var iconPosition = new Vector2((boundingGrid.Width + 1) * size.X + itemComponent.StoredOffset.X * 2,
-            (boundingGrid.Height + 1) * size.Y + itemComponent.StoredOffset.Y * 2);
+        var iconPosition = new Vector2(
+            (boundingGrid.Width + 1) * size.X + Location.Rotation.RotateVec(itemComponent.StoredOffset).X * 2,
+            (boundingGrid.Height + 1) * size.Y + Location.Rotation.RotateVec(itemComponent.StoredOffset).Y * 2);
         var iconRotation = Location.Rotation + Angle.FromDegrees(itemComponent.StoredRotation);
 
         if (itemComponent.StoredSprite is { } storageSprite)

Content.Client/Weapons/Melee/Components/WeaponArcVisualsComponent.cs

@@ -20,4 +20,7 @@ public enum WeaponArcAnimation : byte
     None,
     Thrust,
     Slash,
+    //CrystallEdge Melee upgrade
+    CPSlash,
+    CPThrust
 }

Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs

@@ -43,6 +43,9 @@ public sealed partial class MeleeWeaponSystem
             return;
         }
 
+        var length = 1f; //CrystallEdgeMelee upgrade
+        var offset = -1f; //CrystallEdge Melee upgrade
+
         var spriteRotation = Angle.Zero;
         if (arcComponent.Animation != WeaponArcAnimation.None
             && TryComp(weapon, out MeleeWeaponComponent? meleeWeaponComponent))
@@ -55,6 +58,9 @@ public sealed partial class MeleeWeaponSystem
 
             if (meleeWeaponComponent.SwingLeft)
                 angle *= -1;
+
+            length = meleeWeaponComponent.CPAnimationLength; //CrystallEdge Melee upgrade
+            offset = meleeWeaponComponent.CPAnimationOffset; //CrystallEdge Melee upgrade
         }
         sprite.Rotation = localPos.ToWorldAngle();
         var distance = Math.Clamp(localPos.Length() / 2f, 0.2f, 1f);
@@ -86,6 +92,22 @@ public sealed partial class MeleeWeaponSystem
                 if (arcComponent.Fadeout)
                     _animation.Play(animationUid, GetFadeAnimation(sprite, 0f, 0.15f), FadeAnimationKey);
                 break;
+            //CrystallEdge MeleeUpgrade
+            case WeaponArcAnimation.CPSlash:
+                track = EnsureComp<TrackUserComponent>(animationUid);
+                track.User = user;
+                _animation.Play(animationUid, CPGetSlashAnimation(sprite, angle, spriteRotation, length, offset), SlashAnimationKey);
+                if (arcComponent.Fadeout)
+                    _animation.Play(animationUid, GetFadeAnimation(sprite, length * 0.5f, length + 0.15f), FadeAnimationKey);
+                break;
+            case WeaponArcAnimation.CPThrust:
+                track = EnsureComp<TrackUserComponent>(animationUid);
+                track.User = user;
+                _animation.Play(animationUid, CPGetThrustAnimation(sprite, -offset, spriteRotation, length), ThrustAnimationKey);
+                if (arcComponent.Fadeout)
+                    _animation.Play(animationUid, GetFadeAnimation(sprite, 0f, 0.15f), FadeAnimationKey);
+                break;
+            //CrystallEdge MeleeUpgrade end
         }
     }
 
@@ -186,7 +208,7 @@ public sealed partial class MeleeWeaponSystem
     /// </summary>
     private Animation GetLungeAnimation(Vector2 direction)
     {
-        const float length = 0.1f;
+        const float length = 0.2f; // 0.1 original, CrystallEdge update
 
         return new Animation
         {
@@ -200,8 +222,9 @@ public sealed partial class MeleeWeaponSystem
                     InterpolationMode = AnimationInterpolationMode.Linear,
                     KeyFrames =
                     {
-                        new AnimationTrackProperty.KeyFrame(direction.Normalized() * 0.15f, 0f),
-                        new AnimationTrackProperty.KeyFrame(Vector2.Zero, length)
+                        new AnimationTrackProperty.KeyFrame(Vector2.Zero, 0f), //CrystallEdge MeleeUpgrade
+                        new AnimationTrackProperty.KeyFrame(direction.Normalized() * 0.15f, length*0.4f), //CrystallEdge MeleeUpgrade
+                        new AnimationTrackProperty.KeyFrame(Vector2.Zero, length*0.6f) //CrystallEdge MeleeUpgrade
                     }
                 }
             }
@@ -230,4 +253,78 @@ public sealed partial class MeleeWeaponSystem
             TransformSystem.SetWorldPosition(uid, targetPos);
         }
     }
+
+    //CrystallEdge MeleeUpgrade start
+    private Animation CPGetSlashAnimation(SpriteComponent sprite, Angle arc, Angle spriteRotation, float length, float offset = -1f)
+    {
+        var startRotation = sprite.Rotation + (arc * 0.5f);
+        var endRotation = sprite.Rotation - (arc * 0.5f);
+
+        var startRotationOffset = startRotation.RotateVec(new Vector2(0f, offset));
+        var endRotationOffset = endRotation.RotateVec(new Vector2(0f, offset));
+
+        startRotation += spriteRotation;
+        endRotation += spriteRotation;
+        sprite.NoRotation = true;
+
+        return new Animation()
+        {
+            Length = TimeSpan.FromSeconds(length + 0.05f),
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty()
+                {
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Rotation),
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.0f), length * 0.0f),
+                        new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,1.0f), length * 0.6f),
+                        new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.8f), length * 1.0f),
+                    }
+                },
+                new AnimationTrackComponentProperty()
+                {
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Offset),
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,0.0f), length * 0.0f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,1.0f), length * 0.6f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,0.8f), length * 1.0f),
+                    }
+                },
+            }
+        };
+    }
+
+    private Animation CPGetThrustAnimation(SpriteComponent sprite, float distance, Angle spriteRotation, float length)
+    {
+        var startOffset = sprite.Rotation.RotateVec(new Vector2(0f, -distance / 5f));
+        var endOffset = sprite.Rotation.RotateVec(new Vector2(0f, -distance));
+
+        sprite.Rotation += spriteRotation;
+
+        return new Animation()
+        {
+            Length = TimeSpan.FromSeconds(length),
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty()
+                {
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Offset),
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startOffset, endOffset, 0f), length * 0f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startOffset, endOffset, 1f), length * 0.5f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startOffset, endOffset, 0.9f), length * 0.8f),
+                    }
+                },
+            }
+        };
+    }
+
+    //CrystallEdge MeleeUpgrade end
+
 }

Content.Client/_CP14/Discord/CP14DiscordAuthManager.cs

@@ -0,0 +1,27 @@
+using Content.Shared._CP14.Discord;
+using Robust.Client.State;
+using Robust.Shared.Network;
+
+namespace Content.Client._CP14.Discord;
+
+public sealed class DiscordAuthManager
+{
+    [Dependency] private readonly IClientNetManager _netManager = default!;
+    [Dependency] private readonly IStateManager _stateManager = default!;
+
+    public string AuthUrl { get; private set; } = "";
+
+    public void Initialize()
+    {
+        _netManager.RegisterNetMessage<MsgDiscordAuthCheck>();
+        _netManager.RegisterNetMessage<MsgDiscordAuthRequired>(OnDiscordAuthRequired);
+    }
+
+    private void OnDiscordAuthRequired(MsgDiscordAuthRequired msg)
+    {
+        if (_stateManager.CurrentState is DiscordAuthState)
+            return;
+        AuthUrl = msg.AuthUrl;
+        _stateManager.RequestStateChange<DiscordAuthState>();
+    }
+}

Content.Client/_CP14/Discord/CP14DiscordAuthState.cs

@@ -0,0 +1,36 @@
+using System.Threading;
+using Content.Shared._CP14.Discord;
+using Robust.Client.State;
+using Robust.Client.UserInterface;
+using Robust.Shared.Network;
+using Timer = Robust.Shared.Timing.Timer;
+
+namespace Content.Client._CP14.Discord;
+
+public sealed class DiscordAuthState : State
+{
+    [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+    [Dependency] private readonly IClientNetManager _netManager = default!;
+
+    private DiscordAuthGui? _gui;
+    private readonly CancellationTokenSource _checkTimerCancel = new();
+
+    protected override void Startup()
+    {
+        _gui = new DiscordAuthGui();
+        _userInterfaceManager.StateRoot.AddChild(_gui);
+
+        Timer.SpawnRepeating(TimeSpan.FromSeconds(5),
+            () =>
+            {
+                _netManager.ClientSendMessage(new MsgDiscordAuthCheck());
+            },
+            _checkTimerCancel.Token);
+    }
+
+    protected override void Shutdown()
+    {
+        _checkTimerCancel.Cancel();
+        _gui!.Dispose();
+    }
+}

Content.Client/_CP14/Discord/DiscordAuthGui.xaml

@@ -0,0 +1,29 @@
+<Control xmlns="https://spacestation14.io"
+          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+          xmlns:parallax="clr-namespace:Content.Client.Parallax"
+          xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <parallax:ParallaxControl />
+    <Control HorizontalAlignment="Center" VerticalAlignment="Center">
+        <PanelContainer StyleClasses="AngleRect" />
+        <BoxContainer Orientation="Vertical">
+            <BoxContainer Orientation="Horizontal">
+                <Label Margin="8 0 0 0" Text="{Loc 'cp14-discord-auth-title'}"
+                       StyleClasses="LabelHeading" VAlign="Center" />
+                <Button Name="QuitButton" Text="{Loc 'cp14-discord-auth-quit-btn'}"
+                        HorizontalAlignment="Right" HorizontalExpand="True" />
+            </BoxContainer>
+            <controls:HighDivider />
+            <BoxContainer Orientation="Vertical" Margin="50 20 50 20">
+                <RichTextLabel Name="InfoLabel"  />
+            </BoxContainer>
+            <BoxContainer HorizontalExpand="True">
+                <LineEdit Editable="False" Name="AuthLinkEdit" HorizontalExpand="True" />
+                <LineEdit Editable="False" Name="DLinkEdit" HorizontalExpand="True" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                <Button Name="AuthorizeButton" Text="{Loc 'cp14-discord-auth-text'}" HorizontalExpand="True" StyleClasses="OpenRight" />
+                <Button Name="DiscordButton" Text="{Loc 'cp14-discord-auth-browser-btn'}" HorizontalExpand="True" StyleClasses="OpenRight" />
+            </BoxContainer>
+        </BoxContainer>
+    </Control>
+</Control>

Content.Client/_CP14/Discord/DiscordAuthGui.xaml.cs

@@ -0,0 +1,46 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.Console;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._CP14.Discord;
+
+[GenerateTypedNameReferences]
+public sealed partial class DiscordAuthGui : Control
+{
+    [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
+    [Dependency] private readonly DiscordAuthManager _discordAuthManager = default!;
+
+    private const string DiscordLink = "https://discord.com/invite/Sud2DMfhCC"; //TODO: Unhardcode
+
+    public DiscordAuthGui()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
+
+        var link = _discordAuthManager.AuthUrl;
+
+        AuthLinkEdit.SetText(link);
+        DLinkEdit.SetText(DiscordLink);
+        InfoLabel.SetMessage(Loc.GetString("cp14-discord-info"));
+
+        var uriOpener = IoCManager.Resolve<IUriOpener>();
+
+        QuitButton.OnPressed += _ =>
+        {
+            _consoleHost.ExecuteCommand("quit");
+        };
+
+        AuthorizeButton.OnPressed += _ =>
+        {
+            uriOpener.OpenUri(link);
+        };
+
+        DiscordButton.OnPressed += _ =>
+        {
+            uriOpener.OpenUri(DiscordLink);
+        };
+    }
+}

Content.Client/_CP14/Farming/CP14PlantVisualsComponent.cs

@@ -0,0 +1,23 @@
+namespace Content.Client._CP14.Farming;
+
+/// <summary>
+/// Controls the visual display of plant growth
+/// </summary>
+[RegisterComponent]
+public sealed partial class CP14PlantVisualsComponent : Component
+{
+    [DataField]
+    public int GrowthSteps = 3;
+
+    [DataField]
+    public string? GrowState;
+
+    [DataField]
+    public string? GrowUnshadedState;
+}
+
+public enum PlantVisualLayers : byte
+{
+    Base,
+    BaseUnshaded,
+}

Content.Client/_CP14/Farming/ClientCP14FarmingSystem.cs

@@ -0,0 +1,48 @@
+using Content.Shared._CP14.Farming;
+using Content.Shared.Rounding;
+using Robust.Client.GameObjects;
+
+namespace Content.Client._CP14.Farming;
+
+public sealed class ClientCP14FarmingSystem : CP14SharedFarmingSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CP14PlantVisualsComponent, ComponentInit>(OnPlantVisualInit);
+        SubscribeLocalEvent<CP14PlantComponent, AfterAutoHandleStateEvent>(OnAutoHandleState);
+    }
+
+    private void OnAutoHandleState(Entity<CP14PlantComponent> plant, ref AfterAutoHandleStateEvent args)
+    {
+        if (!TryComp<CP14PlantVisualsComponent>(plant, out var visuals))
+            return;
+
+        UpdateVisuals(new Entity<CP14PlantVisualsComponent>(plant, visuals));
+    }
+
+    private void OnPlantVisualInit(Entity<CP14PlantVisualsComponent> visuals, ref ComponentInit args)
+    {
+        UpdateVisuals(visuals);
+    }
+
+    private void UpdateVisuals(Entity<CP14PlantVisualsComponent> visuals)
+    {
+        if (!TryComp<SpriteComponent>(visuals, out var sprite))
+            return;
+
+        if (!TryComp<CP14PlantComponent>(visuals, out var plant))
+            return;
+
+        var growthState = ContentHelpers.RoundToNearestLevels(plant.GrowthLevel, 1, visuals.Comp.GrowthSteps);
+        if (growthState == 0)
+            growthState++;
+
+        if (sprite.LayerMapTryGet(PlantVisualLayers.Base, out _))
+            sprite.LayerSetState(PlantVisualLayers.Base, $"{visuals.Comp.GrowState}{growthState}");
+
+        if (sprite.LayerMapTryGet(PlantVisualLayers.BaseUnshaded, out _))
+            sprite.LayerSetState(PlantVisualLayers.BaseUnshaded, $"{visuals.Comp.GrowUnshadedState}{growthState}");
+    }
+}

Content.Client/_CP14/JoinQueue/JoinQueueManager.cs

@@ -0,0 +1,26 @@
+using Content.Shared._CP14.JoinQueue;
+using Robust.Client.State;
+using Robust.Shared.Network;
+
+namespace Content.Client._CP14.JoinQueue;
+
+public sealed class JoinQueueManager
+{
+    [Dependency] private readonly IClientNetManager _netManager = default!;
+    [Dependency] private readonly IStateManager _stateManager = default!;
+
+    public void Initialize()
+    {
+        _netManager.RegisterNetMessage<MsgQueueUpdate>(OnQueueUpdate);
+    }
+
+    private void OnQueueUpdate(MsgQueueUpdate msg)
+    {
+        if (_stateManager.CurrentState is not QueueState)
+        {
+            _stateManager.RequestStateChange<QueueState>();
+        }
+
+        ((QueueState) _stateManager.CurrentState).OnQueueUpdate(msg);
+    }
+}

Content.Client/_CP14/JoinQueue/QueueGui.xaml

@@ -0,0 +1,33 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+         xmlns:parallax="clr-namespace:Content.Client.Parallax"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <parallax:ParallaxControl />
+    <Control HorizontalAlignment="Center" VerticalAlignment="Center">
+        <PanelContainer StyleClasses="AngleRect" />
+        <BoxContainer Orientation="Vertical" MinSize="200 200">
+            <BoxContainer Orientation="Horizontal">
+                <Label Margin="8 0 0 0" Text="{Loc 'queue-title'}"
+                       StyleClasses="LabelHeading" VAlign="Center" />
+                <Button Name="QuitButton" Text="{Loc 'queue-quit'}"
+                        HorizontalAlignment="Right" HorizontalExpand="True" />
+            </BoxContainer>
+            <controls:HighDivider />
+            <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="0 20 0 0">
+                <BoxContainer Orientation="Vertical">
+                    <BoxContainer Orientation="Vertical" VerticalExpand="True">
+                        <Label Text="{Loc 'queue-position'}" Align="Center" />
+                        <Label Name="QueuePosition" StyleClasses="LabelHeading" Align="Center" />
+                    </BoxContainer>
+                    <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="0 10 0 0">
+                        <Label Text="{Loc 'queue-total'}" Align="Center" />
+                        <Label Name="QueueTotal" StyleClasses="LabelHeading" Align="Center" />
+                    </BoxContainer>
+                </BoxContainer>
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0 20 0 0">
+                <Button Name="PriorityJoinButton" Text="{Loc 'queue-priority-join'}" HorizontalExpand="True" StyleClasses="OpenRight" />
+            </BoxContainer>
+        </BoxContainer>
+    </Control>
+</Control>

Content.Client/_CP14/JoinQueue/QueueGui.xaml.cs

@@ -0,0 +1,41 @@
+using Content.Shared.CCVar;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
+
+namespace Content.Client._CP14.JoinQueue;
+
+[GenerateTypedNameReferences]
+public sealed partial class QueueGui : Control
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public event Action? QuitPressed;
+
+    public QueueGui()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
+
+        QuitButton.OnPressed += (_) => QuitPressed?.Invoke();
+
+        // Disable "priority join" button on Steam builds
+        // since it violates Valve's rules about alternative storefronts.
+        PriorityJoinButton.Visible = !_cfg.GetCVar(CCVars.BrandingSteam);
+
+        PriorityJoinButton.OnPressed += (_) =>
+        {
+            var linkPatreon = _cfg.GetCVar(CCVars.InfoLinksPatreon);
+            IoCManager.Resolve<IUriOpener>().OpenUri(linkPatreon);
+        };
+    }
+
+    public void UpdateInfo(int total, int position)
+    {
+        QueueTotal.Text = total.ToString();
+        QueuePosition.Text = position.ToString();
+    }
+}

Content.Client/_CP14/JoinQueue/QueueState.cs

@@ -0,0 +1,53 @@
+using Content.Client._CP14.JoinQueue;
+using Content.Shared._CP14.JoinQueue;
+using Robust.Client.Audio;
+using Robust.Client.Console;
+using Robust.Client.State;
+using Robust.Client.UserInterface;
+using Robust.Shared.Player;
+
+namespace Content.Client._CP14.JoinQueue;
+
+public sealed class QueueState : State
+{
+    [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+    [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
+
+    private const string JoinSoundPath = "/Audio/Effects/voteding.ogg";
+
+    private QueueGui? _gui;
+
+    protected override void Startup()
+    {
+        _gui = new QueueGui();
+        _userInterfaceManager.StateRoot.AddChild(_gui);
+
+        _gui.QuitPressed += OnQuitPressed;
+    }
+
+    protected override void Shutdown()
+    {
+        _gui!.QuitPressed -= OnQuitPressed;
+        _gui.Dispose();
+
+        Ding();
+    }
+
+    private void Ding()
+    {
+        if (IoCManager.Resolve<IEntityManager>().TrySystem<AudioSystem>(out var audio))
+        {
+            audio.PlayGlobal(JoinSoundPath, Filter.Local(), false);
+        }
+    }
+
+    public void OnQueueUpdate(MsgQueueUpdate msg)
+    {
+        _gui?.UpdateInfo(msg.Total, msg.Position);
+    }
+
+    private void OnQuitPressed()
+    {
+        _consoleHost.ExecuteCommand("quit");
+    }
+}

Content.Client/_CP14/Knowledge/ClientCP14KnowledgeSystem.cs

@@ -0,0 +1,42 @@
+using Content.Shared._CP14.Knowledge;
+using Content.Shared._CP14.Knowledge.Prototypes;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._CP14.Knowledge;
+
+public sealed partial class ClientCP14KnowledgeSystem : SharedCP14KnowledgeSystem
+{
+    [Dependency] private readonly IPlayerManager _players = default!;
+
+    public event Action<KnowledgeData>? OnKnowledgeUpdate;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeNetworkEvent<CP14KnowledgeInfoEvent>(OnCharacterKnowledgeEvent);
+    }
+
+    public void RequestKnowledgeInfo()
+    {
+        var entity = _players.LocalEntity;
+        if (entity is null)
+            return;
+
+        RaiseNetworkEvent(new RequestKnowledgeInfoEvent(GetNetEntity(entity.Value)));
+    }
+
+    private void OnCharacterKnowledgeEvent(CP14KnowledgeInfoEvent msg, EntitySessionEventArgs args)
+    {
+        var entity = GetEntity(msg.NetEntity);
+        var data = new KnowledgeData(entity, msg.AllKnowledge);
+
+        OnKnowledgeUpdate?.Invoke(data);
+    }
+
+    public readonly record struct KnowledgeData(
+        EntityUid Entity,
+        HashSet<ProtoId<CP14KnowledgePrototype>> AllKnowledges
+    );
+}

Content.Client/_CP14/Localization/CP14LocalizationVisualsComponent.cs

@@ -0,0 +1,31 @@
+namespace Content.Client._CP14.Localization;
+
+/// <summary>
+/// Controls the visual of the sprite, depending on the localization. Useful for drawn lettering
+/// </summary>
+[RegisterComponent]
+public sealed partial class CP14LocalizationVisualsComponent : Component
+{
+    /// <summary>
+    /// map(map,(lang, state))
+    /// in yml:
+    ///
+    /// - type: Sprite
+    ///   layers:
+    ///   - state: stateName0
+    ///     map: ["map1"]
+    ///   - state: stateName0
+    ///     map: ["map2"]
+    /// - type: CP14LocalizationVisuals
+    ///   mapStates:
+    ///     map1:
+    ///       ru-RU: stateName1
+    ///       en-US: stateName2
+    ///     map2:
+    ///       ru-RU: stateName3
+    ///       en-US: stateName4
+    ///
+    /// </summary>
+    [DataField]
+    public Dictionary<string, Dictionary<string, string>> MapStates;
+}

Content.Client/_CP14/Localization/CP14LocalizationVisualsSystem.cs

@@ -0,0 +1,29 @@
+using Content.Shared.Localizations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client._CP14.Localization;
+
+public sealed class CP14LocalizationVisualsSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CP14LocalizationVisualsComponent, ComponentInit>(OnCompInit);
+    }
+
+    private void OnCompInit(Entity<CP14LocalizationVisualsComponent> visuals, ref ComponentInit args)
+    {
+        if (!TryComp<SpriteComponent>(visuals, out var sprite))
+            return;
+
+        foreach (var (map, pDictionary) in visuals.Comp.MapStates)
+        {
+            if (!pDictionary.TryGetValue(ContentLocalizationManager.Culture, out var state))
+                return;
+
+            if (sprite.LayerMapTryGet(map, out _))
+                sprite.LayerSetState(map, state);
+        }
+    }
+}

Content.Client/_CP14/MagicRituals/CP14ClientRitualSystem.cs

@@ -0,0 +1,35 @@
+using Content.Shared._CP14.MagicRitual;
+using Robust.Client.GameObjects;
+
+namespace Content.Server._CP14.MagicRituals;
+
+public partial class CP14ClientRitualSystem : CP14SharedRitualSystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CP14MagicRitualComponent, AppearanceChangeEvent>(OnAppearanceChange);
+    }
+
+    private void OnAppearanceChange(Entity<CP14MagicRitualComponent> ent, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite == null)
+            return;
+
+        if (!args.Sprite.LayerMapTryGet(ent.Comp.RitualLayerMap, out var ritualLayer))
+            return;
+
+        if (_appearance.TryGetData<Color>(ent, RitualVisuals.Color, out var ritualColor, args.Component))
+        {
+            args.Sprite.LayerSetColor(ritualLayer, ritualColor);
+        }
+
+        if (_appearance.TryGetData<bool>(ent, RitualVisuals.Enabled, out var enabled, args.Component))
+        {
+            args.Sprite.LayerSetVisible(ritualLayer, enabled);
+        }
+    }
+}

Content.Client/_CP14/MagicSpell/CP14ClientMagicSystem.cs

@@ -0,0 +1,7 @@
+using Content.Shared._CP14.MagicSpell;
+
+namespace Content.Client._CP14.MagicSpell;
+
+public sealed partial class CP14ClientMagicSystem : CP14SharedMagicSystem
+{
+}

Content.Client/_CP14/MagicWeakness/CP14ClientMagicWeaknessSystem.cs

@@ -0,0 +1,7 @@
+using Content.Shared._CP14.MagicWeakness;
+
+namespace Content.Client._CP14.MagicWeakness;
+
+public class CP14ClientMagicWeaknessSystem : CP14SharedMagicWeaknessSystem
+{
+}

Content.Client/_CP14/ModularCraft/CP14ClientModularCraftSystem.cs

@@ -0,0 +1,218 @@
+using Content.Client.Clothing;
+using Content.Shared._CP14.ModularCraft;
+using Content.Shared._CP14.ModularCraft.Components;
+using Content.Shared.Clothing;
+using Content.Shared.Hands;
+using Content.Shared.Inventory;
+using Content.Shared.Item;
+using Content.Shared.Wieldable.Components;
+using Robust.Client.GameObjects;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
+
+namespace Content.Client._CP14.ModularCraft;
+
+public sealed class CP14ClientModularCraftSystem : CP14SharedModularCraftSystem
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IResourceCache _resCache = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CP14ModularCraftStartPointComponent, AfterAutoHandleStateEvent>(OnAfterHandleState);
+        SubscribeLocalEvent<CP14ModularCraftStartPointComponent, GetInhandVisualsEvent>(OnGetInhandVisuals);
+        SubscribeLocalEvent<CP14ModularCraftStartPointComponent, GetEquipmentVisualsEvent>(OnGetEquipmentVisuals);
+    }
+
+    private void OnAfterHandleState(Entity<CP14ModularCraftStartPointComponent> start,
+        ref AfterAutoHandleStateEvent args)
+    {
+        if (!TryComp<SpriteComponent>(start, out var sprite))
+            return;
+
+        UpdateIcon(start, sprite);
+    }
+
+    private void UpdateIcon(Entity<CP14ModularCraftStartPointComponent> start, SpriteComponent? sprite = null)
+    {
+        if (!Resolve(start, ref sprite, false))
+            return;
+
+        //Remove old layers
+        foreach (var key in start.Comp.RevealedLayers)
+        {
+            sprite.RemoveLayer(key);
+        }
+
+        start.Comp.RevealedLayers.Clear();
+
+        //Add new layers
+        var counterPart = 0;
+        foreach (var part in start.Comp.InstalledParts)
+        {
+            var indexedPart = _proto.Index(part);
+
+            if (indexedPart.IconSprite is null)
+            {
+                //Try get default sprite
+                if (indexedPart.RsiPath is null)
+                    continue;
+
+                var state = $"icon";
+
+                var rsi = _resCache
+                    .GetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / indexedPart.RsiPath)
+                    .RSI;
+
+                if (!rsi.TryGetState(state, out _))
+                    continue;
+
+                var defaultLayer = new PrototypeLayerData
+                {
+                    RsiPath = indexedPart.RsiPath,
+                    State = state,
+                };
+
+                var keyCode = $"cp14-modular-icon-layer-{counterPart}-default";
+                start.Comp.RevealedLayers.Add(keyCode);
+                var index = sprite.AddLayer(defaultLayer);
+                sprite.LayerMapSet(keyCode, index);
+
+                if (indexedPart.Color is not null)
+                    sprite.LayerSetColor(keyCode, indexedPart.Color.Value);
+            }
+            else
+            {
+                var counter = 0;
+                foreach (var layer in indexedPart.IconSprite)
+                {
+                    var keyCode = $"cp14-modular-icon-layer-{counterPart}-{counter}";
+                    start.Comp.RevealedLayers.Add(keyCode);
+                    var index = sprite.AddLayer(layer);
+                    sprite.LayerMapSet(keyCode, index);
+
+                    counter++;
+                }
+            }
+
+            counterPart++;
+        }
+    }
+
+    private void OnGetInhandVisuals(Entity<CP14ModularCraftStartPointComponent> start, ref GetInhandVisualsEvent args)
+    {
+        var defaultKey = $"cp14-modular-inhand-layer-{args.Location.ToString().ToLowerInvariant()}";
+
+        if (!TryComp<ItemComponent>(start, out var item))
+            return;
+
+        var wielded = item.HeldPrefix == "wielded"; //SHITCOOOOOOODE
+
+        var counterPart = 0;
+        foreach (var part in start.Comp.InstalledParts)
+        {
+            var indexedPart = _proto.Index(part);
+
+            var targetLayers =
+                wielded ? indexedPart.WieldedInhandVisuals : indexedPart.InhandVisuals;
+
+            if (targetLayers is not null && targetLayers.TryGetValue(args.Location, out var layers))
+            {
+                var i = 0;
+                foreach (var layer in layers)
+                {
+                    var key = $"{defaultKey}-{counterPart}-{i}";
+                    args.Layers.Add((key, layer));
+                    i++;
+                }
+            }
+            else
+            {
+                //Try get default visuals
+                if (indexedPart.RsiPath is null)
+                    continue;
+
+                var rsi = _resCache
+                    .GetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / indexedPart.RsiPath)
+                    .RSI;
+
+                var state = $"inhand-{args.Location.ToString().ToLowerInvariant()}";
+
+                if (wielded)
+                    state = $"wielded-{state}";
+
+                if (!rsi.TryGetState(state, out _))
+                    continue;
+
+                var defaultLayer = new PrototypeLayerData
+                {
+                    RsiPath = indexedPart.RsiPath,
+                    State = state,
+                    Color = indexedPart.Color,
+                };
+
+                var key = $"{defaultKey}-{counterPart}-default";
+                args.Layers.Add((key, defaultLayer));
+            }
+
+            counterPart++;
+        }
+    }
+
+    private void OnGetEquipmentVisuals(Entity<CP14ModularCraftStartPointComponent> start,
+        ref GetEquipmentVisualsEvent args)
+    {
+        if (!TryComp(args.Equipee, out InventoryComponent? inventory))
+            return;
+
+        var defaultKey = $"cp14-modular-clothing-layer-{args.Slot}";
+
+        var counterPart = 0;
+        foreach (var part in start.Comp.InstalledParts)
+        {
+            var indexedPart = _proto.Index(part);
+
+            if (indexedPart.ClothingVisuals is not null && indexedPart.ClothingVisuals.TryGetValue(args.Slot, out var layers))
+            {
+                var i = 0;
+                foreach (var layer in layers)
+                {
+                    var key = $"{defaultKey}-{counterPart}-{i}";
+                    args.Layers.Add((key, layer));
+                    i++;
+                }
+            }
+            else
+            {
+                //Try get default sprites
+                if (indexedPart.RsiPath is null)
+                    continue;
+
+                var rsi = _resCache
+                    .GetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / indexedPart.RsiPath)
+                    .RSI;
+
+                if (!ClientClothingSystem.TemporarySlotMap.TryGetValue(args.Slot, out var correctedSlot))
+                    continue;
+
+                var state = $"equipped-{correctedSlot}";
+
+                if (!rsi.TryGetState(state, out _))
+                    continue;
+
+                var defaultLayer = new PrototypeLayerData
+                {
+                    RsiPath = indexedPart.RsiPath,
+                    State = state,
+                    Color = indexedPart.Color,
+                };
+
+                var key = $"{defaultKey}-{counterPart}-default";
+                args.Layers.Add((key, defaultLayer));
+            }
+        }
+    }
+}

Content.Client/_CP14/Options/CP14OptionsMenuMainTab.xaml

@@ -0,0 +1,36 @@
+<options:CP14OptionsMenuMainTab
+    xmlns="https://spacestation14.io"
+    xmlns:ui="clr-namespace:Content.Client.Options.UI"
+    xmlns:options="clr-namespace:Content.Client._CP14.Options">
+
+    <!--
+    Place for all custom settings of CP14
+    -->
+    <BoxContainer Orientation="Vertical">
+
+        <!-- Main options container -->
+        <ScrollContainer VerticalExpand="True" HorizontalExpand="True">
+            <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
+
+                <!-- Graphics group -->
+                <Label Text="{Loc 'cp14-ui-options-main-graphics-label'}"
+                       StyleClasses="LabelKeyText"/>
+
+                <CheckBox Name="WaveShaderEnabled"
+                    Text="{Loc 'cp14-ui-options-main-graphics-wave-shader'}"/>
+                    <!-- TODO: Wave shader tooltip -->
+                <CheckBox Name="PostProcessCheckBox"
+                    Text="{Loc 'cp14-ui-options-postprocess'}"
+                    ToolTip="{Loc 'cp14-ui-options-postprocess-tooltip'}"/>
+
+            </BoxContainer>
+        </ScrollContainer>
+
+        <!--
+        Utilitarian element to simplify configuration work,
+        ust don't touch that, okay?
+        -->
+        <ui:OptionsTabControlRow Name="Control" />
+
+    </BoxContainer>
+</options:CP14OptionsMenuMainTab>

Content.Client/_CP14/Options/CP14OptionsMenuMainTab.xaml.cs

@@ -0,0 +1,20 @@
+using Content.Shared._CP14.Configuration;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._CP14.Options;
+
+[GenerateTypedNameReferences]
+public sealed partial class CP14OptionsMenuMainTab : Control
+{
+    public CP14OptionsMenuMainTab()
+    {
+        RobustXamlLoader.Load(this);
+
+        Control.AddOptionCheckBox(CP14ConfigVars.WaveShaderEnabled, WaveShaderEnabled);
+        Control.AddOptionCheckBox(CP14ConfigVars.PostProcess, PostProcessCheckBox);
+
+        Control.Initialize();
+    }
+}

Content.Client/_CP14/Overlays/BasePostProcessOverlay.cs

@@ -0,0 +1,77 @@
+using Content.Shared._CP14.Configuration;
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Graphics;
+using Robust.Shared.Physics;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Overlays;
+
+// This overlay serves as the foundational post processing overlay.
+// Ideally, for performance reasons, post processing designed to be present at all times, such as additive light blending or tonemapping, should be done as part of a single shader pass.
+public sealed class CP14BasePostProcessOverlay : Overlay
+{
+    [Dependency] private readonly IConfigurationManager _configManager = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly ILightManager _lightManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    public override bool RequestScreenTexture => true;
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    private readonly ShaderInstance _basePostProcessShader;
+
+    public CP14BasePostProcessOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _basePostProcessShader = _prototypeManager.Index<ShaderPrototype>("BasePostProcess").InstanceUnique();
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (!_configManager.GetCVar(CP14ConfigVars.PostProcess))
+            return false;
+
+        if (!_entityManager.TryGetComponent(_playerManager.LocalSession?.AttachedEntity, out EyeComponent? eyeComp))
+            return false;
+
+        if (args.Viewport.Eye != eyeComp.Eye)
+            return false;
+
+        if (!_lightManager.Enabled || !eyeComp.Eye.DrawLight || !eyeComp.Eye.DrawFov)
+            return false;
+
+        var playerEntity = _playerManager.LocalSession?.AttachedEntity;
+
+        if (playerEntity == null)
+            return false;
+
+        return true;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture == null)
+            return;
+
+        if (args.Viewport.Eye == null)
+            return;
+
+        var playerEntity = _playerManager.LocalSession?.AttachedEntity;
+
+        var worldHandle = args.WorldHandle;
+        var viewport = args.WorldBounds;
+
+        _basePostProcessShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+        _basePostProcessShader.SetParameter("LIGHT_TEXTURE", args.Viewport.LightRenderTarget.Texture);
+
+        _basePostProcessShader.SetParameter("Zoom", args.Viewport.Eye.Zoom.X);
+
+        worldHandle.UseShader(_basePostProcessShader);
+        worldHandle.DrawRect(viewport, Color.White);
+        worldHandle.UseShader(null);
+    }
+}

Content.Client/_CP14/Overlays/StencilOverlay.CloudShadows.cs

@@ -0,0 +1,65 @@
+using System.Numerics;
+using Content.Shared._CP14.DayCycle.Components;
+using Robust.Client.Graphics;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Overlays;
+
+public sealed partial class StencilOverlay
+{
+    private void DrawCloudShadows(in OverlayDrawArgs args, CP14CloudShadowsComponent cloudComp, Matrix3x2 invMatrix)
+    {
+        var worldHandle = args.WorldHandle;
+        var mapId = args.MapId;
+        var worldAABB = args.WorldAABB;
+        var worldBounds = args.WorldBounds;
+        var position = args.Viewport.Eye?.Position.Position ?? Vector2.Zero;
+
+        // Cut out the irrelevant bits via stencil
+        // This is why we don't just use parallax; we might want specific tiles to get drawn over
+        // particularly for planet maps or stations.
+        worldHandle.RenderInRenderTarget(_blep!, () =>
+        {
+            var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
+            _grids.Clear();
+
+            // idk if this is safe to cache in a field and clear sloth help
+            _mapManager.FindGridsIntersecting(mapId, worldAABB, ref _grids);
+
+            foreach (var grid in _grids)
+            {
+                var matrix = _transform.GetWorldMatrix(grid, xformQuery);
+                var matty =  Matrix3x2.Multiply(matrix, invMatrix);
+                worldHandle.SetTransform(matty);
+
+                foreach (var tile in grid.Comp.GetTilesIntersecting(worldAABB))
+                {
+                    // Ignored tiles for stencil
+                    if (_weather.CanWeatherAffect(grid.Owner, grid, tile))
+                    {
+                        continue;
+                    }
+
+                    var gridTile = new Box2(tile.GridIndices * grid.Comp.TileSize,
+                        (tile.GridIndices + Vector2i.One) * grid.Comp.TileSize);
+
+                    worldHandle.DrawRect(gridTile, Color.White);
+                }
+            }
+
+        }, Color.Transparent);
+
+        worldHandle.SetTransform(Matrix3x2.Identity);
+        worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilMask").Instance());
+        worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
+        var curTime = _timing.RealTime;
+        var sprite = _sprite.GetFrame(new SpriteSpecifier.Texture(cloudComp.ParallaxPath), curTime);
+
+        // Draw the rain
+        worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilDraw").Instance());
+        _parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, cloudComp.CloudSpeed, modulate: Color.White.WithAlpha(cloudComp.Alpha), scale: cloudComp.Scale);
+
+        worldHandle.SetTransform(Matrix3x2.Identity);
+        worldHandle.UseShader(null);
+    }
+}

Content.Client/_CP14/Roof/CP14RoofSystem.cs

@@ -0,0 +1,152 @@
+using Content.Shared._CP14.Roof;
+using Content.Shared.Ghost;
+using Content.Shared.Light.EntitySystems;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+using Robust.Shared.Console;
+using Robust.Shared.Map.Components;
+
+namespace Content.Client._CP14.Roof;
+
+public sealed class CP14RoofSystem : EntitySystem
+{
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly SharedRoofSystem _roof = default!;
+
+    private bool _roofVisible = true;
+    public bool DisabledByCommand = false;
+
+    private EntityQuery<MapGridComponent> _gridQuery;
+    private EntityQuery<GhostComponent> _ghostQuery;
+    private EntityQuery<TransformComponent> _xformQuery;
+
+    public bool RoofVisibility
+    {
+        get => _roofVisible && !DisabledByCommand;
+        set
+        {
+            _roofVisible = value;
+            UpdateRoofVisibilityAll();
+        }
+    }
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _ghostQuery = GetEntityQuery<GhostComponent>();
+        _xformQuery = GetEntityQuery<TransformComponent>();
+        _gridQuery = GetEntityQuery<MapGridComponent>();
+
+        SubscribeLocalEvent<CP14RoofComponent, ComponentStartup>(RoofStartup);
+        SubscribeLocalEvent<CP14RoofComponent, ComponentRemove>(RoofRemove);
+
+        SubscribeLocalEvent<GhostComponent, CP14ToggleRoofVisibilityAction>(OnToggleRoof);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var player = _playerManager.LocalEntity;
+
+        if (_ghostQuery.HasComp(player))
+            return;
+
+        if (_xformQuery.TryComp(player, out var playerXform))
+        {
+            var grid = playerXform.GridUid;
+            if (grid == null || !TryComp<MapGridComponent>(grid, out var gridComp))
+                return;
+
+            var roofQuery = GetEntityQuery<CP14RoofComponent>();
+            var anchored = _map.GetAnchoredEntities(grid.Value, gridComp, playerXform.Coordinates);
+
+            var underRoof = false;
+            foreach (var ent in anchored)
+            {
+                if (!roofQuery.HasComp(ent))
+                    continue;
+
+                underRoof = true;
+            }
+            if (underRoof && _roofVisible)
+            {
+                RoofVisibility = false;
+            }
+            if (!underRoof && !_roofVisible)
+            {
+                RoofVisibility = true;
+            }
+        }
+    }
+
+    private void OnToggleRoof(Entity<GhostComponent> ent, ref CP14ToggleRoofVisibilityAction args)
+    {
+        if (args.Handled)
+            return;
+
+        DisabledByCommand = !DisabledByCommand;
+        UpdateRoofVisibilityAll();
+
+        args.Handled = true;
+    }
+
+    private void RoofStartup(Entity<CP14RoofComponent> ent, ref ComponentStartup args)
+    {
+        if (!TryComp<SpriteComponent>(ent, out var sprite))
+            return;
+
+        UpdateVisibility(ent, sprite);
+
+        //var xform = Transform(ent);
+//
+        //if (_gridQuery.TryComp(xform.GridUid, out var grid))
+        //{
+        //    var index = _map.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates);
+        //    _roof.SetRoof((xform.GridUid.Value, grid, null), index, true);
+        //}
+    }
+
+    private void RoofRemove(Entity<CP14RoofComponent> ent, ref ComponentRemove args)
+    {
+        //var xform = Transform(ent);
+//
+        //if (_gridQuery.TryComp(xform.GridUid, out var grid))
+        //{
+        //    var index = _map.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates);
+        //    _roof.SetRoof((xform.GridUid.Value, grid, null), index, false);
+        //}
+    }
+
+    private void UpdateVisibility(Entity<CP14RoofComponent> ent, SpriteComponent sprite)
+    {
+        sprite.Visible = RoofVisibility;
+    }
+
+    public void UpdateRoofVisibilityAll()
+    {
+        var query = EntityQueryEnumerator<CP14RoofComponent, SpriteComponent>();
+        while (query.MoveNext(out var uid, out var marker, out var sprite))
+        {
+            UpdateVisibility((uid, marker), sprite);
+        }
+    }
+}
+
+internal sealed class ShowRoof : LocalizedCommands
+{
+    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+
+    public override string Command => "cp14_toggleroof";
+
+    public override string Help => "Toggle roof visibility";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var roofSystem = _entitySystemManager.GetEntitySystem<CP14RoofSystem>();
+        roofSystem.DisabledByCommand = !roofSystem.DisabledByCommand;
+        roofSystem.UpdateRoofVisibilityAll();
+    }
+}

Content.Client/_CP14/Shitcode/CP14EdSystem.cs

@@ -0,0 +1,17 @@
+using Robust.Shared;
+using Robust.Shared.Configuration;
+
+namespace Content.Client._CP14.Shitcode;
+
+/// <summary>
+/// Эта система - сборник разного мелкого барахла, который слишком мелкий чтобы иметь свои собственные системы. В идеале в будущем разнести по отдельным файлам.
+/// </summary>
+public sealed class CP14EdSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public override void Initialize()
+    {
+        _cfg.SetCVar(CVars.EntitiesCategoryFilter, "ForkFiltered");
+    }
+}

Content.Client/_CP14/Temperature/CP14ClientFireSpreadSystem.cs

@@ -0,0 +1,7 @@
+using Content.Shared._CP14.Temperature;
+
+namespace Content.Client._CP14.Temperature;
+
+public sealed partial class CP14ClientFireSpreadSystem : CP14SharedFireSpreadSystem
+{
+}

Content.Client/_CP14/TravelingStoreShip/CP14PriceControl.xaml

@@ -0,0 +1,22 @@
+<Control xmlns="https://spacestation14.io">
+        <GridContainer Columns="6">
+
+            <TextureRect Name="GoldView"
+                         MinSize="10 10"
+                         Stretch="KeepAspectCentered"/>
+            <Label Name="GoldText"
+                   Margin="0,0,5,0"/>
+
+            <TextureRect Name="SilverView"
+                         MinSize="10 10"
+                         Stretch="KeepAspectCentered"/>
+            <Label Name="SilverText"
+                   Margin="0,0,5,0"/>
+
+            <TextureRect Name="CopperView"
+                         MinSize="10 10"
+                         Stretch="KeepAspectCentered"/>
+            <Label Name="CopperText"
+                   Margin="0,0,5,0"/>
+        </GridContainer>
+</Control>

Content.Client/_CP14/TravelingStoreShip/CP14PriceControl.xaml.cs

@@ -0,0 +1,46 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client._CP14.TravelingStoreShip;
+
+[GenerateTypedNameReferences]
+public sealed partial class CP14PriceControl : Control
+{
+    [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    private readonly SpriteSystem _sprite;
+
+    public CP14PriceControl(int price)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _sprite = _entity.System<SpriteSystem>();
+
+        var rsiPath = new ResPath("_CP14/Interface/Misc/coins.rsi");
+
+        var total = price;
+
+        var gp = total / 100;
+        total %= 100;
+
+        var sp = total / 10;
+        total %= 10;
+
+        var cp = total;
+
+        CopperView.Texture = _sprite.Frame0(new SpriteSpecifier.Rsi(rsiPath, "c"));
+        CopperText.Text = cp.ToString();
+
+        SilverView.Texture = _sprite.Frame0(new SpriteSpecifier.Rsi(rsiPath, "s"));
+        SilverText.Text = sp.ToString();
+
+        GoldView.Texture = _sprite.Frame0(new SpriteSpecifier.Rsi(rsiPath, "g"));
+        GoldText.Text = gp.ToString();
+    }
+}

Content.Client/_CP14/TravelingStoreShip/CP14StoreBoundUserInterface.cs

@@ -0,0 +1,34 @@
+using Content.Shared._CP14.Cargo;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client._CP14.TravelingStoreShip;
+
+public sealed class CP14StoreBoundUserInterface : BoundUserInterface
+{
+    private CP14StoreWindow? _window;
+
+    public CP14StoreBoundUserInterface(EntityUid owner, [NotNull] Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = this.CreateWindow<CP14StoreWindow>();
+    }
+
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        switch (state)
+        {
+            case CP14StoreUiState storeState:
+                _window?.UpdateUI(storeState);
+                break;
+        }
+    }
+}

Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml

@@ -0,0 +1,16 @@
+<Control xmlns="https://spacestation14.io">
+    <Button Name="ProductButton" Access="Public">
+        <BoxContainer Orientation="Horizontal">
+            <TextureRect Name="View"
+                         MinSize="48 48"
+                         HorizontalAlignment="Left"
+                         VerticalAlignment="Top"
+                         Stretch="KeepAspectCentered" />
+            <BoxContainer Orientation="Vertical">
+                <RichTextLabel Name="SpecialLabel" Text="{Loc 'cp14-store-ui-tab-special'}" VerticalAlignment="Center" Access="Public" Visible="False" />
+                <RichTextLabel Name="ProductName" VerticalAlignment="Center" Access="Public" />
+            </BoxContainer>
+            <BoxContainer Name="PriceHolder" VerticalAlignment="Center" HorizontalExpand="True" HorizontalAlignment="Right" />
+        </BoxContainer>
+    </Button>
+</Control>

Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs

@@ -0,0 +1,35 @@
+using Content.Shared._CP14.Cargo;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client._CP14.TravelingStoreShip;
+
+[GenerateTypedNameReferences]
+public sealed partial class CP14StoreProductControl : Control
+{
+    [Dependency] private readonly IEntityManager _entity = default!;
+
+    private readonly SpriteSystem _sprite;
+
+    public CP14StoreProductControl(CP14StoreUiProductEntry entry)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _sprite = _entity.System<SpriteSystem>();
+
+        PriceHolder.RemoveAllChildren();
+        PriceHolder.AddChild(new CP14PriceControl(entry.Price));
+        ProductName.Text = $"[bold]{entry.Name}[/bold]";
+
+        SpecialLabel.Visible = entry.Special;
+        View.Texture = _sprite.Frame0(entry.Icon);
+    }
+
+    private void UpdateView(SpriteSpecifier spriteSpecifier)
+    {
+    }
+}

Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml

@@ -0,0 +1,31 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+               Title="{Loc 'cp14-store-ui-title'}"
+               MinSize="800 600"
+               SetSize="800 600">
+    <BoxContainer Orientation="Horizontal">
+        <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Horizontal">
+            <!-- Product list (left side UI) -->
+            <TabContainer SizeFlagsStretchRatio="0.5" Name="Tabs" HorizontalExpand="True" VerticalExpand="True" MinSize="0 200">
+                <ScrollContainer HorizontalExpand="True" VerticalExpand="True" MinSize="0 200">
+                    <BoxContainer Name="BuyProductsContainer" Orientation="Vertical" HorizontalExpand="True"/>
+                </ScrollContainer>
+                <ScrollContainer HorizontalExpand="True" VerticalExpand="True" MinSize="0 200">
+                    <BoxContainer Name="SellProductsContainer" Orientation="Vertical" HorizontalExpand="True"/>
+                </ScrollContainer>
+            </TabContainer>
+            <!-- Station trading data (right side UI) -->
+            <BoxContainer SizeFlagsStretchRatio="0.5" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="0 0 10 0">
+                <controls:StripeBack>
+                    <PanelContainer>
+                        <Label Text="{Loc 'cp14-store-ui-order'}" Align="Center" Margin="0 5 0 3"/>
+                    </PanelContainer>
+                </controls:StripeBack>
+                <Label Name="TravelTimeLabel" Text="00:00" HorizontalAlignment="Center" HorizontalExpand="True" Margin="0 15 0 0"/>
+                <controls:HLine Color="#404040" Thickness="2" Margin="0 5"/>
+                <RichTextLabel Name="SelectedName" HorizontalExpand="True" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="5"/>
+                <RichTextLabel Name="SelectedDesc" HorizontalExpand="True" VerticalExpand="True" VerticalAlignment="Top" Margin="5"/>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+</DefaultWindow>

Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs

@@ -0,0 +1,79 @@
+using Content.Shared._CP14.Cargo;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
+
+namespace Content.Client._CP14.TravelingStoreShip;
+
+[GenerateTypedNameReferences]
+public sealed partial class CP14StoreWindow : DefaultWindow
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    private TimeSpan? _nextTravelTime;
+    private bool _onStation;
+
+    public CP14StoreWindow()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        Tabs.SetTabTitle(0, Loc.GetString("cp14-store-ui-tab-buy"));
+        Tabs.SetTabTitle(1, Loc.GetString("cp14-store-ui-tab-sell"));
+    }
+
+    public void UpdateUI(CP14StoreUiState state)
+    {
+        UpdateProducts(state);
+
+        _nextTravelTime = state.NextTravelTime;
+        _onStation = state.OnStation;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        //Updating time
+        if (_nextTravelTime is not null)
+        {
+            var time = _nextTravelTime.Value - _timing.CurTime;
+
+            TravelTimeLabel.Text =
+                $"{Loc.GetString(_onStation ? "cp14-store-ui-next-travel-out" : "cp14-store-ui-next-travel-in")} {Math.Max(time.Minutes, 0):00}:{Math.Max(time.Seconds, 0):00}";
+        }
+    }
+
+    private void UpdateProducts(CP14StoreUiState state)
+    {
+        BuyProductsContainer.RemoveAllChildren();
+        SellProductsContainer.RemoveAllChildren();
+
+        foreach (var product in state.ProductsBuy)
+        {
+            var control = new CP14StoreProductControl(product);
+            control.ProductButton.OnPressed += _ =>
+            {
+                SelectProduct(product);
+            };
+            BuyProductsContainer.AddChild(control);
+        }
+
+        foreach (var product in state.ProductsSell)
+        {
+            var control = new CP14StoreProductControl(product);
+            control.ProductButton.OnPressed += _ =>
+            {
+                SelectProduct(product);
+            };
+            SellProductsContainer.AddChild(control);
+        }
+    }
+
+    private void SelectProduct(CP14StoreUiProductEntry? entry)
+    {
+        SelectedName.Text = entry is null ? string.Empty : $"[bold]{entry.Value.Name}[/bold]";
+        SelectedDesc.Text = entry is null ? string.Empty : entry.Value.Desc;
+    }
+}

Content.Client/_CP14/UserInterface/Systems/Knowledge/CP14KnowledgeUIController.cs

@@ -0,0 +1,158 @@
+using Content.Client._CP14.Knowledge;
+using Content.Client._CP14.UserInterface.Systems.Knowledge.Windows;
+using Content.Client.Gameplay;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Input;
+using JetBrains.Annotations;
+using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.UserInterface.Systems.Character;
+
+[UsedImplicitly]
+public sealed class CP14KnowledgeUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>,
+    IOnSystemChanged<ClientCP14KnowledgeSystem>
+{
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [UISystemDependency] private readonly ClientCP14KnowledgeSystem _knowledge = default!;
+
+    private CP14KnowledgeWindow? _window;
+
+    private MenuButton? KnowledgeButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.CP14KnowledgeButton;
+
+    public void OnStateEntered(GameplayState state)
+    {
+        DebugTools.Assert(_window == null);
+
+        _window = UIManager.CreateWindow<CP14KnowledgeWindow>();
+        LayoutContainer.SetAnchorPreset(_window, LayoutContainer.LayoutPreset.CenterTop);
+
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.CP14OpenKnowledgeMenu,
+                InputCmdHandler.FromDelegate(_ => ToggleWindow()))
+            .Register<CP14KnowledgeUIController>();
+    }
+
+    public void OnStateExited(GameplayState state)
+    {
+        if (_window != null)
+        {
+            _window.Dispose();
+            _window = null;
+        }
+
+        CommandBinds.Unregister<CP14KnowledgeUIController>();
+    }
+
+    public void OnSystemLoaded(ClientCP14KnowledgeSystem system)
+    {
+        system.OnKnowledgeUpdate += KnowledgeUpdated;
+        _player.LocalPlayerDetached += CharacterDetached;
+    }
+
+    public void OnSystemUnloaded(ClientCP14KnowledgeSystem system)
+    {
+        system.OnKnowledgeUpdate -= KnowledgeUpdated;
+        _player.LocalPlayerDetached -= CharacterDetached;
+    }
+
+    public void UnloadButton()
+    {
+        if (KnowledgeButton is null)
+            return;
+
+        KnowledgeButton.OnPressed -= KnowledgeButtonPressed;
+    }
+
+    public void LoadButton()
+    {
+        if (KnowledgeButton is null)
+            return;
+
+        KnowledgeButton.OnPressed += KnowledgeButtonPressed;
+
+        if (_window is null)
+            return;
+
+        _window.OnClose += DeactivateButton;
+        _window.OnOpen += ActivateButton;
+    }
+
+    private void DeactivateButton()
+    {
+        KnowledgeButton!.Pressed = false;
+    }
+
+    private void ActivateButton()
+    {
+        KnowledgeButton!.Pressed = true;
+    }
+
+    private void KnowledgeUpdated(ClientCP14KnowledgeSystem.KnowledgeData data)
+    {
+        if (_window is null)
+            return;
+
+        _window.KnowledgeContent.RemoveAllChildren();
+
+        var (entity, allKnowledge) = data;
+
+        foreach (var knowledge in allKnowledge)
+        {
+            if (!_proto.TryIndex(knowledge, out var indexedKnowledge))
+                continue;
+
+            var knowledgeButton = new Button()
+            {
+                Access = AccessLevel.Public,
+                Text = Loc.GetString(indexedKnowledge.Name),
+                ToolTip = Loc.GetString(indexedKnowledge.Desc),
+                TextAlign = Label.AlignMode.Center,
+            };
+
+            _window.KnowledgeContent.AddChild(knowledgeButton);
+        }
+    }
+
+    private void CharacterDetached(EntityUid uid)
+    {
+        CloseWindow();
+    }
+
+    private void KnowledgeButtonPressed(BaseButton.ButtonEventArgs args)
+    {
+        ToggleWindow();
+    }
+
+    private void CloseWindow()
+    {
+        _window?.Close();
+    }
+
+    private void ToggleWindow()
+    {
+        if (_window == null)
+            return;
+
+        if (KnowledgeButton != null)
+        {
+            KnowledgeButton.SetClickPressed(!_window.IsOpen);
+        }
+
+        if (_window.IsOpen)
+        {
+            CloseWindow();
+        }
+        else
+        {
+            _knowledge.RequestKnowledgeInfo();
+            _window.Open();
+        }
+    }
+}

Content.Client/_CP14/UserInterface/Systems/Knowledge/Windows/CP14KnowledgeWindow.xaml

@@ -0,0 +1,13 @@
+<windows:CP14KnowledgeWindow
+    xmlns="https://spacestation14.io"
+    xmlns:cc="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:windows="clr-namespace:Content.Client._CP14.UserInterface.Systems.Knowledge.Windows"
+    Title="{Loc 'cp14-knowledge-info-title'}"
+    MinWidth="400"
+    MinHeight="200">
+    <ScrollContainer>
+        <BoxContainer Name="KnowledgeContent" Margin="5" Access="Public" Orientation="Vertical">
+
+        </BoxContainer>
+    </ScrollContainer>
+</windows:CP14KnowledgeWindow>

Content.Client/_CP14/UserInterface/Systems/Knowledge/Windows/CP14KnowledgeWindow.xaml.cs

@@ -0,0 +1,14 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._CP14.UserInterface.Systems.Knowledge.Windows;
+
+[GenerateTypedNameReferences]
+public sealed partial class CP14KnowledgeWindow : DefaultWindow
+{
+    public CP14KnowledgeWindow()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}

Content.Client/_CP14/Wallpaper/CP14ClientWallpaperSystem.cs

@@ -0,0 +1,55 @@
+using Content.Client.IconSmoothing;
+using Content.Shared._CP14.Wallpaper;
+using Content.Shared.IconSmoothing;
+using Robust.Client.GameObjects;
+
+namespace Content.Client._CP14.Wallpaper;
+
+public sealed class CP14ClientWallpaperSystem : CP14SharedWallpaperSystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<CP14WallpaperHolderComponent, AfterAutoHandleStateEvent>(OnHandleState, after: new[] { typeof(IconSmoothSystem), typeof(SharedRandomIconSmoothSystem), typeof(ClientRandomIconSmoothSystem) });
+        SubscribeLocalEvent<CP14WallpaperHolderComponent, ComponentStartup>(OnStartup, after: new[] { typeof(IconSmoothSystem), typeof(SharedRandomIconSmoothSystem), typeof(ClientRandomIconSmoothSystem) });
+    }
+
+    private void OnStartup(Entity<CP14WallpaperHolderComponent> holder, ref ComponentStartup args)
+    {
+        if (!TryComp<SpriteComponent>(holder, out var sprite))
+            return;
+
+        UpdateVisuals(holder, sprite);
+    }
+
+    private void OnHandleState(Entity<CP14WallpaperHolderComponent> holder, ref AfterAutoHandleStateEvent args)
+    {
+        if (!TryComp<SpriteComponent>(holder, out var sprite))
+            return;
+
+        UpdateVisuals(holder, sprite);
+    }
+
+    private static void UpdateVisuals(Entity<CP14WallpaperHolderComponent> holder, SpriteComponent sprite)
+    {
+        //Remove old layers
+        foreach (var key in holder.Comp.RevealedLayers)
+        {
+            sprite.RemoveLayer(key);
+        }
+
+        holder.Comp.RevealedLayers.Clear();
+
+        //Add new layers
+        var counter = 0;
+        foreach (var wallpaper in holder.Comp.Layers)
+        {
+            var keyCode = $"wallpaper-layer-{counter}";
+            holder.Comp.RevealedLayers.Add(keyCode);
+
+            var index = sprite.LayerMapReserveBlank(keyCode);
+
+            sprite.LayerSetSprite(index, wallpaper);
+            counter++;
+        }
+    }
+}

Content.Client/_CP14/Wave/CP14WaveShaderComponent.cs

@@ -0,0 +1,15 @@
+namespace Content.Client._CP14.Wave;
+
+[RegisterComponent]
+[Access(typeof(CP14WaveShaderSystem))]
+public sealed partial class CP14WaveShaderComponent : Component
+{
+    [DataField]
+    public float Speed = 10f;
+
+    [DataField]
+    public float Dis = 10f;
+
+    [DataField]
+    public float Offset = 0f;
+}

Content.Client/_CP14/Wave/CP14WaveShaderSystem.cs

@@ -0,0 +1,63 @@
+using Content.Shared._CP14.Configuration;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Placement;
+using Robust.Client.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Client._CP14.Wave;
+
+public sealed class CP14WaveShaderSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    private ShaderInstance _shader = default!;
+    private bool _enabled;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _shader = _protoMan.Index<ShaderPrototype>("Wave").InstanceUnique();
+        _enabled = _configuration.GetCVar(CP14ConfigVars.WaveShaderEnabled);
+
+        SubscribeLocalEvent<CP14WaveShaderComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<CP14WaveShaderComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<CP14WaveShaderComponent, BeforePostShaderRenderEvent>(OnBeforeShaderPost);
+    }
+
+    private void OnStartup(Entity<CP14WaveShaderComponent> entity, ref ComponentStartup args)
+    {
+        entity.Comp.Offset = _random.NextFloat(0, 1000);
+        SetShader(entity.Owner, _shader);
+    }
+
+    private void OnShutdown(Entity<CP14WaveShaderComponent> entity, ref ComponentShutdown args)
+    {
+        SetShader(entity.Owner, null);
+    }
+
+    private void SetShader(Entity<SpriteComponent?> entity, ShaderInstance? instance)
+    {
+        if (!Resolve(entity, ref entity.Comp, false) || !_enabled)
+            return;
+
+        entity.Comp.PostShader = instance;
+        entity.Comp.GetScreenTexture = instance is not null;
+        entity.Comp.RaiseShaderEvent = instance is not null;
+    }
+
+    private void OnBeforeShaderPost(Entity<CP14WaveShaderComponent> entity, ref BeforePostShaderRenderEvent args)
+    {
+        if (!_enabled)
+            return;
+
+        _shader.SetParameter("Speed", entity.Comp.Speed);
+        _shader.SetParameter("Dis", entity.Comp.Dis);
+        _shader.SetParameter("Offset", entity.Comp.Offset);
+    }
+}

Content.Client/_CP14/Workbench/CP14WorkbenchBoundUserInterface.cs

@@ -0,0 +1,48 @@
+/*
+ * This file is sublicensed under MIT License
+ * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
+ */
+
+using Content.Shared._CP14.Workbench;
+using Robust.Client.UserInterface;
+
+namespace Content.Client._CP14.Workbench;
+
+public sealed class CP14WorkbenchBoundUserInterface : BoundUserInterface
+{
+    private CP14WorkbenchWindow? _window;
+
+    [ViewVariables]
+    private string _search = string.Empty;
+
+    public CP14WorkbenchBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = this.CreateWindow<CP14WorkbenchWindow>();
+
+        _window.OnCraft += entry => SendMessage(new CP14WorkbenchUiCraftMessage(entry.ProtoId));
+
+        _window.OnTextUpdated += search =>
+        {
+            _search = search.Trim().ToLowerInvariant();
+            _window.UpdateFilter(_search);
+        };
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        switch (state)
+        {
+            case CP14WorkbenchUiRecipesState recipesState:
+                _window?.UpdateRecipes(recipesState, _search);
+                break;
+        }
+    }
+}

Content.Client/_CP14/Workbench/CP14WorkbenchRecipeControl.xaml

@@ -0,0 +1,14 @@
+<Control xmlns="https://spacestation14.io">
+    <Button Name="Button">
+        <GridContainer Columns="2">
+            <EntityPrototypeView Name="View"
+                                 Margin="0,0,4,0"
+                                 MinSize="48 48"
+                                 MaxSize="48 48"
+                                 Scale="2,2"
+                                 HorizontalAlignment="Center"
+                                 VerticalExpand="True"/>
+            <Label Name="Name"/>
+        </GridContainer>
+    </Button>
+</Control>

Content.Client/_CP14/Workbench/CP14WorkbenchRecipeControl.xaml.cs

@@ -0,0 +1,49 @@
+/*
+ * This file is sublicensed under MIT License
+ * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
+ */
+
+using Content.Shared._CP14.Workbench;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._CP14.Workbench;
+
+[GenerateTypedNameReferences]
+public sealed partial class CP14WorkbenchRequirementControl : Control
+{
+    [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+
+    private readonly SpriteSystem _sprite;
+
+    public CP14WorkbenchRequirementControl()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _sprite = _entity.System<SpriteSystem>();
+    }
+
+    public CP14WorkbenchRequirementControl(CP14WorkbenchCraftRequirement requirement) : this()
+    {
+        Name.Text = requirement.GetRequirementTitle(_proto);
+
+        var texture = requirement.GetRequirementTexture(_proto);
+        if (texture is not null)
+        {
+            View.Visible = true;
+            View.Texture = _sprite.Frame0(texture);
+        }
+
+        var entityView = requirement.GetRequirementEntityView(_proto);
+        if (entityView is not null)
+        {
+            EntityView.Visible = true;
+            EntityView.SetPrototype(entityView);
+        }
+    }
+}

Content.Client/_CP14/Workbench/CP14WorkbenchRequirementControl.xaml

@@ -0,0 +1,22 @@
+<Control xmlns="https://spacestation14.io">
+    <GridContainer Columns="2">
+        <EntityPrototypeView
+            Name="EntityView"
+            Margin="0,0,4,0"
+            MinSize="48 48"
+            MaxSize="48 48"
+            Scale="2,2"
+            HorizontalAlignment="Left"
+            Visible="False"
+            VerticalExpand="True" />
+        <TextureRect
+            Name="View"
+            Margin="0,0,4,0"
+            MinSize="48 48"
+            MaxSize="48 48"
+            HorizontalAlignment="Left"
+            Visible="False"
+            Stretch="KeepAspectCentered" />
+        <Label Name="Name" />
+    </GridContainer>
+</Control>

Content.Client/_CP14/Workbench/CP14WorkbenchRequirementControl.xaml.cs

@@ -0,0 +1,65 @@
+/*
+ * This file is sublicensed under MIT License
+ * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
+ */
+
+using Content.Shared._CP14.Workbench;
+using Content.Shared._CP14.Workbench.Prototypes;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._CP14.Workbench;
+
+[GenerateTypedNameReferences]
+public sealed partial class CP14WorkbenchRecipeControl : Control
+{
+    [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public event Action<CP14WorkbenchUiRecipesEntry, CP14WorkbenchRecipePrototype>? OnSelect;
+
+    private readonly SpriteSystem _sprite;
+
+    private readonly CP14WorkbenchRecipePrototype _recipePrototype;
+    private readonly bool _craftable;
+
+    public CP14WorkbenchRecipeControl(CP14WorkbenchUiRecipesEntry entry)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _sprite = _entity.System<SpriteSystem>();
+
+        _recipePrototype = _prototype.Index(entry.ProtoId);
+        _craftable = entry.Craftable;
+
+        Button.OnPressed += _ => OnSelect?.Invoke(entry, _recipePrototype);
+
+        UpdateColor();
+        UpdateName();
+        UpdateView();
+    }
+
+    private void UpdateColor()
+    {
+        if (_craftable)
+            return;
+
+        Button.ModulateSelfOverride = Color.FromHex("#302622");
+    }
+
+    private void UpdateName()
+    {
+        var result = _prototype.Index(_recipePrototype.Result);
+        var counter = _recipePrototype.ResultCount > 1 ? $" x{_recipePrototype.ResultCount}" : "";
+        Name.Text = $"{Loc.GetString(result.Name)} {counter}" ;
+    }
+
+    private void UpdateView()
+    {
+        View.SetPrototype(_recipePrototype.Result);
+    }
+}

Content.Client/_CP14/Workbench/CP14WorkbenchWindow.xaml

@@ -0,0 +1,69 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+               Title="{Loc 'cp14-workbench-ui-title'}"
+               SetSize="700 500"
+               MinSize="700 300">
+    <BoxContainer Orientation="Horizontal">
+        <!-- Main -->
+        <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Horizontal">
+            <!-- Product list (left side UI) -->
+            <BoxContainer SizeFlagsStretchRatio="0.5" HorizontalExpand="True" Orientation="Vertical" Margin="0 0 10 0">
+                <!-- Search Bar -->
+                <LineEdit Name="SearchBar" Margin="4" PlaceHolder="Search" HorizontalExpand="True" />
+                <!-- Crafts container -->
+                <ScrollContainer HorizontalExpand="True" VerticalExpand="True" MinSize="0 200">
+                    <BoxContainer Name="CraftsContainer" Orientation="Vertical" HorizontalExpand="True" />
+                </ScrollContainer>
+            </BoxContainer>
+
+            <!-- Craft view (right side UI) -->
+            <BoxContainer SizeFlagsStretchRatio="0.5" Orientation="Vertical" HorizontalExpand="True"
+                          VerticalExpand="True">
+                <PanelContainer HorizontalExpand="True" VerticalExpand="True">
+                    <!-- Background -->
+                    <PanelContainer.PanelOverride>
+                        <graphics:StyleBoxFlat BackgroundColor="#41332f" />
+                    </PanelContainer.PanelOverride>
+
+                    <!-- Content -->
+                    <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical">
+                        <!-- Item info -->
+                        <!-- icon -->
+                        <EntityPrototypeView Name="ItemView"
+                                             Scale="2,2"
+                                             Margin="0,0,4,0"
+                                             MinSize="64 64"
+                                             MaxSize="64 64"
+                                             HorizontalAlignment="Left" />
+
+                        <!-- name & description -->
+                        <BoxContainer Margin="5 0 0 0" HorizontalExpand="True" VerticalExpand="True"
+                                      Orientation="Vertical">
+                            <RichTextLabel Name="ItemName" Margin="5" />
+                            <RichTextLabel Name="ItemDescription" Margin="5" />
+                        </BoxContainer>
+
+                        <controls:HLine Color="#404040" Thickness="2" Margin="0 5" />
+
+                        <!-- Required title -->
+                        <Label Margin="5 0 0 0" Text="{Loc 'cp14-workbench-recipe-list'}" />
+
+                        <!-- Craft requirements content -->
+                        <!-- Added by code -->
+                        <BoxContainer
+                            Margin="5 0 0 0"
+                            Name="ItemRequirements"
+                            Orientation="Vertical" VerticalExpand="True"
+                            HorizontalExpand="True" />
+
+                        <controls:HLine Color="#404040" Thickness="5" Margin="0 5" />
+
+                        <!-- Craft button -->
+                        <Button Name="CraftButton" Text="{Loc 'cp14-workbench-craft'}" />
+                    </BoxContainer>
+                </PanelContainer>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+</DefaultWindow>

Content.Client/_CP14/Workbench/CP14WorkbenchWindow.xaml.cs

@@ -0,0 +1,130 @@
+/*
+ * This file is sublicensed under MIT License
+ * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
+ */
+
+using Content.Shared._CP14.Workbench;
+using Content.Shared._CP14.Workbench.Prototypes;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._CP14.Workbench;
+
+[GenerateTypedNameReferences]
+public sealed partial class CP14WorkbenchWindow : DefaultWindow
+{
+    [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    private CP14WorkbenchUiRecipesState? _cachedState;
+
+    public event Action<CP14WorkbenchUiRecipesEntry>? OnCraft;
+    public event Action<string>? OnTextUpdated;
+
+    private CP14WorkbenchUiRecipesEntry? _selectedEntry;
+
+    public CP14WorkbenchWindow()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        SearchBar.OnTextChanged += _ =>
+        {
+            OnTextUpdated?.Invoke(SearchBar.Text);
+        };
+        CraftButton.OnPressed += _ =>
+        {
+            if (_selectedEntry is null)
+                return;
+
+            OnCraft?.Invoke(_selectedEntry.Value);
+        };
+    }
+
+    public void UpdateFilter(string? search)
+    {
+        if (_cachedState is null)
+            return;
+
+        UpdateRecipes(_cachedState, search);
+    }
+
+    public void UpdateRecipes(CP14WorkbenchUiRecipesState recipesState, string? search = null)
+    {
+        _cachedState = recipesState;
+        CraftsContainer.RemoveAllChildren();
+
+        List<CP14WorkbenchUiRecipesEntry> uncraftableList = new();
+        foreach (var entry in recipesState.Recipes)
+        {
+            if (search is not null && search != "")
+            {
+                if (!_prototype.TryIndex(entry.ProtoId, out var indexedEntry))
+                    continue;
+
+                if (!_prototype.TryIndex(indexedEntry.Result, out var indexedResult))
+                    continue;
+
+                if (!indexedResult.Name.Contains(search))
+                    continue;
+            }
+
+            if (entry.Craftable)
+            {
+                var control = new CP14WorkbenchRecipeControl(entry);
+                control.OnSelect += RecipeSelect;
+                CraftsContainer.AddChild(control);
+            }
+            else
+                uncraftableList.Add(entry);
+        }
+
+        foreach (var entry in uncraftableList)
+        {
+            var control = new CP14WorkbenchRecipeControl(entry);
+            control.OnSelect += RecipeSelect;
+            CraftsContainer.AddChild(control);
+        }
+
+        if (_selectedEntry is not null && recipesState.Recipes.Contains(_selectedEntry.Value))
+        {
+            RecipeSelect(_selectedEntry.Value, _prototype.Index(_selectedEntry.Value.ProtoId));
+            return;
+        }
+
+        RecipeSelect(recipesState);
+    }
+
+    private void RecipeSelect(CP14WorkbenchUiRecipesState recipesState)
+    {
+        foreach (var entry in recipesState.Recipes)
+        {
+            RecipeSelect(entry, _prototype.Index(entry.ProtoId));
+            break;
+        }
+    }
+
+    private void RecipeSelect(CP14WorkbenchUiRecipesEntry entry, CP14WorkbenchRecipePrototype recipe)
+    {
+        _selectedEntry = entry;
+
+        var result = _prototype.Index(recipe.Result);
+
+        ItemView.SetPrototype(recipe.Result);
+        var counter = recipe.ResultCount > 1 ? $" x{recipe.ResultCount}" : "";
+        ItemName.Text = result.Name + counter;
+        ItemDescription.Text = result.Description;
+
+        ItemRequirements.RemoveAllChildren();
+
+        foreach (var requirement in recipe.Requirements)
+        {
+            ItemRequirements.AddChild(new CP14WorkbenchRequirementControl(requirement));
+        }
+
+        CraftButton.Disabled = !entry.Craftable;
+    }
+}

Content.Client/_CP14/WorldSprite/CP14WorldSpriteComponent.cs

@@ -0,0 +1,10 @@
+namespace Content.Client._CP14.WorldSprite;
+
+/// <summary>
+/// RUN, IF YOU SEE THE CODE TO THIS FUCKING THING, YOU'LL DIE ON THE SPOT.
+/// </summary>
+[RegisterComponent]
+public sealed partial class CP14WorldSpriteComponent : Component
+{
+    public bool Inited;
+}

Content.Client/_CP14/WorldSprite/CP14WorldSpriteSystem.cs

@@ -0,0 +1,65 @@
+using Content.Shared._CP14.WorldSprite;
+using Content.Shared.Throwing;
+using Robust.Client.GameObjects;
+using Robust.Shared.Map.Components;
+
+namespace Content.Client._CP14.WorldSprite;
+
+public sealed class CP14WorldSpriteSystem : EntitySystem
+{
+    [Dependency] private readonly AppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+#if DEBUG
+        SubscribeLocalEvent<CP14WorldSpriteComponent, ComponentInit>(OnComponentInit);
+#endif
+
+        SubscribeLocalEvent<CP14WorldSpriteComponent, EntParentChangedMessage>(OnParentChanged);
+        SubscribeLocalEvent<CP14WorldSpriteComponent, ThrownEvent>(OnThrown);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<CP14WorldSpriteComponent>();
+        while (query.MoveNext(out var uid, out var worldSpriteComponent))
+        {
+            if (worldSpriteComponent.Inited)
+                continue;
+
+            Update(uid);
+        }
+    }
+
+#if DEBUG
+    private void OnComponentInit(Entity<CP14WorldSpriteComponent> entity, ref ComponentInit args)
+    {
+        if (!HasComp<AppearanceComponent>(entity))
+            Log.Error($"Requires an {nameof(AppearanceComponent)} for {entity}");
+    }
+#endif
+
+    private void OnParentChanged(Entity<CP14WorldSpriteComponent> entity, ref EntParentChangedMessage args)
+    {
+        Update(entity);
+    }
+
+    private void OnThrown(Entity<CP14WorldSpriteComponent> entity, ref ThrownEvent args)
+    {
+        // Idk, but throw don't call reparent
+        Update(entity, args.User);
+    }
+
+    private void Update(EntityUid entity, EntityUid? parent = null)
+    {
+        parent ??= Transform(entity).ParentUid;
+
+        var inWorld = HasComp<MapComponent>(parent) || HasComp<MapGridComponent>(parent);
+
+        _appearance.SetData(entity, WorldSpriteVisualLayers.Layer, inWorld);
+    }
+}

Content.IntegrationTests/Tests/Access/AccessReaderTest.cs

@@ -12,6 +12,7 @@ namespace Content.IntegrationTests.Tests.Access
     [TestOf(typeof(AccessReaderComponent))]
     public sealed class AccessReaderTest
     {
+        /*
         [Test]
         public async Task TestProtoTags()
         {
@@ -123,6 +124,6 @@ namespace Content.IntegrationTests.Tests.Access
             });
             await pair.CleanReturnAsync();
         }
-
+    */
     }
 }

Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs

@@ -6,7 +6,7 @@ namespace Content.IntegrationTests.Tests.Atmos
     [TestFixture]
     [TestOf(typeof(AtmosAlarmThreshold))]
     public sealed class AlarmThresholdTest
-    {
+    {/*
         [TestPrototypes]
         private const string Prototypes = @"
 - type: alarmThreshold
@@ -135,6 +135,6 @@ namespace Content.IntegrationTests.Tests.Atmos
                 }
             });
             await pair.CleanReturnAsync();
-        }
+        }*/
     }
 }

Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs

@@ -8,7 +8,7 @@ namespace Content.IntegrationTests.Tests.Atmos
     [TestFixture]
     [TestOf(typeof(Atmospherics))]
     public sealed class ConstantsTest
-    {
+    {/*
         [Test]
         public async Task TotalGasesTest()
         {
@@ -27,6 +27,6 @@ namespace Content.IntegrationTests.Tests.Atmos
                 });
             });
             await pair.CleanReturnAsync();
-        }
+        }*/
     }
 }

Content.IntegrationTests/Tests/Atmos/GasMixtureTest.cs

@@ -8,7 +8,7 @@ namespace Content.IntegrationTests.Tests.Atmos
     [TestFixture]
     [TestOf(typeof(GasMixture))]
     public sealed class GasMixtureTest
-    {
+    {/*
         [Test]
         public async Task TestMerge()
         {
@@ -105,6 +105,6 @@ namespace Content.IntegrationTests.Tests.Atmos
             });
 
             await pair.CleanReturnAsync();
-        }
+        }*/
     }
 }

Content.IntegrationTests/Tests/Atmos/GridJoinTest.cs

@@ -8,7 +8,7 @@ namespace Content.IntegrationTests.Tests.Atmos;
 
 [TestFixture]
 public sealed class GridJoinTest
-{
+{/*
     private const string CanisterProtoId = "AirCanister";
 
     [Test]
@@ -49,5 +49,5 @@ public sealed class GridJoinTest
         });
 
         await pair.CleanReturnAsync();
-    }
+    }*/
 }

Content.IntegrationTests/Tests/CargoTest.cs

@@ -17,7 +17,7 @@ namespace Content.IntegrationTests.Tests;
 
 [TestFixture]
 public sealed class CargoTest
-{
+{/*
     private static readonly HashSet<ProtoId<CargoProductPrototype>> Ignored =
     [
         // This is ignored because it is explicitly intended to be able to sell for more than it costs.
@@ -248,5 +248,5 @@ public sealed class CargoTest
         });
 
         await pair.CleanReturnAsync();
-    }
+    }*/
 }

Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs

@@ -168,7 +168,7 @@ public sealed class SuicideCommandTests
         await pair.CleanReturnAsync();
     }
 
-    /// <summary>
+        /// <summary>
     /// Run the suicide command in the console
     /// Should only ghost the player but not kill them
     /// </summary>
@@ -241,7 +241,6 @@ public sealed class SuicideCommandTests
         var mindSystem = entManager.System<SharedMindSystem>();
         var mobStateSystem = entManager.System<MobStateSystem>();
         var transformSystem = entManager.System<TransformSystem>();
-        var damageableSystem = entManager.System<DamageableSystem>();
 
         // We need to know the player and whether they can be hurt, killed, and whether they have a mind
         var player = playerMan.Sessions.First().AttachedEntity!.Value;
@@ -277,8 +276,6 @@ public sealed class SuicideCommandTests
         // and that all the damage is concentrated in the Slash category
         await server.WaitAssertion(() =>
         {
-            // Heal all damage first (possible low pressure damage taken)
-            damageableSystem.SetAllDamage(player, damageableComp, 0);
             consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
             var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();
 
@@ -316,7 +313,6 @@ public sealed class SuicideCommandTests
         var mindSystem = entManager.System<SharedMindSystem>();
         var mobStateSystem = entManager.System<MobStateSystem>();
         var transformSystem = entManager.System<TransformSystem>();
-        var damageableSystem = entManager.System<DamageableSystem>();
 
         // We need to know the player and whether they can be hurt, killed, and whether they have a mind
         var player = playerMan.Sessions.First().AttachedEntity!.Value;
@@ -352,8 +348,6 @@ public sealed class SuicideCommandTests
         // and that slash damage is split in half
         await server.WaitAssertion(() =>
         {
-            // Heal all damage first (possible low pressure damage taken)
-            damageableSystem.SetAllDamage(player, damageableComp, 0);
             consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
             var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();
 

Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs

@@ -18,7 +18,7 @@ namespace Content.IntegrationTests.Tests.Disposal
     [TestOf(typeof(DisposalEntryComponent))]
     [TestOf(typeof(DisposalUnitComponent))]
     public sealed class DisposalUnitTest
-    {
+    {/*
         [Reflect(false)]
         private sealed class DisposalUnitTestSystem : EntitySystem
         {
@@ -242,6 +242,6 @@ namespace Content.IntegrationTests.Tests.Disposal
             });
 
             await pair.CleanReturnAsync();
-        }
+        }*/
     }
 }

Content.IntegrationTests/Tests/Doors/AirlockPryingTest.cs

@@ -6,6 +6,7 @@ namespace Content.IntegrationTests.Tests.Doors;
 
 public sealed class AirlockPryingTest : InteractionTest
 {
+    /* CP14 Crowbar door prying disabled
     [Test]
     public async Task PoweredClosedAirlock_Pry_DoesNotOpen()
     {
@@ -81,4 +82,5 @@ public sealed class AirlockPryingTest : InteractionTest
 
         Assert.That(doorComp.State, Is.EqualTo(DoorState.Closing), "Unpowered airlock failed to pry closed.");
     }
+    */
 }

Content.IntegrationTests/Tests/EncryptionKeys/RemoveEncryptionKeys.cs

@@ -6,7 +6,7 @@ using Content.Shared.Wires;
 namespace Content.IntegrationTests.Tests.EncryptionKeys;
 
 public sealed class RemoveEncryptionKeys : InteractionTest
-{
+{/*
     [Test]
     public async Task HeadsetKeys()
     {
@@ -108,5 +108,5 @@ public sealed class RemoveEncryptionKeys : InteractionTest
         AssertPrototype("TelecomServerFilled");
         await InteractUsing(Pry);
         AssertPrototype("MachineFrame");
-    }
+    }*/
 }