Renders reagent grinders over lights (#31218)

* Adds a new layer to DrawDepth.cs for use with objects similar to the reagent grinder and properly summarises its uses

* applies new layer in DrawDepth.cs to reagent_grinder.yml

* Fix merge conflict

* oops

diff --git a/Content.Shared/DrawDepth/DrawDepth.cs b/Content.Shared/DrawDepth/DrawDepth.cs
index 2c1a130da4c48e5a4ecccbf3a0a18f9fa143c204..dbec886971ee693e016467dd3331ffaf9f467f13 100644 (file)
--- a/Content.Shared/DrawDepth/DrawDepth.cs
+++ b/Content.Shared/DrawDepth/DrawDepth.cs
@@ -81,42 +81,46 @@ namespace Content.Shared.DrawDepth
         WallMountedItems = DrawDepthTag.Default + 2,
 
         /// <summary>
-        ///     Generic items. Things that should be above crates & tables, but underneath mobs.
+        ///     To use for objects that would usually fall under SmallObjects, but appear taller than 1 tile. For example: Reagent Grinder
         /// </summary>
-        Items = DrawDepthTag.Default + 3,
+        LargeObjects = DrawDepthTag.Default + 3,
 
+        /// <summary>
+        ///     Generic items. Things that should be above crates & tables, but underneath mobs.
+        /// </summary>
+        Items = DrawDepthTag.Default + 4,
         /// <summary>
         /// Stuff that should be drawn below mobs, but on top of items. Like muzzle flash.
         /// </summary>
-        BelowMobs = DrawDepthTag.Default + 4,
+        BelowMobs = DrawDepthTag.Default + 5,
 
-        Mobs = DrawDepthTag.Default + 5,
+        Mobs = DrawDepthTag.Default + 6,
 
-        OverMobs = DrawDepthTag.Default + 6,
+        OverMobs = DrawDepthTag.Default + 7,
 
-        Doors = DrawDepthTag.Default + 7,
+        Doors = DrawDepthTag.Default + 8,
 
         /// <summary>
         /// Blast doors and shutters which go over the usual doors.
         /// </summary>
-        BlastDoors = DrawDepthTag.Default + 8,
+        BlastDoors = DrawDepthTag.Default + 9,
 
         /// <summary>
         /// Stuff that needs to draw over most things, but not effects, like Kudzu.
         /// </summary>
-        Overdoors = DrawDepthTag.Default + 9,
+        Overdoors = DrawDepthTag.Default + 10,
 
         /// <summary>
         ///     Explosions, fire, melee swings. Whatever.
         /// </summary>
-        Effects = DrawDepthTag.Default + 10,
+        Effects = DrawDepthTag.Default + 11,
 
-        Ghosts = DrawDepthTag.Default + 11,
+        Ghosts = DrawDepthTag.Default + 12,
 
         /// <summary>
         ///    Use this selectively if it absolutely needs to be drawn above (almost) everything else. Examples include
         ///    the pointing arrow, the drag & drop ghost-entity, and some debug tools.
         /// </summary>
-        Overlays = DrawDepthTag.Default + 12,
+        Overlays = DrawDepthTag.Default + 13,
     }
 }

diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index 6456e043b8cc92d392271e3bc702de146b18cb31..f384de64ab7003517247fc73afa6bedaaedf5ec0 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -32,7 +32,7 @@
         - TabletopMachineLayer
   - type: Sprite
     sprite: Structures/Machines/grinder.rsi
-    drawdepth: SmallObjects
+    drawdepth: LargeObjects
     snapCardinals: true
     offset: "0.0,0.4"
     layers: