AI rewie

WWhiteDreamProject · Oct 5, 2024 · f434a2c · f434a2c
1 parent 0717f11
commit f434a2c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/Content.Client/_White/Guns/Stretched/StretchedVisualizerSystem.cs b/Content.Client/_White/Guns/Stretched/StretchedVisualizerSystem.cs
@@ -16,6 +16,9 @@ protected override void OnAppearanceChange(EntityUid uid, StretchedVisualsCompon
         _appearance.TryGetData<bool>(uid, StretchedVisuals.Stretched, out var stretched, args.Component);
         _appearance.TryGetData<bool>(uid, AmmoVisuals.HasAmmo, out var hasAmmo, args.Component);
 
-        args.Sprite.LayerSetState(StretchedVisuals.Layer, stretched ? component.StretchedState : hasAmmo ? component.LoadedState : component.UnstrungVisible);
+        // StretchedState: Weapon is stretched and ready to fire
+        // LoadedState: Weapon is loaded but not stretched
+        // UnstrungState: Weapon is neither stretched nor loaded
+        args.Sprite.LayerSetState(StretchedVisuals.Layer, stretched ? component.StretchedState : hasAmmo ? component.LoadedState : component.UnstrungState);
     }
 }
diff --git a/Content.Client/_White/Guns/Stretched/StretchedVisualsComponent.cs b/Content.Client/_White/Guns/Stretched/StretchedVisualsComponent.cs
@@ -10,5 +10,5 @@ public sealed partial class StretchedVisualsComponent : Component
     public string? StretchedState;
 
     [DataField]
-    public string? UnstrungVisible;
+    public string? UnstrungState;
 }
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -131,8 +131,13 @@ private void OnEmbedRemove(EntityUid uid, EmbeddableProjectileComponent componen
             return;
         }
 
+        if (!TryComp<PhysicsComponent>(uid, out var physics))
+        {
+            FreePenetrated(uid);
+            return;
+        }
+
         var xform = Transform(uid);
-        TryComp<PhysicsComponent>(uid, out var physics);
         _physics.SetBodyType(uid, BodyType.Dynamic, body: physics, xform: xform);
         _transform.AttachToGridOrMap(uid, xform);
 

diff --git a/Content.Server/_White/Guns/PoweredComponent.cs b/Content.Server/_White/Guns/PoweredComponent.cs
@@ -6,6 +6,9 @@ public sealed partial class PoweredComponent : Component
     [DataField]
     public float EnergyPerUse = 180f;
 
+    /// <summary>
+    /// Modifies the speed of projectiles fired from this powered weapon.
+    /// </summary>
     [DataField]
     public float ProjectileSpeedModified = 15f;
 }
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -114,12 +114,6 @@ public void SetShooter(EntityUid id, ProjectileComponent component, EntityUid sh
         Dirty(id, component);
     }
 
-    [Serializable, NetSerializable]
-    private sealed partial class RemoveEmbeddedProjectileEvent : DoAfterEvent
-    {
-        public override DoAfterEvent Clone() => this;
-    }
-
     /// <summary>
     /// Prevent players with the Pacified status effect from throwing embeddable projectiles.
     /// </summary>