Merge remote-tracking branch 'refs/remotes/wizards/master'

.github/CODEOWNERS

@@ -3,17 +3,17 @@
 # Sorting by path instead of by who added it one day :(
 # this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
 
-/Resources/ConfigPresets/WizardsDen/  @nikthechampiongr
-/Content.*/Administration/ @DrSmugleaf @nikthechampiongr
-/Resources/ServerInfo/ @nikthechampiongr
-/Resources/ServerInfo/Guidebook/ServerRules/ @nikthechampiongr
+/Resources/ConfigPresets/WizardsDen/  @nikthechampiongr @crazybrain23
+/Content.*/Administration/ @DrSmugleaf @nikthechampiongr @crazybrain23
+/Resources/ServerInfo/ @nikthechampiongr @crazybrain23
+/Resources/ServerInfo/Guidebook/ServerRules/ @nikthechampiongr @crazybrain23
 
 /Resources/Prototypes/Maps/** @Emisse
 
 /Resources/Prototypes/Body/ @DrSmugleaf # suffering
 /Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
 /Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
-/Resources/Prototypes/Guidebook/rules.yml @nikthechampiongr
+/Resources/Prototypes/Guidebook/rules.yml @nikthechampiongr @crazybrain23
 /Content.*/Body/ @DrSmugleaf
 /Content.YAMLLinter @DrSmugleaf
 /Content.Shared/Damage/ @DrSmugleaf
@@ -25,7 +25,7 @@
 
 # SKREEEE
 /Content.*.Database/ @PJB3005 @DrSmugleaf
-/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @nikthechampiongr
+/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @nikthechampiongr @crazybrain23
 /Pow3r/ @PJB3005
 /Content.Server/Power/Pow3r/ @PJB3005
 

Content.Shared/SprayPainter/Components/SprayPainterComponent.cs

@@ -16,13 +16,6 @@ public sealed partial class SprayPainterComponent : Component
     [DataField]
     public TimeSpan PipeSprayTime = TimeSpan.FromSeconds(1);
 
-    /// <summary>
-    /// DoAfterId for airlock spraying.
-    /// Pipes do not track doafters so you can spray multiple at once.
-    /// </summary>
-    [DataField]
-    public DoAfterId? AirlockDoAfter;
-
     /// <summary>
     /// Pipe color chosen to spray with.
     /// </summary>

Content.Shared/SprayPainter/SharedSprayPainterSystem.cs

@@ -61,8 +61,6 @@ private void OnMapInit(Entity<SprayPainterComponent> ent, ref MapInitEvent args)
 
     private void OnDoorDoAfter(Entity<SprayPainterComponent> ent, ref SprayPainterDoorDoAfterEvent args)
     {
-        ent.Comp.AirlockDoAfter = null;
-
         if (args.Handled || args.Cancelled)
             return;
 
@@ -117,7 +115,7 @@ private void OnAirlockInteract(Entity<PaintableAirlockComponent> ent, ref Intera
         if (args.Handled)
             return;
 
-        if (!TryComp<SprayPainterComponent>(args.Used, out var painter) || painter.AirlockDoAfter != null)
+        if (!TryComp<SprayPainterComponent>(args.Used, out var painter))
             return;
 
         var group = Proto.Index<AirlockGroupPrototype>(ent.Comp.Group);
@@ -141,9 +139,6 @@ private void OnAirlockInteract(Entity<PaintableAirlockComponent> ent, ref Intera
         if (!DoAfter.TryStartDoAfter(doAfterEventArgs, out var id))
             return;
 
-        // since we are now spraying an airlock prevent spraying more at the same time
-        // pipes ignore this
-        painter.AirlockDoAfter = id;
         args.Handled = true;
 
         // Log the attempt

Resources/Changelog/Admin.yml

@@ -657,5 +657,12 @@ Entries:
   id: 81
   time: '2024-12-21T07:02:05.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33980
+- author: lzk228
+  changes:
+  - message: Fixed spray painter using while being aghost.
+    type: Fix
+  id: 82
+  time: '2024-12-24T02:25:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34001
 Name: Admin
 Order: 1

Resources/Changelog/Changelog.yml

@@ -1,11 +1,4 @@
 Entries:
-- author: slarticodefast
-  changes:
-  - message: The revenant can now fly through walls again.
-    type: Fix
-  id: 7252
-  time: '2024-08-31T03:02:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31670
 - author: metalgearsloth
   changes:
   - message: Fix AI eye getting deleted by singulo.
@@ -3937,3 +3930,11 @@
   id: 7751
   time: '2024-12-24T00:24:19.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33193
+- author: lzk228
+  changes:
+  - message: Now you are allowed to paint multiple airlocks with the spray painter.
+      Along with that you can cancel the doafter by clicking on the door you are painting.
+    type: Tweak
+  id: 7752
+  time: '2024-12-24T02:25:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34001