From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Tue, 24 Dec 2024 02:25:03 +0000 (+0100)
Subject: Allow to paint multiple airlocks (#34001)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1cbc8c1dccf9eebaabdb90f2f7d815a344b7b68a;p=space-station-14.git
Allow to paint multiple airlocks (#34001)
* Allow to paint multiple airlocks
* oh right
---
diff --git a/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs b/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
index 1742b13f8d..0591cb2dcb 100644
--- a/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
+++ b/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
@@ -16,13 +16,6 @@ public sealed partial class SprayPainterComponent : Component
[DataField]
public TimeSpan PipeSprayTime = TimeSpan.FromSeconds(1);
- ///
- /// DoAfterId for airlock spraying.
- /// Pipes do not track doafters so you can spray multiple at once.
- ///
- [DataField]
- public DoAfterId? AirlockDoAfter;
-
///
/// Pipe color chosen to spray with.
///
diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index 0e216db146..48a941d598 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -60,8 +60,6 @@ public abstract class SharedSprayPainterSystem : EntitySystem
private void OnDoorDoAfter(Entity ent, ref SprayPainterDoorDoAfterEvent args)
{
- ent.Comp.AirlockDoAfter = null;
-
if (args.Handled || args.Cancelled)
return;
@@ -116,7 +114,7 @@ public abstract class SharedSprayPainterSystem : EntitySystem
if (args.Handled)
return;
- if (!TryComp(args.Used, out var painter) || painter.AirlockDoAfter != null)
+ if (!TryComp(args.Used, out var painter))
return;
var group = Proto.Index(ent.Comp.Group);
@@ -138,9 +136,6 @@ public abstract class SharedSprayPainterSystem : EntitySystem
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