From 468fbda5397fe3614bd72fb5fc0170002c08d0a0 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 12 Aug 2019 18:46:34 +0200
Subject: [PATCH] Ensure stable sort in the entity rendering sort.

---
 Robust.Client/Graphics/Clyde/Clyde.Rendering.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Robust.Client/Graphics/Clyde/Clyde.Rendering.cs b/Robust.Client/Graphics/Clyde/Clyde.Rendering.cs
index fb170fad9b..ff65174b6a 100644
--- a/Robust.Client/Graphics/Clyde/Clyde.Rendering.cs
+++ b/Robust.Client/Graphics/Clyde/Clyde.Rendering.cs
@@ -142,7 +142,14 @@ namespace Robust.Client.Graphics.Clyde
                             return cmp;
                         }
 
-                        return a.RenderOrder.CompareTo(b.RenderOrder);
+                        cmp = a.RenderOrder.CompareTo(b.RenderOrder);
+
+                        if (cmp != 0)
+                        {
+                            return cmp;
+                        }
+
+                        return a.Owner.Uid.CompareTo(b.Owner.Uid);
                     });
 
                     foreach (var sprite in entityList)