Merge remote-tracking branch 'upstream/master' into upstream-sync

2026-10-18 06:31:14 +03:00 · 2023-12-27 00:32:56 +03:00 · 2023-12-27 00:32:56 +03:00 · 27798dc082
commit 27798dc082
parent b52e9bb64a 4d42d00194
23 changed files with 118 additions and 366 deletions
--- 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();
    }
 }
--- 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;
    }
 }

--- 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)
--- 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)
--- 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;
--- 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"
--- 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.
--- 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
--- 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
--- a/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml
+++ 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
--- 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
+    state: plant-30
--- 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
--- 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
--- 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
--- a/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/equipped-NECK.png
+++ b/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/equipped-NECK.png
--- a/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/icon.png
+++ b/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/icon.png
--- a/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Neck/Stoles/chaplain.rsi/meta.json
+++ 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
+    }
+  ]
+}
--- a/Resources/Textures/Mobs/Species/Slime/parts.rsi/l_arm.png
+++ b/Resources/Textures/Mobs/Species/Slime/parts.rsi/l_arm.png
--- a/Resources/Textures/Mobs/Species/Slime/parts.rsi/l_hand.png
+++ b/Resources/Textures/Mobs/Species/Slime/parts.rsi/l_hand.png
--- a/Resources/Textures/Mobs/Species/Slime/parts.rsi/r_hand.png
+++ b/Resources/Textures/Mobs/Species/Slime/parts.rsi/r_hand.png
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 2b4a428f9feeeb9f92658868fc70c6a5b842ea30
+Subproject commit eb092e90efc7ac4ae562bc46f9b760745a29e289