diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs index 0a05714982..36bc1037aa 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs @@ -454,7 +454,7 @@ namespace Content.Server.GameObjects.Components.PA Vector2i RotateOffset(in Vector2i vec) { - var rot = new Angle(Owner.Transform.LocalRotation + Math.PI / 2); + var rot = new Angle(Owner.Transform.LocalRotation); return (Vector2i) rot.RotateVec(vec); } } diff --git a/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs index 2fb3bc8bdf..da93efeb7e 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs @@ -82,9 +82,9 @@ namespace Content.Server.GameObjects.Components.PA physicsComponent .EnsureController() - .LinearVelocity = angle.ToVec() * 20f; + .LinearVelocity = angle.ToWorldVec() * 20f; - Owner.Transform.LocalRotation = new Angle(angle + Angle.FromDegrees(180)); + Owner.Transform.LocalRotation = angle; Timer.Spawn(3000, () => Owner.Delete()); } } diff --git a/Resources/Changelog/Parts/pa_fix.yml b/Resources/Changelog/Parts/pa_fix.yml new file mode 100644 index 0000000000..17c8272e08 --- /dev/null +++ b/Resources/Changelog/Parts/pa_fix.yml @@ -0,0 +1,4 @@ +author: PJB +changes: + - type: Fix + message: Fixed the Particle Accelerator diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxc.png b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxc.png index cb9e35f3b7..0636a46df9 100644 Binary files a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxc.png and b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxc.png differ diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/meta.json b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/meta.json index 8af845e426..e5444a86fb 100644 --- a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/meta.json +++ b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/meta.json @@ -32,7 +32,13 @@ }, { "name": "unlitp3", - "directions": 4 + "directions": 4, + "delays": [ + [0.5, 0.5], + [0.5, 0.5], + [0.5, 0.5], + [0.5, 0.5] + ] }, { "name": "boxw", diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp.png b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp.png index 7fb11ea3d6..6064c76935 100644 Binary files a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp.png and b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp.png differ diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp0.png b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp0.png index b7316a64a7..4513451871 100644 Binary files a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp0.png and b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp0.png differ diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp1.png b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp1.png index 065b9d36d6..21f121314d 100644 Binary files a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp1.png and b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp1.png differ diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp2.png b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp2.png index ce98927bd4..4002ea9fb6 100644 Binary files a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp2.png and b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp2.png differ diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp3.png b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp3.png index 6faa6c5088..63d8adc2c7 100644 Binary files a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp3.png and b/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp3.png differ