Skeleton Bugfix Pt. 2 (#8137)

Content.Server/Body/Systems/BodyReassembleSystem.cs

@@ -138,24 +138,18 @@ namespace Content.Server.Body.Systems
 
             // Ensures all of the old body part pieces are there
             var xformQuery = GetEntityQuery<TransformComponent>();
-            var notFound = true;
             var bodyXform = xformQuery.GetComponent(uid);
 
             foreach (var part in component.BodyParts)
             {
                 if (!xformQuery.TryGetComponent(part, out var xform) ||
-                    !bodyXform.Coordinates.InRange(EntityManager, xform.Coordinates, 2f)) continue;
+                    !bodyXform.Coordinates.InRange(EntityManager, xform.Coordinates,2f))
-
+                {
-                notFound = false;
+                    _popupSystem.PopupEntity(Loc.GetString("reassemble-fail"), uid, Filter.Entities(uid));
+                    return false;
+                }
                 partList.Add(part);
             }
-
-            if (notFound)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("reassemble-fail"), uid, Filter.Entities(uid));
-                return false;
-            }
-
             return true;
         }
 
@@ -163,7 +157,7 @@ namespace Content.Server.Body.Systems
         {
             component.CancelToken = null;
 
-            if (component.DNA == null)
+            if (component.DNA == null || component.BodyParts == null)
                 return;
 
             // Creates the new entity and transfers the mind component
@@ -177,7 +171,7 @@ namespace Content.Server.Body.Systems
                 mindcomp.Mind.TransferTo(mob);
 
             // Cleans up all the body part pieces
-            foreach (var entity in args.PartList)
+            foreach (var entity in component.BodyParts)
             {
                 EntityManager.DeleteEntity(entity);
             }

Resources/Prototypes/Entities/Mobs/Species/skeleton.yml

@@ -28,7 +28,7 @@
   - type: Barotrauma
     damage:
       types:
-        Blunt: 0.7 #per second, scales with pressure and other constants.
+        Blunt: 0.4 #per second, scales with pressure and other constants.
   - type: DamageOnHighSpeedImpact
     damage:
       types:
@@ -70,6 +70,10 @@
       color: "#ffffff"
       sprite: Mobs/Species/Skeleton/parts.rsi
       state: head_m
+    - map: ["enum.HumanoidVisualLayers.Eyes"]
+      color: "#008800"
+      sprite: Mobs/Customization/eyes.rsi
+      state: no_eyes
     - map: [ "enum.HumanoidVisualLayers.RArm" ]
       color: "#ffffff"
       sprite: Mobs/Species/Skeleton/parts.rsi
@@ -122,6 +126,7 @@
     - map: [ "shoes" ]
     - map: [ "ears" ]
     - map: [ "outerClothing" ]
+    - map: [ "eyes" ]
     - map: [ "belt" ]
     - map: [ "neck" ]
     - map: [ "back" ]
@@ -274,6 +279,10 @@
           color: "#b8b8b8"
           sprite: Mobs/Species/Skeleton/parts.rsi
           state: head_m
+        - map: ["enum.HumanoidVisualLayers.Eyes"]
+          color: "#008800"
+          sprite: Mobs/Customization/eyes.rsi
+          state: no_eyes
         - map: [ "enum.HumanoidVisualLayers.RArm" ]
           color: "#b8b8b8"
           sprite: Mobs/Species/Skeleton/parts.rsi
@@ -326,6 +335,7 @@
         - map: [ "shoes" ]
         - map: [ "ears" ]
         - map: [ "outerClothing" ]
+        - map: ["eyes"]
         - map: [ "belt" ]
         - map: [ "neck" ]
         - map: [ "back" ]

Resources/Textures/Mobs/Customization/eyes.rsi/meta.json

@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "eyes", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "vox_eyes_s", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{"version": 1, "license": "CC-BY-SA-3.0","copyright": "Vox_eyes Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb and human_eyes taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", "size": {"x": 32, "y": 32}, "states": [{"name": "eyes", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name":"no_eyes"},{"name": "vox_eyes_s", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}