From 23966e1dff3873989c7edaaea761e90e3fcc2627 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 18 Jul 2023 07:57:59 +0200
Subject: [PATCH] PA Fixes (#18116)

* PA Fixes

Fix exception when opening UI if it has the power limiter warning displayed.

Fix it sometimes not detecting parts due to angles not getting normalized before comparison.

* Fix swapped out sprites for PA emitter P0 states
---
 .../UI/ParticleAcceleratorControlMenu.cs        |   2 +-
 .../ParticleAcceleratorSystem.Parts.cs          |   2 +-
 .../Generation/PA/emitter_port.rsi/unlitp0.png  | Bin 359 -> 359 bytes
 .../PA/emitter_starboard.rsi/unlitp0.png        | Bin 359 -> 359 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
index bd91306c7e..c69e027137 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
@@ -409,7 +409,7 @@ namespace Content.Client.ParticleAccelerator.UI
             if (_maxStrength > 3 && enabled && assembled)
             {
                 _shouldContinueAnimating = true;
-                if (!_alarmControl.Visible)
+                if (!_alarmControl.HasRunningAnimation("warningAnim"))
                     _alarmControl.PlayAnimation(_alarmControlAnimation, "warningAnim");
             }
             else
diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Parts.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Parts.cs
index d3ca674a91..fc8272185d 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Parts.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Parts.cs
@@ -131,7 +131,7 @@ public sealed partial class ParticleAcceleratorSystem
         {
             if (compQuery.TryGetComponent(entity, out comp)
             && TryComp<ParticleAcceleratorPartComponent>(entity, out var partState) && partState.Master == null
-            && (rotation == null || MathHelper.CloseTo(Transform(entity).LocalRotation.Theta, rotation!.Value.Theta)))
+            && (rotation == null || Transform(entity).LocalRotation.EqualsApprox(rotation!.Value.Theta)))
             {
                 part = entity;
                 return true;
diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_port.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_port.rsi/unlitp0.png
index 4f3141c5fb12bcb323e1475cb76863090b486c11..d82fa071a6a1f60ae25b9faf1fe77cccd5d1dee9 100644
GIT binary patch
delta 191
zcmV;w06_oe0_OsdUp*lX!ax)Sw**B(4}jnZxE_HUfZ!?!1cIv|;07E4hd`k!aF~*y
z2um6U%dVt(Z<1#6lQo@g%`ak%L75(t5CI%jCAkqQSBv<ZjG5B(PjzV4+k)}$N#B6;
zC4~C+d4BOd)1L1TSv$eOa-O|7d~9}|`T8yCUtm_nS2<)#(`)Xb*&jO-A?pT=rd9S0
txE{Lm@-1GAW0M{MFp;Pc8Hfi6;SH`fGYJPa1eyQ<002ovPDHLkV1f++QeOZ7

delta 196
zcmV;#06YKZ0_OsdUqPV_!ax{CuLMN`10Way*AdtN1gjtr2v$MB28@71pimV!Oi56L
zBMlErd+w6&dr9;1CwHQ+S93*-F(}i+vN!;doEcXn-3X1=%lMj3nA+)|t59!t1!I<^
zoq)?VgzEl%{_$JWtk0a}JHf$f(RssjyU+UTH>CXn^D@3iL#B3m^&`}WQ`QlZPr!Iq
ycHVG1=Kb;wz81%_H~^8H9FrRXA{h}65W)v0r!xuFBYiyp0000<MNUMnLSTX|Ay-@g

diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_starboard.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_starboard.rsi/unlitp0.png
index d82fa071a6a1f60ae25b9faf1fe77cccd5d1dee9..4f3141c5fb12bcb323e1475cb76863090b486c11 100644
GIT binary patch
delta 196
zcmV;#06YKZ0_OsdUqPV_!ax{CuLMN`10Way*AdtN1gjtr2v$MB28@71pimV!Oi56L
zBMlErd+w6&dr9;1CwHQ+S93*-F(}i+vN!;doEcXn-3X1=%lMj3nA+)|t59!t1!I<^
zoq)?VgzEl%{_$JWtk0a}JHf$f(RssjyU+UTH>CXn^D@3iL#B3m^&`}WQ`QlZPr!Iq
ycHVG1=Kb;wz81%_H~^8H9FrRXA{h}65W)v0r!xuFBYiyp0000<MNUMnLSTX|Ay-@g

delta 191
zcmV;w06_oe0_OsdUp*lX!ax)Sw**B(4}jnZxE_HUfZ!?!1cIv|;07E4hd`k!aF~*y
z2um6U%dVt(Z<1#6lQo@g%`ak%L75(t5CI%jCAkqQSBv<ZjG5B(PjzV4+k)}$N#B6;
zC4~C+d4BOd)1L1TSv$eOa-O|7d~9}|`T8yCUtm_nS2<)#(`)Xb*&jO-A?pT=rd9S0
txE{Lm@-1GAW0M{MFp;Pc8Hfi6;SH`fGYJPa1eyQ<002ovPDHLkV1f++QeOZ7