Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Broken Heights/Widths #1390

Merged
merged 11 commits into from
Jan 1, 2025
Merged

Fixes Broken Heights/Widths #1390

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1d91d5d
DAMNATION
gluesniffler Dec 31, 2024
fadba5b
minor yml conflicts
gluesniffler Dec 31, 2024
6ad85bf
YML linter part 1
gluesniffler Dec 31, 2024
ff860f9
YML linter part 2
gluesniffler Dec 31, 2024
f93158f
YML linter part 3
gluesniffler Dec 31, 2024
82cbd12
YML linter part 4
gluesniffler Dec 31, 2024
d932fac
THIS IS GLORPSHIT
gluesniffler Dec 31, 2024
edc9ba5
Fix diona lung test fail
gluesniffler Dec 31, 2024
a7da703
teehee
gluesniffler Jan 1, 2025
602cbfd
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
gluesniffler Jan 1, 2025
c5cedda
forgor to merge master
gluesniffler Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Content.Client/Humanoid/HumanoidAppearanceSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Numerics;
using Content.Shared.Humanoid;
using Content.Shared.Humanoid.Markings;
using Content.Shared.Humanoid.Prototypes;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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));
}
Expand Down
Loading