Merge branch 'master' into wizmerge

Simple-Station · Jan 1, 2025 · ecd416a · ecd416a
2 parents 103e552 + 6e6caf8
commit ecd416a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
@@ -30,6 +31,15 @@ private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent
         UpdateLayers(component, sprite);
         ApplyMarkingSet(component, sprite);
 
+        var speciesPrototype = _prototypeManager.Index(component.Species);
+
+        var height = Math.Clamp(component.Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+        var width = Math.Clamp(component.Width, speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
+        component.Height = height;
+        component.Width = width;
+
+        sprite.Scale = new Vector2(width, height);
+
         sprite[sprite.LayerMapReserveBlank(HumanoidVisualLayers.Eyes)].Color = component.EyeColor;
     }
 
@@ -199,6 +209,8 @@ public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profil
         humanoid.Species = profile.Species;
         humanoid.SkinColor = profile.Appearance.SkinColor;
         humanoid.EyeColor = profile.Appearance.EyeColor;
+        humanoid.Height = profile.Height;
+        humanoid.Width = profile.Width;
 
         UpdateSprite(humanoid, Comp<SpriteComponent>(uid));
     }

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -8894,3 +8894,10 @@ Entries:
   id: 6602
   time: '2024-12-31T20:42:24.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1387
+- author: Mocho
+  changes:
+    - type: Fix
+      message: Fixed heights/widths being broken due to the shitmed patch.
+  id: 6603
+  time: '2025-01-01T03:33:47.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1390