Fixes (#73)

* - fix: Genitals sprite shit and meow for tajaran

* - add: fart sound if kicked from server

* - tweak: vulpies and tajaran now for donaters!!!

* - fix: Fart on exit

* - add: roleplay think

* - fix: database shit and loc

* - add: ears for slime

* - fix: LOC interaction fix

* - add: height setting

* - fix: height for felinids

* - fix: nigga fix

* - fix: no bitches on captain

* - fix: interaction panel animation shit

Content.Shared/Humanoid/HumanoidCharacterAppearance.cs

@@ -19,6 +19,7 @@ namespace Content.Shared.Humanoid
             Color facialHairColor,
             Color eyeColor,
             Color skinColor,
+            byte height,
             List<Marking> markings, List<Genital> genitals)
         {
             HairStyleId = hairStyleId;
@@ -29,6 +30,7 @@ namespace Content.Shared.Humanoid
             SkinColor = ClampColor(skinColor);
             Markings = markings;
             Genitals = genitals;
+            Height = height;
         }
 
         [DataField("hair")]
@@ -53,49 +55,57 @@ namespace Content.Shared.Humanoid
         public List<Marking> Markings { get; private set; }
 
         [DataField("genitals")]
-        public List<Genital> Genitals { get; private set; }//AMOUR
+        public List<Genital> Genitals { get; private set; } //AMOUR
+
+        [DataField] public byte Height { get; private set; } //AMOUR
 
         public HumanoidCharacterAppearance WithHairStyleName(string newName)
         {
-            return new(newName, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, Markings, Genitals);
+            return new(newName, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, Height, Markings, Genitals);
         }
 
         public HumanoidCharacterAppearance WithHairColor(Color newColor)
         {
-            return new(HairStyleId, newColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, Markings , Genitals);
+            return new(HairStyleId, newColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, Height, Markings , Genitals);
         }
 
         public HumanoidCharacterAppearance WithFacialHairStyleName(string newName)
         {
-            return new(HairStyleId, HairColor, newName, FacialHairColor, EyeColor, SkinColor, Markings , Genitals);
+            return new(HairStyleId, HairColor, newName, FacialHairColor, EyeColor, SkinColor, Height, Markings , Genitals);
         }
 
         public HumanoidCharacterAppearance WithFacialHairColor(Color newColor)
         {
-            return new(HairStyleId, HairColor, FacialHairStyleId, newColor, EyeColor, SkinColor, Markings , Genitals);
+            return new(HairStyleId, HairColor, FacialHairStyleId, newColor, EyeColor, SkinColor, Height, Markings , Genitals);
         }
 
         public HumanoidCharacterAppearance WithEyeColor(Color newColor)
         {
-            return new(HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, newColor, SkinColor, Markings , Genitals);
+            return new(HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, newColor, SkinColor, Height, Markings , Genitals);
         }
 
         public HumanoidCharacterAppearance WithSkinColor(Color newColor)
         {
-            return new(HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, newColor, Markings , Genitals);
+            return new(HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, newColor, Height, Markings , Genitals);
         }
 
         public HumanoidCharacterAppearance WithMarkings(List<Marking> newMarkings)
         {
-            return new(HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, newMarkings , Genitals);
+            return new(HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, Height, newMarkings , Genitals);
         }
 
         public HumanoidCharacterAppearance WithGenitals(List<Genital> genitals)
         {
-            return new(HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, Markings,
+            return new(HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, Height, Markings,
                 genitals);
         }
 
+        public HumanoidCharacterAppearance WithHeight(byte height)
+        {
+            return new (HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, height, Markings,
+                Genitals);
+        }
+
         public HumanoidCharacterAppearance(List<Genital> genitals) : this(
             HairStyles.DefaultHairStyle,
             Color.Black,
@@ -103,6 +113,7 @@ namespace Content.Shared.Humanoid
             Color.Black,
             Color.Black,
             Humanoid.SkinColor.ValidHumanSkinTone,
+            128,
             new List<Marking>(), genitals
         )
         {
@@ -132,7 +143,7 @@ namespace Content.Shared.Humanoid
                 HairStyles.DefaultFacialHairStyle,
                 Color.Black,
                 Color.Black,
-                skinColor,
+                skinColor,128,
                 new (), new()
             );
         }
@@ -195,8 +206,10 @@ namespace Content.Shared.Humanoid
                 newSkinColor = Humanoid.SkinColor.ValidTintedHuesSkinTone(newSkinColor);
             }
 
+            var height = random.NextByte(byte.MaxValue);
+
             return new HumanoidCharacterAppearance(newHairStyle, newHairColor,
-                newFacialHairStyle, newHairColor, newEyeColor, newSkinColor, new (), new());
+                newFacialHairStyle, newHairColor, newEyeColor, newSkinColor,height, new (), new());
 
             float RandomizeColor(float channel)
             {
@@ -272,7 +285,7 @@ namespace Content.Shared.Humanoid
                     facialHairStyleId,
                     facialHairColor,
                     eyeColor,
-                    skinColor,
+                    skinColor, appearance.Height,
                     markingSet.GetForwardEnumerator().ToList(),genitals);
             }
 
@@ -296,7 +309,7 @@ namespace Content.Shared.Humanoid
                 facialHairStyleId,
                 facialHairColor,
                 eyeColor,
-                skinColor,
+                skinColor, appearance.Height,
                 markingSet.GetForwardEnumerator().ToList(), genitals);
         }
 

Content.Shared/Humanoid/Markings/MarkingPrototype.cs

@@ -25,6 +25,8 @@ namespace Content.Shared.Humanoid.Markings
 
         // WD-EDIT
         [DataField("sponsorOnly")] public bool SponsorOnly;
+        [DataField("layerAlpha")]
+        public float LayerAlpha { get; private set; } = 1.0f;
         // WD-EDIT
 
         [DataField("followSkinColor")]

Content.Shared/Humanoid/SkinColor.cs

@@ -5,7 +5,7 @@ public static class SkinColor
     public const float MaxTintedHuesSaturation = 0.1f;
     public const float MinTintedHuesLightness = 0.85f;
 
-    public const float MinHuesLightness = 0.175f;
+    public const float MinHuesLightness = 0.1f; // Я не расист, я хочу видеть негров
 
     public static Color ValidHumanSkinTone => Color.FromHsv(new Vector4(0.07f, 0.2f, 1f, 1f));
 
@@ -144,7 +144,7 @@ public static class SkinColor
     ///     This takes in a color, and returns a color guaranteed to be above MinHuesLightness
     /// </summary>
     /// <param name="color"></param>
-    /// <returns>Either the color as-is if it's above MinHuesLightness, or the color with luminosity increased above MinHuesLightness</returns> 
+    /// <returns>Either the color as-is if it's above MinHuesLightness, or the color with luminosity increased above MinHuesLightness</returns>
     public static Color MakeHueValid(Color color)
     {
         var manipulatedColor = Color.ToHsv(color);