From ab6726136f452dc4372a5cc8d1d5dcabf65024b3 Mon Sep 17 00:00:00 2001
From: Kara <lunarautomaton6@gmail.com>
Date: Mon, 25 Dec 2023 13:50:10 -0700
Subject: [PATCH 01/10] Optimize artifact analyzer UI state sending (#22949)

* Remove n rename cruft old shit

* Artifact analyzer UI updating optimization

* Revert "Remove n rename cruft old shit"

This reverts commit 8789338fb20f77d79c5b0e40719896efe0103fcc.
---
 .../Ui/AnalysisConsoleBoundUserInterface.cs   |  1 +
 .../Ui/AnalysisConsoleMenu.xaml.cs            | 34 +++++++++++++++----
 .../Systems/ArtifactAnalyzerSystem.cs         |  9 ++---
 .../Equipment/SharedArtifactAnalyzer.cs       |  8 ++---
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
index 9039a2e831..143f01b6b7 100644
--- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
+++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
@@ -61,6 +61,7 @@ public sealed class AnalysisConsoleBoundUserInterface : BoundUserInterface
 
         if (!disposing)
             return;
+
         _consoleMenu?.Dispose();
     }
 }
diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
index 1a8ba6c8c9..5031a3d99c 100644
--- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
+++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
@@ -4,6 +4,7 @@ using Content.Shared.Xenoarchaeology.Equipment;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Xenoarchaeology.Ui;
@@ -12,11 +13,17 @@ namespace Content.Client.Xenoarchaeology.Ui;
 public sealed partial class AnalysisConsoleMenu : FancyWindow
 {
     [Dependency] private readonly IEntityManager _ent = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
     public event Action? OnServerSelectionButtonPressed;
     public event Action? OnScanButtonPressed;
     public event Action? OnPrintButtonPressed;
     public event Action? OnExtractButtonPressed;
 
+    // For rendering the progress bar, updated from BUI state
+    private TimeSpan? _startTime;
+    private TimeSpan? _totalTime;
+
     public AnalysisConsoleMenu()
     {
         RobustXamlLoader.Load(this);
@@ -28,6 +35,23 @@ public sealed partial class AnalysisConsoleMenu : FancyWindow
         ExtractButton.OnPressed += _ => OnExtractButtonPressed?.Invoke();
     }
 
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (_startTime is not { } start || _totalTime is not { } total)
+            return;
+
+        var remaining = start + total - _timing.CurTime;
+        var secsText = Math.Max((int) remaining.TotalSeconds, 0);
+
+        ProgressLabel.Text = Loc.GetString("analysis-console-progress-text",
+            ("seconds", secsText));
+
+        // 1.0 - div because we want it to tick up not down
+        ProgressBar.Value = Math.Clamp(1.0f - (float) remaining.Divide(total), 0.0f, 1.0f);
+    }
+
     public void SetButtonsDisabled(AnalysisConsoleScanUpdateState state)
     {
         ScanButton.Disabled = !state.CanScan;
@@ -54,8 +78,8 @@ public sealed partial class AnalysisConsoleMenu : FancyWindow
             ArtifactDisplay.Visible = false;
             return;
         }
-        ArtifactDisplay.Visible = true;
 
+        ArtifactDisplay.Visible = true;
         ArtifactDisplay.SetEntity(uid);
     }
 
@@ -95,12 +119,8 @@ public sealed partial class AnalysisConsoleMenu : FancyWindow
         ProgressBar.Visible = state.Scanning;
         ProgressLabel.Visible = state.Scanning;
 
-        if (!state.Scanning)
-            return;
-
-        ProgressLabel.Text = Loc.GetString("analysis-console-progress-text",
-            ("seconds", (int) state.TotalTime.TotalSeconds - (int) state.TimeRemaining.TotalSeconds));
-        ProgressBar.Value = (float) state.TimeRemaining.Divide(state.TotalTime);
+        _startTime = state.StartTime;
+        _totalTime = state.TotalTime;
     }
 }
 
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
index 17e801cc18..500546c033 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
@@ -79,9 +79,6 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
         var query = EntityQueryEnumerator<ActiveArtifactAnalyzerComponent, ArtifactAnalyzerComponent>();
         while (query.MoveNext(out var uid, out var active, out var scan))
         {
-            if (scan.Console != null)
-                UpdateUserInterface(scan.Console.Value);
-
             if (_timing.CurTime - active.StartTime < scan.AnalysisDuration * scan.AnalysisDurationMulitplier)
                 continue;
 
@@ -191,7 +188,7 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
 
         EntityUid? artifact = null;
         FormattedMessage? msg = null;
-        var totalTime = TimeSpan.Zero;
+        TimeSpan? totalTime = null;
         var canScan = false;
         var canPrint = false;
         var points = 0;
@@ -212,10 +209,9 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
         var serverConnected = TryComp<ResearchClientComponent>(uid, out var client) && client.ConnectedToServer;
 
         var scanning = TryComp<ActiveArtifactAnalyzerComponent>(component.AnalyzerEntity, out var active);
-        var remaining = active != null ? _timing.CurTime - active.StartTime : TimeSpan.Zero;
 
         var state = new AnalysisConsoleScanUpdateState(GetNetEntity(artifact), analyzerConnected, serverConnected,
-            canScan, canPrint, msg, scanning, remaining, totalTime, points);
+            canScan, canPrint, msg, scanning, active?.StartTime, totalTime, points);
 
         var bui = _ui.GetUi(uid, ArtifactAnalzyerUiKey.Key);
         _ui.SetUiState(bui, state);
@@ -256,6 +252,7 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
 
         var activeArtifact = EnsureComp<ActiveScannedArtifactComponent>(ent.Value);
         activeArtifact.Scanner = component.AnalyzerEntity.Value;
+        UpdateUserInterface(uid, component);
     }
 
     private void OnPrintButton(EntityUid uid, AnalysisConsoleComponent component, AnalysisConsolePrintButtonPressedMessage args)
diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzer.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzer.cs
index 151bea990f..a36effaf5e 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzer.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzer.cs
@@ -46,14 +46,14 @@ public sealed class AnalysisConsoleScanUpdateState : BoundUserInterfaceState
 
     public bool Scanning;
 
-    public TimeSpan TimeRemaining;
+    public TimeSpan? StartTime;
 
-    public TimeSpan TotalTime;
+    public TimeSpan? TotalTime;
 
     public int PointAmount;
 
     public AnalysisConsoleScanUpdateState(NetEntity? artifact, bool analyzerConnected, bool serverConnected, bool canScan, bool canPrint,
-        FormattedMessage? scanReport, bool scanning, TimeSpan timeRemaining, TimeSpan totalTime, int pointAmount)
+        FormattedMessage? scanReport, bool scanning, TimeSpan? startTime, TimeSpan? totalTime, int pointAmount)
     {
         Artifact = artifact;
         AnalyzerConnected = analyzerConnected;
@@ -64,7 +64,7 @@ public sealed class AnalysisConsoleScanUpdateState : BoundUserInterfaceState
         ScanReport = scanReport;
 
         Scanning = scanning;
-        TimeRemaining = timeRemaining;
+        StartTime = startTime;
         TotalTime = totalTime;
 
         PointAmount = pointAmount;

From cde532bfa4cc04b454967ade5cddd45e0cb7326a Mon Sep 17 00:00:00 2001
From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Date: Mon, 25 Dec 2023 23:33:20 +0100
Subject: [PATCH 02/10] fixed the sulfacid issue, made some more chems use the
 industrial chems (#22981)

---
 Resources/Prototypes/Recipes/Reactions/chemicals.yml |  1 +
 Resources/Prototypes/Recipes/Reactions/cleaning.yml  |  4 ++--
 Resources/Prototypes/Recipes/Reactions/medicine.yml  | 10 ++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index 1fed7a2894..b2fb6a8752 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -435,6 +435,7 @@
 - type: reaction
   minTemp: 310
   id: Hydroxide
+  priority: -1 #needs to be here due to how sulfuric acid reaction words
   reactants:
     Oxygen:
       amount: 1
diff --git a/Resources/Prototypes/Recipes/Reactions/cleaning.yml b/Resources/Prototypes/Recipes/Reactions/cleaning.yml
index b8cda27a8b..df6b8f4315 100644
--- a/Resources/Prototypes/Recipes/Reactions/cleaning.yml
+++ b/Resources/Prototypes/Recipes/Reactions/cleaning.yml
@@ -5,7 +5,7 @@
       amount: 2
     SpaceCleaner:
       amount: 2
-    Oxygen:
+    SodiumHydroxide:
       amount: 1
   products:
     Bleach: 5
@@ -36,7 +36,7 @@
   reactants:
     Water:
       amount: 1
-    Silicon:
+    Fersilicite:
       amount: 1
     Oxygen:
       amount: 1
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index dfc3d661f0..fbc1ad52d8 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -184,10 +184,10 @@
 - type: reaction
   id: Leporazine
   reactants:
-    Silicon:
-      amount: 1
     Copper:
       amount: 1
+    Fersilicite:
+      amount: 1
     Plasma:
       amount: 1
       catalyst: true
@@ -376,6 +376,8 @@
   reactants:
     SodiumCarbonate:
       amount: 1
+    SodiumHydroxide:
+      amount: 1
     Kelotane:
       amount: 1
     Water:
@@ -402,7 +404,7 @@
   reactants:
     Bicaridine: # Bicaridine is a conflicting brute medication and if mixed incorrectly will make Razorium. This is intended.
       amount: 1
-    Water:
+    Benzene:
       amount: 1
   products:
     Lacerinol: 2
@@ -414,7 +416,7 @@
   reactants:
     Bicaridine: # Bicaridine is a conflicting brute medication and if mixed incorrectly will make Razorium. This is intended.
       amount: 1
-    Carbon:
+    Hydroxide:
       amount: 1
   products:
     Puncturase: 2

From 88b59c0053a21729c900a2cdd7940e88018e6692 Mon Sep 17 00:00:00 2001
From: qwerltaz <69696513+qwerltaz@users.noreply.github.com>
Date: Tue, 26 Dec 2023 02:05:39 +0100
Subject: [PATCH 03/10] fix origin teg (#22979)

---
 Resources/Maps/origin.yml | 365 ++++----------------------------------
 1 file changed, 30 insertions(+), 335 deletions(-)

diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml
index 5338dd05cd..2fddcf0f9f 100644
--- a/Resources/Maps/origin.yml
+++ b/Resources/Maps/origin.yml
@@ -10159,9 +10159,6 @@ entities:
     - pos: -2.5,-13.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 15231
-      type: DeviceNetwork
     - devices:
       - 19847
       - 19577
@@ -11257,19 +11254,6 @@ entities:
       pos: -11.5,57.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 19996
-      - 19752
-      - 862
-      - 15173
-      - 15174
-      - 15178
-      - 15175
-      - 15176
-      - 15213
-      - 15170
-      - 15148
-      type: DeviceNetwork
     - devices:
       - 19996
       - 19752
@@ -11354,14 +11338,6 @@ entities:
     - pos: 26.5,-33.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 15227
-      - 15228
-      - 15230
-      - 19791
-      - 20034
-      - 938
-      type: DeviceNetwork
     - devices:
       - 15227
       - 15228
@@ -11603,15 +11579,6 @@ entities:
     - pos: -7.5,20.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 931
-      - 20030
-      - 19789
-      - 14872
-      - 14792
-      - 14818
-      - 14871
-      type: DeviceNetwork
     - devices:
       - 931
       - 20030
@@ -11626,10 +11593,6 @@ entities:
     - pos: -68.5,-36.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14873
-      - 14877
-      type: DeviceNetwork
     - devices:
       - 932
       - 19563
@@ -11645,12 +11608,7 @@ entities:
       pos: -74.5,-39.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 20031
-      - 933
-      type: DeviceNetwork
     - devices:
-      - 20031
       - 933
       type: DeviceList
   - uid: 98
@@ -11659,10 +11617,6 @@ entities:
       pos: -45.5,-38.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 934
-      - 19946
-      type: DeviceNetwork
     - devices:
       - 934
       - 19946
@@ -11672,14 +11626,6 @@ entities:
     - pos: 5.5,-3.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 936
-      - 19798
-      - 19561
-      - 15221
-      - 15223
-      - 15224
-      type: DeviceNetwork
     - devices:
       - 936
       - 19798
@@ -11694,13 +11640,6 @@ entities:
       pos: -0.5,-7.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 935
-      - 20032
-      - 19560
-      - 15223
-      - 15222
-      type: DeviceNetwork
     - devices:
       - 935
       - 20032
@@ -11713,13 +11652,6 @@ entities:
     - pos: -1.5,-18.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 937
-      - 19790
-      - 20033
-      - 15225
-      - 15226
-      type: DeviceNetwork
     - devices:
       - 937
       - 19790
@@ -16309,9 +16241,6 @@ entities:
     - pos: -10.5,6.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14720
-      type: DeviceNetwork
   - uid: 848
     components:
     - pos: 7.5,19.5
@@ -16393,9 +16322,6 @@ entities:
     - pos: -13.5,63.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
   - uid: 863
     components:
     - pos: -2.5,59.5
@@ -16759,10 +16685,6 @@ entities:
     - pos: -5.5,15.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 95
-      - 14719
-      type: DeviceNetwork
   - uid: 932
     components:
     - rot: 3.141592653589793 rad
@@ -16775,55 +16697,33 @@ entities:
       pos: -77.5,-41.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 97
-      type: DeviceNetwork
   - uid: 934
     components:
     - rot: 1.5707963267948966 rad
       pos: -44.5,-34.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 98
-      type: DeviceNetwork
   - uid: 935
     components:
     - pos: -1.5,-4.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 100
-      - 14723
-      type: DeviceNetwork
   - uid: 936
     components:
     - pos: 1.5,-7.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14722
-      - 99
-      type: DeviceNetwork
   - uid: 937
     components:
     - rot: -1.5707963267948966 rad
       pos: -1.5,-19.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 101
-      - 14724
-      type: DeviceNetwork
   - uid: 938
     components:
     - pos: 25.5,-37.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 79
-      - 14725
-      type: DeviceNetwork
 - proto: AltarConvertRed
   entities:
   - uid: 939
@@ -57625,6 +57525,11 @@ entities:
     - pos: -0.5,-14.5
       parent: 2
       type: Transform
+  - uid: 19538
+    components:
+    - pos: -70.5,-35.5
+      parent: 2
+      type: Transform
 - proto: CableHVStack
   entities:
   - uid: 8964
@@ -92530,9 +92435,6 @@ entities:
       pos: -2.5,-10.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 15231
-      type: DeviceNetwork
     - devices:
       - 840
       - 15008
@@ -92961,13 +92863,6 @@ entities:
       pos: -9.5,16.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 931
-      - 14872
-      - 14792
-      - 14818
-      - 14871
-      type: DeviceNetwork
     - devices:
       - 931
       - 14872
@@ -92980,16 +92875,6 @@ entities:
     - pos: -10.5,13.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 847
-      - 15128
-      - 14921
-      - 14957
-      - 14908
-      - 14984
-      - 14872
-      - 14792
-      type: DeviceNetwork
     - devices:
       - 847
       - 15128
@@ -93005,10 +92890,6 @@ entities:
     - pos: -71.5,-36.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14873
-      - 14877
-      type: DeviceNetwork
     - devices:
       - 932
       - 15219
@@ -93022,12 +92903,6 @@ entities:
       pos: 6.5,-6.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 15224
-      - 15223
-      - 15221
-      - 936
-      type: DeviceNetwork
     - devices:
       - 936
       - 15221
@@ -93040,11 +92915,6 @@ entities:
       pos: 0.5,-4.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 935
-      - 15223
-      - 15222
-      type: DeviceNetwork
     - devices:
       - 935
       - 15223
@@ -93056,11 +92926,6 @@ entities:
       pos: -2.5,-22.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 937
-      - 15225
-      - 15226
-      type: DeviceNetwork
     - devices:
       - 937
       - 15225
@@ -93072,12 +92937,6 @@ entities:
       pos: 20.5,-37.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 15227
-      - 15228
-      - 15230
-      - 938
-      type: DeviceNetwork
     - devices:
       - 15227
       - 15228
@@ -93440,11 +93299,6 @@ entities:
     - pos: -3.5,13.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 95
-      - 14719
-      - 14720
-      type: DeviceNetwork
   - uid: 14793
     components:
     - pos: -31.5,-30.5
@@ -93576,10 +93430,6 @@ entities:
     - pos: -1.5,14.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 95
-      - 14719
-      type: DeviceNetwork
   - uid: 14819
     components:
     - pos: -45.5,17.5
@@ -93860,30 +93710,17 @@ entities:
     - pos: -9.5,15.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 95
-      - 14719
-      type: DeviceNetwork
   - uid: 14872
     components:
     - pos: -6.5,13.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 95
-      - 14719
-      - 14720
-      type: DeviceNetwork
   - uid: 14873
     components:
     - rot: -1.5707963267948966 rad
       pos: -64.5,-36.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 96
-      - 14721
-      type: DeviceNetwork
   - uid: 14874
     components:
     - pos: -49.5,-16.5
@@ -93906,10 +93743,6 @@ entities:
       pos: -64.5,-37.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 96
-      - 14721
-      type: DeviceNetwork
   - uid: 14878
     components:
     - rot: -1.5707963267948966 rad
@@ -94085,9 +93918,6 @@ entities:
     - pos: -6.5,4.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14720
-      type: DeviceNetwork
   - uid: 14909
     components:
     - rot: -1.5707963267948966 rad
@@ -94156,9 +93986,6 @@ entities:
     - pos: -8.5,4.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14720
-      type: DeviceNetwork
   - uid: 14922
     components:
     - pos: -1.5,3.5
@@ -94344,9 +94171,6 @@ entities:
     - pos: -7.5,4.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14720
-      type: DeviceNetwork
   - uid: 14958
     components:
     - pos: -1.5,-1.5
@@ -94482,9 +94306,6 @@ entities:
     - pos: -1.5,7.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14720
-      type: DeviceNetwork
   - uid: 14985
     components:
     - rot: 3.141592653589793 rad
@@ -95218,9 +95039,6 @@ entities:
     - pos: -10.5,4.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14720
-      type: DeviceNetwork
   - uid: 15129
     components:
     - pos: 3.5,-58.5
@@ -95321,9 +95139,6 @@ entities:
     - pos: -12.5,68.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
   - uid: 15149
     components:
     - rot: 1.5707963267948966 rad
@@ -95435,9 +95250,6 @@ entities:
     - pos: -13.5,68.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
   - uid: 15171
     components:
     - pos: -21.5,68.5
@@ -95453,33 +95265,21 @@ entities:
     - pos: -11.5,59.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
   - uid: 15174
     components:
     - pos: -11.5,58.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
   - uid: 15175
     components:
     - pos: -15.5,51.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
   - uid: 15176
     components:
     - pos: -15.5,50.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
   - uid: 15177
     components:
     - rot: 3.141592653589793 rad
@@ -95492,9 +95292,6 @@ entities:
       pos: -11.5,52.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
   - uid: 15179
     components:
     - rot: 3.141592653589793 rad
@@ -95688,9 +95485,6 @@ entities:
       pos: -14.5,66.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
   - uid: 15214
     components:
     - rot: 3.141592653589793 rad
@@ -95732,76 +95526,42 @@ entities:
     - pos: 6.5,-7.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14722
-      - 99
-      type: DeviceNetwork
   - uid: 15222
     components:
     - pos: -2.5,-5.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 100
-      - 14723
-      type: DeviceNetwork
   - uid: 15223
     components:
     - pos: 0.5,-5.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14722
-      - 99
-      - 100
-      - 14723
-      type: DeviceNetwork
   - uid: 15224
     components:
     - rot: 1.5707963267948966 rad
       pos: 1.5,-8.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 14722
-      - 99
-      type: DeviceNetwork
   - uid: 15225
     components:
     - pos: 0.5,-18.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 101
-      - 14724
-      type: DeviceNetwork
   - uid: 15226
     components:
     - pos: -1.5,-24.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 101
-      - 14724
-      type: DeviceNetwork
   - uid: 15227
     components:
     - pos: 22.5,-33.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 79
-      - 14725
-      type: DeviceNetwork
   - uid: 15228
     components:
     - pos: 28.5,-33.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 79
-      - 14725
-      type: DeviceNetwork
   - uid: 15229
     components:
     - pos: 7.5,-11.5
@@ -95812,20 +95572,12 @@ entities:
     - pos: 25.5,-40.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 79
-      - 14725
-      type: DeviceNetwork
   - uid: 15231
     components:
     - rot: 1.5707963267948966 rad
       pos: -6.5,-18.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 6
-      - 14691
-      type: DeviceNetwork
 - proto: Fireplace
   entities:
   - uid: 15232
@@ -99451,6 +99203,22 @@ entities:
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
+  - uid: 15766
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -70.5,-42.5
+      parent: 2
+      type: Transform
+    - color: '#0055CCFF'
+      type: AtmosPipeColor
+  - uid: 15791
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -70.5,-42.5
+      parent: 2
+      type: Transform
+    - color: '#0055CCFF'
+      type: AtmosPipeColor
 - proto: GasPipeFourway
   entities:
   - uid: 15736
@@ -99663,13 +99431,6 @@ entities:
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 15766
-    components:
-    - pos: -70.5,-42.5
-      parent: 2
-      type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
   - uid: 15767
     components:
     - pos: -3.5,11.5
@@ -99850,14 +99611,6 @@ entities:
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 15791
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -62.5,-40.5
-      parent: 2
-      type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
   - uid: 15792
     components:
     - pos: -68.5,-41.5
@@ -100024,14 +99777,6 @@ entities:
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 15815
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -62.5,-41.5
-      parent: 2
-      type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
   - uid: 15816
     components:
     - rot: -1.5707963267948966 rad
@@ -128353,6 +128098,13 @@ entities:
       type: Transform
 - proto: GasThermoMachineFreezer
   entities:
+  - uid: 15815
+    components:
+    - pos: -66.5,-38.5
+      parent: 2
+      type: Transform
+    - color: '#0055CCFF'
+      type: AtmosPipeColor
   - uid: 19526
     components:
     - pos: 51.5,-57.5
@@ -128408,30 +128160,21 @@ entities:
       type: Transform
     - color: '#97C3FCCC'
       type: AtmosPipeColor
-- proto: GasThermoMachineFreezerEnabled
-  entities:
   - uid: 19535
-    components:
-    - pos: -66.5,-38.5
-      parent: 2
-      type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
-  - uid: 19536
     components:
     - pos: -69.5,-38.5
       parent: 2
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 19537
+  - uid: 19536
     components:
     - pos: -67.5,-38.5
       parent: 2
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 19538
+  - uid: 19537
     components:
     - pos: -68.5,-38.5
       parent: 2
@@ -128626,9 +128369,6 @@ entities:
       pos: -0.5,-4.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 100
-      type: DeviceNetwork
     - color: '#0055CCFF'
       type: AtmosPipeColor
   - uid: 19561
@@ -128637,9 +128377,6 @@ entities:
       pos: 1.5,-5.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 99
-      type: DeviceNetwork
     - color: '#0055CCFF'
       type: AtmosPipeColor
   - uid: 19562
@@ -130114,9 +129851,6 @@ entities:
       pos: -13.5,60.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
     - color: '#0055CCFF'
       type: AtmosPipeColor
   - uid: 19753
@@ -130402,9 +130136,6 @@ entities:
       pos: -5.5,16.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 95
-      type: DeviceNetwork
     - color: '#0055CCFF'
       type: AtmosPipeColor
   - uid: 19790
@@ -130413,9 +130144,6 @@ entities:
       pos: -1.5,-21.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 101
-      type: DeviceNetwork
     - color: '#0055CCFF'
       type: AtmosPipeColor
   - uid: 19791
@@ -130424,9 +130152,6 @@ entities:
       pos: 22.5,-37.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 79
-      type: DeviceNetwork
     - color: '#0055CCFF'
       type: AtmosPipeColor
   - uid: 19792
@@ -130483,9 +130208,6 @@ entities:
       pos: 1.5,-6.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 99
-      type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
   - uid: 19799
@@ -131631,9 +131353,6 @@ entities:
       pos: -43.5,-34.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 98
-      type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
   - uid: 19947
@@ -132019,9 +131738,6 @@ entities:
       pos: -12.5,57.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 74
-      type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
   - uid: 19997
@@ -132283,29 +131999,14 @@ entities:
       pos: -4.5,16.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 95
-      type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
-  - uid: 20031
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -75.5,-41.5
-      parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 97
-      type: DeviceNetwork
   - uid: 20032
     components:
     - rot: 3.141592653589793 rad
       pos: -1.5,-3.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 100
-      type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
   - uid: 20033
@@ -132313,9 +132014,6 @@ entities:
     - pos: -1.5,-22.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 101
-      type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
   - uid: 20034
@@ -132324,9 +132022,6 @@ entities:
       pos: 28.5,-38.5
       parent: 2
       type: Transform
-    - ShutdownSubscribers:
-      - 79
-      type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
   - uid: 20035

From fd3c922a08d8b8c863153b3f9a519a04083551bb Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Tue, 26 Dec 2023 12:05:59 +1100
Subject: [PATCH 04/10] Add chaplain stoles (#22955)

add
---
 .../VendingMachines/Inventories/chapel.yml    |   1 +
 .../Entities/Clothing/Neck/stoles.yml         |  10 +++++++
 .../Stoles/chaplain.rsi/equipped-NECK.png     | Bin 0 -> 1616 bytes
 .../Neck/Stoles/chaplain.rsi/icon.png         | Bin 0 -> 1779 bytes
 .../Neck/Stoles/chaplain.rsi/inhand-left.png  | Bin 0 -> 1277 bytes
 .../Neck/Stoles/chaplain.rsi/inhand-right.png | Bin 0 -> 1297 bytes
 .../Neck/Stoles/chaplain.rsi/meta.json        |  26 ++++++++++++++++++
 7 files changed, 37 insertions(+)
 create mode 100644 Resources/Prototypes/Entities/Clothing/Neck/stoles.yml
 create mode 100644 Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
index b77dbd7d23..33a13dab0a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -5,6 +5,7 @@
     ClothingUniformJumpskirtChaplain: 2
     ClothingUniformJumpsuitMonasticRobeDark: 1
     ClothingUniformJumpsuitMonasticRobeLight: 1
+    ClothingNeckStoleChaplain: 1
     ClothingOuterHoodieChaplain: 1
     ClothingOuterHoodieBlack: 1
     ClothingHeadHatHoodNunHood: 1
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml b/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml
new file mode 100644
index 0000000000..aab8eb30ca
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckStoleChaplain
+  name: chaplain stole
+  description: An elegantly designed stole, with a vibrant gold plus on either end.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Stoles/chaplain.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Stoles/chaplain.rsi
diff --git a/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd535b49ad741983e498d45a0aada23a9eaff2c8
GIT binary patch
literal 1616
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`&f984^(v;p=0SoS&<gn3A8As#lR)
z0M=zwVFhI7rj{fsROII56<bx<DuGp40ofp7eI*63l9Fs&r3l{u1?T*tR0T6V13d#J
zJ1zwU1)HLjG^-#NH>h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6
zGOr}DLN~8i8Da>`9GBGM<f6=ilFa-(1(3OkN%^HEwn|DMi{Jp_&Xi=hJq4vjIbd5-
zlJ!$_Qgc)DN{aOj^$hi~=_|=hL%1-n7#bYFfYArZ0JRxl)#h1Hl57GDDc1_1d!YUU
zIy4z<Z*fVAK9T}`BLf2qT>~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G
zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx%@^cciN^SHZYEbn;L{W{j(Z^!D4am<{kwK}&
z`8lPaP`5KOGqC}O1d1pk{2@9bu<Ae-Mb{CKkzbMzOix9b$)0&7sYL}vz_bOi5o#Z9
z73gLmEDz1gEU`0!8h|E@qzfr-tQ?C<%JYk|L%{I>3q+g>poTyK6e)E=l0G=_fob24
z%SIobkL<W2xMS8cFfgThx;TbZFut8-?a$;WaGX84SizBX>Y<E><{zwYNJeS&mT7Ig
zbSOenzIE!tYYCo8y=z<Rn5>00P0eOSNXV6~I}^({{juIXJ#MC-{*MZ+w_EqiH;11Q
zaCBf`fulo$C)Tay*gw~?YX9E5FPi?ay!`)3^k;VSADj9Kg74SIZ(9|zCwFe?-1Fz6
zLo9Y>zI?iQ**o)3l7XwO3{RLP7k2A$zuI>^RXOpU`mDY^LbEq$T)Moa-quan#c9j$
z$CG+YzgihBtMceL7w@ot(({O&hmt0{6my5Y?w@>pt<6&|4}G_nZ<lUnv0U&feR-T{
z!HmDVPX4+XwyxppQjS8&Q-`vz@h{e3yb;-VDWs_FN3dA5{oR$*zw^A>E7Wj#H(O`E
z<8%JrZ8djH?d8n^f5{(MKY#6NuFCr?U;P)IeRO%l)4b!WSsqwS-oih(VqfOJue;BC
zxmKUfh_`$9IrqKO`>HLQ-OCghnDC&(-VQq#K0n7)aOzXffqJDEYHCZ5aj2hc=Fssu
zS9)gdBJSRYEVm~-ORcq5er38``s}~kQleaDQ?(m%KQG~^H=CtvD7HO1XH)Lmh;RE(
z{i}>=e9jtC@+X_I;ErXuxkTJiVX?VyrtR9MdHegl_w!R*ZQ2)1-g14}MAPOKQ;K&@
zm9T0%{(8=Yh3$3{8v<9_$|W2Q``qKO%F_Bmw&(IQ=M*KFFPy*0FnM1O<Aa-xdp{Mg
z=RWZ5p}E@f*Eb{@4qsK7$)ls8`0e06wxC~z>KFLsnK{KB8yPqnkdTDx2j=HmOAas1
R=9C7N=AN#8F6*2UngBp(Kq&wK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/icon.png b/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c71dcac1899c6491f01f8237301c24bb1a814e15
GIT binary patch
literal 1779
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=n1MmW7law7oa)tQU|_Dx42dX-@b$4u&d=3LOvz75)vL%Y
z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq
z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3
znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z
z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv
z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8
zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Uod0?Yb6da36%JYk|ZS*0kQB8q}q8e_akHsA}
zAm3X>2Bj9~=ahoN-_Fq3$OarHD58j%far+8ssmXRT}MDhen~zsWff&6d*+p-78Mi$
zQyJJsn0>fapqquTJTxz}#13WvnlO?sq*$_o23!a@MlgdDr&6eKkf23Mv5@Qljs{?U
zu;a4PhvzLjuD|Ez{a|2V`r_&07!twxHq<*?I8emSn0JcZmdw>Z4lKIb%PVwLKA|SW
zV8<qf)*Xe57c4s3>RR}CnL_Ept#%HAF`_OZ8YPNaQGo|tn^$<3F1{M|Ib*Vqkm<><
zb?U|HlhY<m3o0;XPkVN+`kd|k@_oN0l&;6Hg5bZ+Ot*p_ewVwa9kQ;ve7=rF{?!BL
z`<;@$ykyz?H^~2|li}8VX;Tj^2r)|DYC3aiaq;Y{^Z$i?I_thntMOrQtkRXsXFby&
z3GOmV3{Z14F_l!FvTNgNmJCH}6NhDDom@;8#nq3VIGir>>gM5>k2Z4fw(@$N7xMkz
z5$xDu^kLuIUKw){KkEbH?O797C>Y#%E_|@zz86=*jh(Ts3tqoBD)MAmz2LyZa;1iy
zy}BQ~K7~%%z_H-dWAWpe4_5S>>|8M+rqRE)|Kf#(rE@s;J-sKo<n+vsH}vIJvz_z%
z%&O$4Qu2eb?hK22e5176GzPwD*HfMvC{Aa1aOzo8vx!_z(3zu)eKz}>u+Mb(eJ;`W
zS*o*Bj#)&J+1Uqkiw-+}yDh)z%B^jaYH!Ri_-({+!y{EvhGo`t(+|yNH5R(Xy_^qD
zFuwegF(uVY&FD+8kvmg^_G|u<0^`}*7v}aynx0W%U}$!7Tg4G4v-0n^1AAW{@L)BM
z(UG>At?_qz1!v5Qxbrg?T)BFE@}0J*GS+~FtL8AD5$9T&CVGG)<iR)3^s*8GE%}<C
zQ>ARIgo8s@Tdev1YOCteD;E0{o|VXl2w3bmub(%M*F(2c&(lD?S?hBn^MyRW2Op*j
zzTo|J^njrJ%UyoD_sV|PNXh6=>~uM^`)1FB$x6nirqh?KV~dz}#g9Q+u=?S#m%2*v
zCxQ(&OieEJos_Ao&g}lnzwuXotES?sj5h~YZ*r=5#1y}WQ;@sBmFe&4olO^>uDi9r
zdUol<j7dG$RX$sbE{(agVB_)k;=Ft^-3(T*Om1|Z*d1T-s^rwn{YT8_zxpY~_NtaM
zuiv##)%4B;t%X^u^Pl|WJiR>W&id62s}CfJ{9yklm_8$6veqt8h2!b!=d#Wzp$PzF
Cv6pB7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..f29a2f1fd7a625f1abf261cb14eb7daa8b5d3e3f
GIT binary patch
literal 1277
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`&f984^(v;p=0SoS&<gn3A8As#lR)
z0M=zwVFhI7rj{fsROII56<bx<DuGp40ofp7eI*63l9Fs&r3l{u1?T*tR0T6V13d#J
zJ1zwU1)HLjG^-#NH>h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6
zGOr}DLN~8i8Da>`9GBGM<f6=ilFa-(1(3OkN%^HEwn|DMi{Jp_&Xi=hJq4vjIbd5-
zlJ!$_Qgc)DN{aOj^$hi~=_|=hL%1-n7#bYFfYArZ0JRxl)#h1Hl57GDDc1_1d!YUU
zIy4z<Z*fVAK9T}`BLf2qT>~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G
zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx%@^cciN^SHZYEbn;L{W{j(Z^!D4am<{kwK}&
z`8lPaP`5KOGqC}O1d1pk{2@9bu<Ae-Mb{CKkzbMzOix9b$)0&7sYL}vz_bOi5o#Z9
z73gLmEDz1gEU`0!8h|E@qzfr-tQ?C<%JYk|L%{I>3q+g>poTyK6e)E=l0G=_fob24
z%SIobkL<W2xMS7>GpvxOi(^Oy<J(&s1)CfMS`$-zrZ{jL8g6H+n(*VrfeU;l+c=~*
z$mKHKEL`#6p0h+<nuOA~vi-MZn-**A5O82%WI-VsJGo3&zLQxw_0@ujE39rV`zj*8
zb^TR_t8ua$`_pg!j-U65Z%6EWZRSSZB{B*|bA_8^9Bls|z83AanqQB-qva{bv4xu$
zR+O*4#ap|e{uJY)A0>CZjBVx3Tr=M=Wo~*OzNu!5-Lf5*9&xrYFmWg}U?;*FzXg>S
zMvKqP`k-O+T_&i`#LVp4<9Xlh54~Y5I+)JC;fG*E4f_`Lw}CZ!FIK$Y-S@~{x9KRv
dA3x?F5SPo<JmUAGNCi~%c)I$ztaD0e0sxhylxqM0

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..12642de185f1a0a9bcb53970e7324f34f27b11a9
GIT binary patch
literal 1297
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`&f984^(v;p=0SoS&<gn3A8As#lR)
z0M=zwVFhI7rj{fsROII56<bx<DuGp40ofp7eI*63l9Fs&r3l{u1?T*tR0T6V13d#J
zJ1zwU1)HLjG^-#NH>h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6
zGOr}DLN~8i8Da>`9GBGM<f6=ilFa-(1(3OkN%^HEwn|DMi{Jp_&Xi=hJq4vjIbd5-
zlJ!$_Qgc)DN{aOj^$hi~=_|=hL%1-n7#bYFfYArZ0JRxl)#h1Hl57GDDc1_1d!YUU
zIy4z<Z*fVAK9T}`BLf2qT>~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G
zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx%@^cciN^SHZYEbn;L{W{j(Z^!D4am<{kwK}&
z`8lPaP`5KOGqC}O1d1pk{2@9bu<Ae-Mb{CKkzbMzOix9b$)0&7sYL}vz_bOi5o#Z9
z73gLmEDz1gEU`0!8h|E@qzfr-tQ?C<%JYk|L%{I>3q+g>poTyK6e)E=l0G=_fob24
z%SIobkL<W2xMS7>Gpw4Yi(^Oy<J(&Yd7B&rS`$^`TAIZk9o=nup?S_tKAT&O^K=if
zt#P02aQ%q1O8zGAlr#QL9%hphpWSBV^A0RfXkcLCKqbzx-dgukS9gk6flrq2nkRF$
zmhoC03esG3Pb1K{%Ww^2ChL)F=a%12a??%Ic4hi;{n_G0ECS4X_b{*NU(NDh=}(Km
z`G-Gj@L~wNnlHP5*R|}w=Y$-#ujbO{cv}69|Mpb91#Wil=01G9DDABL_mZIWf9Fni
zV7LM1qyr^P4{v<=IOiQ7pV4t!=l2|!uHCp16Qlp{zoZ9~MDs_Jc`Og|Zr3EFO=4jC
zv{TxPiR1UF*uyuuzirB$x3^G83GBNE@ef$HU(r0G9{BzVs5tU;^>bP0l+XkKK;NVt

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/meta.json b/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/meta.json
new file mode 100644
index 0000000000..829962f119
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by Ubaser.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From d3ae3776ed40cf7b88b60d0f87f7e5c17803497a Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 25 Dec 2023 23:04:57 -0500
Subject: [PATCH 05/10] Update engine to v195.0.1 (#22994)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 2b4a428f9f..eb092e90ef 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 2b4a428f9feeeb9f92658868fc70c6a5b842ea30
+Subproject commit eb092e90efc7ac4ae562bc46f9b760745a29e289

From ef726a9cb05e041839492bf2b7c2c401112bd0a7 Mon Sep 17 00:00:00 2001
From: Avalon <148660190+BYONDFuckery@users.noreply.github.com>
Date: Tue, 26 Dec 2023 03:22:34 -0500
Subject: [PATCH 06/10] fix the mothroach crate saying it contains six
 mothroaches instead of four (#22968)

FINALLY FUCKING FIX THAT ONE FUCKING LIKE FUCK IT
---
 .../en-US/prototypes/catalog/fills/crates/livestock-crates.ftl  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
index 2d223e9337..ab974cbc79 100644
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
@@ -47,7 +47,7 @@ ent-CrateNPCPenguin = Penguin crate
     .desc = A crate containing two penguins.
 
 ent-CrateNPCMothroach = Crate of mothroaches
-    .desc = A crate containing six mothroaches.
+    .desc = A crate containing four mothroaches.
 
 ent-CrateNPCPig = Pig crate
     .desc = A crate containing a single pig.

From aadc75a07abcbffeea292b61411838fbfd2777e6 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Tue, 26 Dec 2023 09:27:15 +0100
Subject: [PATCH 07/10] Fix potted plants going over doors (#22869)

* Update potted_plants.yml

* Update potted_plants.yml
---
 .../Entities/Structures/Furniture/potted_plants.yml         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
index 0c0aa495dc..6c95829723 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -18,9 +18,9 @@
           radius: 0.1
         density: 190
         mask:
-        - Impassable
+        - HighImpassable
   - type: Sprite
-    drawdepth: Overdoors
+    drawdepth: SmallObjects
     offset: "0.0,0.3"
     sprite: Structures/Furniture/potted_plants.rsi
     noRot: true
@@ -275,4 +275,4 @@
   parent: PottedPlant27
   components:
   - type: Sprite
-    state: plant-30
\ No newline at end of file
+    state: plant-30

From f6b8f183d7e808fbcf6f58fad83af6c8da6ef252 Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Tue, 26 Dec 2023 06:57:11 -0600
Subject: [PATCH 08/10] Revert "temporarily override WizDen admin names"
 (#23004)

Revert "temporarily override WizDen admin names (#22878)"

This reverts commit 0f6d062da437fe266db7077cb9d5a450da3c54d2.
---
 Resources/ConfigPresets/WizardsDen/wizardsDen.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index c28be54393..4f4c02dab2 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -28,4 +28,3 @@ limit = 10.0
 [admin]
 see_own_notes = true
 deadmin_on_join = true
-override_adminname_in_client_ahelp = "The Grinch"

From d75d7d71879d8ef9251b5fab4b44489fb8b92cde Mon Sep 17 00:00:00 2001
From: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date: Tue, 26 Dec 2023 04:57:52 -0800
Subject: [PATCH 09/10] fix ahelp relay times (#23001)

RoundDuration instead of CurTime
---
 Content.Server/Administration/Systems/BwoinkSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs
index 101f8ecbac..a0f5b95ae2 100644
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -70,7 +70,7 @@ namespace Content.Server.Administration.Systems
             _config.OnValueChanged(CVars.GameHostName, OnServerNameChanged, true);
             _config.OnValueChanged(CCVars.AdminAhelpOverrideClientName, OnOverrideChanged, true);
             _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("AHELP");
-            _maxAdditionalChars = GenerateAHelpMessage("", "", true, _timing.CurTime.ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel).Length;
+            _maxAdditionalChars = GenerateAHelpMessage("", "", true, _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel).Length;
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
 
             SubscribeLocalEvent<GameRunLevelChangedEvent>(OnGameRunLevelChanged);
@@ -471,7 +471,7 @@ namespace Content.Server.Administration.Systems
                 {
                     str = str[..(DescriptionMax - _maxAdditionalChars - unameLength)];
                 }
-                _messageQueues[msg.UserId].Enqueue(GenerateAHelpMessage(senderSession.Name, str, !personalChannel, _timing.CurTime.ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel, admins.Count == 0));
+                _messageQueues[msg.UserId].Enqueue(GenerateAHelpMessage(senderSession.Name, str, !personalChannel, _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel, admins.Count == 0));
             }
 
             if (admins.Count != 0 || sendsWebhook)

From 4d42d00194057b66265f44f450f7c394459fef56 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Tue, 26 Dec 2023 22:22:33 +0100
Subject: [PATCH 10/10] Fix awful slimepeople parts sprites (#22969)

fix awful slime parts
---
 .../Mobs/Species/Slime/parts.rsi/l_arm.png      | Bin 267 -> 347 bytes
 .../Mobs/Species/Slime/parts.rsi/l_hand.png     | Bin 196 -> 296 bytes
 .../Mobs/Species/Slime/parts.rsi/r_hand.png     | Bin 243 -> 304 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/l_arm.png
index 90fd38dcf51ec493798f4a7841acc87448bc4335..5d9c26442cc06070e4cc73330f3cc588de4eabd6 100644
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nl6
zPZ!6KinzD8F7h@j2plWC?Kr2Ua846r%%Zt%2Athn;)0|ePi}oLl=;u@@$|>#FHRf!
z+Hfc|Ffc)h1p*P*zb-vtnO5=i-qoY$KK}_3&#s)ddfnAeHVkU2PIv!Id%3aR*5O=b
zAV~bRqJll+))N9w-<K!c-7eGLd)>#<q37eWchjCmu48YJIk4EnNYH_SkwpL(!NR2X
zSj{nZxpI(K|E?XWEoOf*)=c?yG)wZtKjs6Q+%0NL?6}+6H>~`~cA=&`p`sz)x-N#_
zVf}-t_ws*=^VBnayPokT{z2*FCtkhF#89kR5dDDnrj5^~{Xv_<fuY6V>FVdQ&MBb@
E0MO=v2mk;8

delta 239
zcmcc3)Xg+OrT&tqi(^Q|oVT|Q@-`drv?jh#n5XjCpq2fDP^#1u&pjM_O+<tIdHrrL
z_;39*WoG--Zew2tATXM7(=O<4beW@I<mTC?n`2$BotYKd&k*FiLSA1<^69-L><`{~
zmu*%u+WC7@)E7<LhE-FFs<_VN=r1ji{HtZl5IT4B|7pARS7lhGUt6;aY$V87h6DRw
zZp!_+Ecf=iuXi>%O4S*Q2(B+aZTE?bQRldTooNljDl2!F&qifG7|tm*#G6l8`BYEB
muHmuvq>dNgCNP0aC{X3!%i(jW|K&y@5ZBYy&t;ucLK6T~d1P|{

diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/l_hand.png
index af8bb22624cd9d0a3d2e5c24b3e10f09e99d5d46..4e5988ca6c95904fe8ad3f0696e46c64b55a96f0 100644
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0px`Y}
z7srr_xVN`1ayA=?um(h1xvLe*EH7YK{=&lVk<wbhKO&BKT^EEo>NvhXmHm7AwN*C*
zBNGdUfPzB<jPYPUi`>hy<(a>})c#+$^Ro^AV~e<T6VF(^`aF|OV`<LW<>9OESRB}-
z<D6Sp>&EkKj;*=SEvqH}c9p8XQrRr@e4-=VBy5aEUxiZ5U)txwcLl7j{<F9^>_b%X
z-RW#bv(B<FNj(24=rc!pY2MF!JO_2{yPXB0&dSsKz-m0#_N(c%%g=zmWbkzLb6Mw<
G&;$TI5@`7V

delta 168
zcmV;Z09XI00>lB3B!7!ZL_t(|obB2>5yLPLMNuU{7Kz~)g#j!I!7&mOQJOR<T*R~a
zczjNy?rKKuQ)>VK003OetvZ;QW16PkT5IdN&dahKzN50W=UyF*h+f_NWVieQwr!iA
zXI1Z|dkUF3GIRV}3jhEB0002EuJXP8+cI-RM30C=e+bIw@gZNSn&VH&gbn}zZ+ig9
W(KlgU8LOiJ0000<MNUMnLSTX`GD!*m

diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/r_hand.png
index 47b3a136179a52729d61f3ab2312a65f5bdb9350..bc0f8b00433be83d89961708c6eec767fa10cc40 100644
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0px`4<
z7srr_xVN`1@-`WWum+R}s3poQd%>Wy@G_7kxYR|sz9mc~+s0R_F7DQEzhB>1Xmv9%
zGO=(7C^$607!UTd@Oi&2i!INb^-LzaEiuEHqx-Asg{NtD%i7kxu4>b$eflhhRpNNz
zyUJhNmYV;c@p)c#@v|RG9^I?C(8vBK>6vV0j4RwUEDVP(2N|1hwe?-q?-#yQe-|y=
zZ|_`r`-i3L->}Knzx^$LsW#-B$j{b%CeQl$`;_fV+h8tRkkhEWt<kyGRxRlp(6<bp
Lu6{1-oD!M<6ozai

delta 215
zcmdnM^qFyjO8qWR7srr_Id5-m<UOn);(BpD&monb$C?rk^b@}ahIw>q>~#|9boCIP
zrBT$=+qw46<$#6<j;Dng89?Aby```3s;o`d_>`0sTh3XU@2unZGM@iDFQ-THT3hx)
zljqmjI}D#~jGnP_<s9SZalWCGS1q&Jy|wVj8L)l^h5#U4<`z2n`@Zk@zOS`c*lv+u
zX8#~|>-*<S(Ip~cwg>d}{#$LYa$mUPlTn=h%d+~8juV1f#vr@X{W&+f#x%OId;yu|
M>FVdQ&MBb@0N>qN*#H0l