cleanup

OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs

@@ -1,12 +1,8 @@
 using JetBrains.Annotations;
 using OpenDreamShared.Rendering;
-using Pidgin;
 using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.GameStates;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
-using static OpenDreamShared.Rendering.DreamParticlesComponent;
 using Vector3 = Robust.Shared.Maths.Vector3;
 
 namespace OpenDreamClient.Rendering;

OpenDreamRuntime/Objects/Types/DreamList.cs

@@ -858,8 +858,6 @@ public override int GetLength() {
     }
 }
 
-
-
 // atom.filters list
 // Operates on an object's appearance
 public sealed class DreamFilterList : DreamList {

OpenDreamRuntime/Objects/Types/DreamObjectAtom.cs

@@ -9,6 +9,7 @@ public class DreamObjectAtom : DreamObject {
     public readonly DreamVisContentsList VisContents;
     public readonly DreamFilterList Filters;
     public DreamList? VisLocs; // TODO: Implement
+
     public DreamObjectAtom(DreamObjectDefinition objectDefinition) : base(objectDefinition) {
         Overlays = new(ObjectTree.List.ObjectDefinition, this, AppearanceSystem, false);
         Underlays = new(ObjectTree.List.ObjectDefinition, this, AppearanceSystem, true);
@@ -72,6 +73,7 @@ protected override bool TryGetVar(string varName, out DreamValue value) {
             case "vis_contents":
                 value = new(VisContents);
                 return true;
+
             default:
                 if (AtomManager.IsValidAppearanceVar(varName)) {
                     var appearance = AtomManager.MustGetAppearance(this);

OpenDreamRuntime/Objects/Types/DreamObjectParticles.cs

@@ -1,9 +1,6 @@
-using OpenDreamRuntime.Procs;
-using OpenDreamRuntime.Rendering;
 using OpenDreamRuntime.Resources;
 using OpenDreamShared.Dream;
 using OpenDreamShared.Rendering;
-using Robust.Shared.Map;
 using Vector3 = Robust.Shared.Maths.Vector3;
 
 namespace OpenDreamRuntime.Objects.Types;

OpenDreamShared/Dream/ImmutableAppearance.cs

@@ -51,7 +51,6 @@ public sealed class ImmutableAppearance : IEquatable<ImmutableAppearance> {
     [ViewVariables] public readonly ImmutableAppearance[] Overlays;
     [ViewVariables] public readonly ImmutableAppearance[] Underlays;
     [ViewVariables] public readonly Robust.Shared.GameObjects.NetEntity[] VisContents;
-    [ViewVariables] public readonly Robust.Shared.GameObjects.NetEntity[] Particles;
     [ViewVariables] public readonly DreamFilter[] Filters;
     [ViewVariables] public readonly int[] Verbs;
     [ViewVariables] public readonly ColorMatrix ColorMatrix = ColorMatrix.Identity;
@@ -107,7 +106,6 @@ public ImmutableAppearance(MutableAppearance appearance, SharedAppearanceSystem?
         Underlays = appearance.Underlays.ToArray();
 
         VisContents = appearance.VisContents.ToArray();
-        Particles = appearance.Particles.ToArray();
         Filters = appearance.Filters.ToArray();
         Verbs = appearance.Verbs.ToArray();
         Override = appearance.Override;
@@ -170,7 +168,6 @@ public bool Equals(ImmutableAppearance? immutableAppearance) {
         if (immutableAppearance.Overlays.Length != Overlays.Length) return false;
         if (immutableAppearance.Underlays.Length != Underlays.Length) return false;
         if (immutableAppearance.VisContents.Length != VisContents.Length) return false;
-        if (immutableAppearance.Particles.Length != Particles.Length) return false;
         if (immutableAppearance.Filters.Length != Filters.Length) return false;
         if (immutableAppearance.Verbs.Length != Verbs.Length) return false;
         if (immutableAppearance.Override != Override) return false;
@@ -198,10 +195,6 @@ public bool Equals(ImmutableAppearance? immutableAppearance) {
             if (immutableAppearance.Verbs[i] != Verbs[i]) return false;
         }
 
-        for (int i = 0; i < Particles.Length; i++) {
-            if (immutableAppearance.Particles[i] != Particles[i]) return false;
-        }
-
         for (int i = 0; i < 6; i++) {
             if (!immutableAppearance.Transform[i].Equals(Transform[i])) return false;
         }
@@ -265,10 +258,6 @@ public override int GetHashCode() {
             hashCode.Add(visContent);
         }
 
-        foreach (int particlesObject in Particles) {
-            hashCode.Add(particlesObject);
-        }
-
         foreach (DreamFilter filter in Filters) {
             hashCode.Add(filter);
         }
@@ -290,8 +279,7 @@ public ImmutableAppearance(NetIncomingMessage buffer, IRobustSerializer serializ
         Underlays = [];
         VisContents = [];
         Filters = [];
-        Verbs = [];
-        Particles = [];
+        Verbs =[];
 
         var property = (IconAppearanceProperty)buffer.ReadByte();
         while (property != IconAppearanceProperty.End) {
@@ -404,16 +392,6 @@ public ImmutableAppearance(NetIncomingMessage buffer, IRobustSerializer serializ
 
                     break;
                 }
-                case IconAppearanceProperty.Particles: {
-                    var particlesCount = buffer.ReadVariableInt32();
-
-                    Particles = new Robust.Shared.GameObjects.NetEntity[particlesCount];
-                    for (int particlesI = 0; particlesI < particlesCount; particlesI++) {
-                        Particles[particlesI] = buffer.ReadNetEntity();
-                    }
-
-                    break;
-                }
                 case IconAppearanceProperty.Filters: {
                     var filtersCount = buffer.ReadInt32();
 
@@ -507,13 +485,11 @@ public MutableAppearance ToMutable() {
         result.VisContents.EnsureCapacity(VisContents.Length);
         result.Filters.EnsureCapacity(Filters.Length);
         result.Verbs.EnsureCapacity(Verbs.Length);
-        result.Particles.EnsureCapacity(Particles.Length);
         result.Overlays.AddRange(Overlays);
         result.Underlays.AddRange(Underlays);
         result.VisContents.AddRange(VisContents);
         result.Filters.AddRange(Filters);
         result.Verbs.AddRange(Verbs);
-        result.Particles.AddRange(Particles);
         Array.Copy(Transform, result.Transform, 6);
 
         return result;
@@ -663,15 +639,6 @@ public void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serialize
             }
         }
 
-        if (Particles.Length != 0) {
-            buffer.Write((byte)IconAppearanceProperty.Particles);
-
-            buffer.WriteVariableInt32(Particles.Length);
-            foreach (var item in Particles) {
-                buffer.Write(item);
-            }
-        }
-
         if (Filters.Length != 0) {
             buffer.Write((byte)IconAppearanceProperty.Filters);
 

OpenDreamShared/Dream/MutableAppearance.cs

@@ -49,7 +49,6 @@ public sealed class MutableAppearance : IEquatable<MutableAppearance>, IDisposab
     [ViewVariables] public List<ImmutableAppearance> Overlays;
     [ViewVariables] public List<ImmutableAppearance> Underlays;
     [ViewVariables] public List<Robust.Shared.GameObjects.NetEntity> VisContents;
-    [ViewVariables] public List<Robust.Shared.GameObjects.NetEntity> Particles;
     [ViewVariables] public List<DreamFilter> Filters;
     [ViewVariables] public List<int> Verbs;
     [ViewVariables] public Vector2i MaptextSize = new(32,32);
@@ -85,7 +84,6 @@ private MutableAppearance() {
         VisContents = [];
         Filters = [];
         Verbs = [];
-        Particles = [];
     }
 
     public void Dispose() {
@@ -139,13 +137,11 @@ public void CopyFrom(MutableAppearance appearance) {
         VisContents.Clear();
         Filters.Clear();
         Verbs.Clear();
-        Particles.Clear();
         Overlays.AddRange(appearance.Overlays);
         Underlays.AddRange(appearance.Underlays);
         VisContents.AddRange(appearance.VisContents);
         Filters.AddRange(appearance.Filters);
         Verbs.AddRange(appearance.Verbs);
-        Particles.AddRange(appearance.Particles);
         Array.Copy(appearance.Transform, Transform, 6);
     }
 
@@ -180,7 +176,6 @@ public bool Equals(MutableAppearance? appearance) {
         if (appearance.VisContents.Count != VisContents.Count) return false;
         if (appearance.Filters.Count != Filters.Count) return false;
         if (appearance.Verbs.Count != Verbs.Count) return false;
-        if (appearance.Particles.Count != Particles.Count) return false;
         if (appearance.Override != Override) return false;
         if (appearance.Maptext != Maptext) return false;
         if (appearance.MaptextSize != MaptextSize) return false;
@@ -206,10 +201,6 @@ public bool Equals(MutableAppearance? appearance) {
             if (appearance.Verbs[i] != Verbs[i]) return false;
         }
 
-        for (int i = 0; i < Particles.Count; i++) {
-            if (appearance.Particles[i] != Particles[i]) return false;
-        }
-
         for (int i = 0; i < 6; i++) {
             if (!appearance.Transform[i].Equals(Transform[i])) return false;
         }
@@ -291,10 +282,6 @@ public override int GetHashCode() {
             hashCode.Add(visContent);
         }
 
-        foreach (int particlesObject in Particles) {
-            hashCode.Add(particlesObject);
-        }
-
         foreach (DreamFilter filter in Filters) {
             hashCode.Add(filter);
         }
@@ -417,7 +404,6 @@ public enum IconAppearanceProperty : byte {
         Overlays,
         Underlays,
         VisContents,
-        Particles,
         Filters,
         Verbs,
         Transform,