tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Humanoid patches (#11467)

Browse Source 
* restores species/age on examine

* makes the default human skin tone a little less green

* ensures human skin tone verification is rounded to the nearest integer value, adds tests for ensuring all human skin tones are valid and that the default skin tone is valid
This commit is contained in:
Flipp Syder
2022-09-22 18:25:56 -07:00
committed by GitHub
parent 61df1c7c27
commit caa5efcd6f
4 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Humanoid/SharedHumanoidSystem.cs
View File

@@ -1,5 +1,7 @@
using Content.Shared.Humanoid.Markings;
using Content.Shared.Humanoid.Prototypes;
using Content.Shared.Preferences;
using Robust.Shared.Prototypes;
namespace Content.Shared.Humanoid;
@@ -14,7 +16,7 @@ namespace Content.Shared.Humanoid;
/// </summary>
public abstract class SharedHumanoidSystem : EntitySystem
{
[Dependency] private SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
public const string DefaultSpecies = "Human";

8
Content.Shared/Humanoid/SkinColor.cs
View File

@@ -2,7 +2,7 @@ namespace Content.Shared.Humanoid;
public static class SkinColor
{
public static Color ValidHumanSkinTone => Color.FromHsv(new Vector4(0.25f, 0.2f, 1f, 1f));
public static Color ValidHumanSkinTone => Color.FromHsv(new Vector4(0.07f, 0.2f, 1f, 1f));
/// <summary>
/// Turn a color into a valid tinted hue skin tone.
@@ -93,9 +93,9 @@ public static class SkinColor
{
var colorValues = Color.ToHsv(color);
var hue = colorValues.X * 360f;
var sat = colorValues.Y * 100f;
var val = colorValues.Z * 100f;
var hue = Math.Round(colorValues.X * 360f);
var sat = Math.Round(colorValues.Y * 100f);
var val = Math.Round(colorValues.Z * 100f);
// rangeOffset makes it so that this value
// is 25 <= hue <= 45
if (hue < 25 || hue > 45)