Merge remote-tracking branch 'EE_Upstream/master'

SS14-Classic · May 3, 2024 · cc041fd · cc041fd
2 parents 57f2414 + b68ed3c
commit cc041fd
Show file tree

Hide file tree

Showing 104 changed files with 1,763 additions and 210 deletions.
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -281,6 +281,9 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
                 // note that every insertion requires reshuffling & remapping all the existing layers.
                 sprite.AddBlankLayer(index);
                 sprite.LayerMapSet(key, index);
+
+                if (layerData.Color != null)
+                    sprite.LayerSetColor(key, layerData.Color.Value);
             }
             else
                 index = sprite.LayerMapReserveBlank(key);

diff --git a/Content.Client/Sprite/RandomSpriteSystem.cs b/Content.Client/Sprite/RandomSpriteSystem.cs
@@ -1,3 +1,5 @@
+using Content.Client.Clothing;
+using Content.Shared.Clothing.Components;
 using Content.Shared.Sprite;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameStates;
@@ -8,6 +10,7 @@ namespace Content.Client.Sprite;
 public sealed class RandomSpriteSystem : SharedRandomSpriteSystem
 {
     [Dependency] private readonly IReflectionManager _reflection = default!;
+    [Dependency] private readonly ClientClothingSystem _clothing = default!;
 
     public override void Initialize()
     {
@@ -31,10 +34,29 @@ private void OnHandleState(EntityUid uid, RandomSpriteComponent component, ref C
             component.Selected.Add(layer.Key, layer.Value);
         }
 
-        UpdateAppearance(uid, component);
+        UpdateSpriteComponentAppearance(uid, component);
+        UpdateClothingComponentAppearance(uid, component);
     }
 
-    private void UpdateAppearance(EntityUid uid, RandomSpriteComponent component, SpriteComponent? sprite = null)
+    private void UpdateClothingComponentAppearance(EntityUid uid, RandomSpriteComponent component, ClothingComponent? clothing = null)
+    {
+        if (!Resolve(uid, ref clothing, false))
+            return;
+
+        if (clothing.ClothingVisuals == null)
+            return;
+
+        foreach (var slotPair in clothing.ClothingVisuals)
+        {
+            foreach (var keyColorPair in component.Selected)
+            {
+                _clothing.SetLayerColor(clothing, slotPair.Key, keyColorPair.Key, keyColorPair.Value.Color);
+                _clothing.SetLayerState(clothing, slotPair.Key, keyColorPair.Key, keyColorPair.Value.State);
+            }
+        }
+    }
+
+    private void UpdateSpriteComponentAppearance(EntityUid uid, RandomSpriteComponent component, SpriteComponent? sprite = null)
     {
         if (!Resolve(uid, ref sprite, false))
             return;
@@ -55,7 +77,6 @@ private void UpdateAppearance(EntityUid uid, RandomSpriteComponent component, Sp
                     continue;
                 }
             }
-
             sprite.LayerSetState(index, layer.Value.State);
             sprite.LayerSetColor(index, layer.Value.Color ?? Color.White);
         }

diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
@@ -134,7 +134,7 @@ private bool CanDock(
 
        foreach (var config in configs)
        {
-           if (config.Coordinates.Equals(coordinates) && config.Angle.EqualsApprox(angle, 0.01))
+           if (config.Coordinates.Equals(coordinates) && config.Angle.EqualsApprox(angle, 0.15))
            {
                return config;
            }

diff --git a/Content.Server/Zombies/PendingZombieComponent.cs b/Content.Server/Zombies/PendingZombieComponent.cs
@@ -16,8 +16,7 @@ public sealed partial class PendingZombieComponent : Component
     {
         DamageDict = new ()
         {
-            { "Blunt", 0.25 },
-            { "Poison", 0.1 },
+            { "Poison", 0.3 },
         }
     };
 

diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -217,5 +217,38 @@ public void CopyVisuals(EntityUid uid, ClothingComponent otherClothing, Clothing
         Dirty(uid, clothing);
     }
 
+    public void SetLayerColor(ClothingComponent clothing, string slot, string mapKey, Color? color)
+    {
+        if (clothing.ClothingVisuals == null)
+            return;
+
+        foreach (var layer in clothing.ClothingVisuals[slot])
+        {
+            if (layer.MapKeys == null)
+                return;
+
+            if (!layer.MapKeys.Contains(mapKey))
+                continue;
+
+            layer.Color = color;
+        }
+    }
+    public void SetLayerState(ClothingComponent clothing, string slot, string mapKey, string state)
+    {
+        if (clothing.ClothingVisuals == null)
+            return;
+
+        foreach (var layer in clothing.ClothingVisuals[slot])
+        {
+            if (layer.MapKeys == null)
+                return;
+
+            if (!layer.MapKeys.Contains(mapKey))
+                continue;
+
+            layer.State = state;
+        }
+    }
+
     #endregion
 }
diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
@@ -20,14 +20,14 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
     /// The baseline infection chance you have if you are completely nude
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    public float MaxZombieInfectionChance = 0.50f;
+    public float MaxZombieInfectionChance = 0.80f;
 
     /// <summary>
     /// The minimum infection chance possible. This is simply to prevent
     /// being invincible by bundling up.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    public float MinZombieInfectionChance = 0.20f;
+    public float MinZombieInfectionChance = 0.50f;
 
     [ViewVariables(VVAccess.ReadWrite)]
     public float ZombieMovementSpeedDebuff = 0.70f;

diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl
@@ -3,3 +3,5 @@ advertisement-courierdrobe-2 = A great investment for your survival!
 advertisement-courierdrobe-3 = Wear your brown with pride!
 advertisement-courierdrobe-4 = These shorts are comfy and easy to wear, get yours now!
 advertisement-courierdrobe-5 = Outrun every danger with our stylish clothes!
+thankyou-courierdrobe-1 = Now get out there and deliver that mail!
+thankyou-courierdrobe-1 = Those parcels aren't going to deliver themselves!
diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl
@@ -1,3 +1,5 @@
 advertisement-pride-1 = Be gay do crime!
 advertisement-pride-2 = Full of colors!
 advertisement-pride-3 = You are valid!
+thankyou-pride-1 = Go, do some crime!
+thankyou-pride-1 = Have a colorful day!
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
@@ -24,46 +24,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingUniformJumpsuitColorWhite
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorWhite
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorBlue
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorBlue
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorYellow
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorYellow
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorGreen
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorGreen
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorOrange
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorOrange
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorPink
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorPink
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorRed
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorRed
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorDarkBlue
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorDarkBlue
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorTeal
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorTeal
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorPurple
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorPurple
-        prob: 0.25
       - id: ClothingShoesColorBlack
         amount: 1
       - id: ClothingShoesColorBrown
@@ -74,6 +34,16 @@
         prob: 0.4
       - id: ClothingOuterCoatGentle
         prob: 0.3
+      - id: ClothingUniformRandomShorts
+        amount: 3
+      - id: ClothingUniformRandomArmless
+        amount: 5
+      - id: ClothingUniformRandomStandart
+        amount: 5
+      - id: ClothingUniformRandomBra
+        amount: 5
+      - id: ClothingUniformRandomShirt
+        amount: 4
 
 - type: entity
   id: WardrobeYellowFilled

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -5,6 +5,7 @@
     ClothingBackpackDuffel: 5
     ClothingBackpackSatchel: 3
     ClothingBackpackSatchelLeather: 2
+    ClothingRandomSpawner: 8
     ClothingHeadHatBeret: 4
     ClothingHeadBandBlack: 2
     ClothingHeadBandBlue: 2

diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml
@@ -6,3 +6,6 @@
     - advertisement-courierdrobe-3
     - advertisement-courierdrobe-4
     - advertisement-courierdrobe-5
+  thankyous:
+    - thankyou-courierdrobe-1
+    - thankyou-courierdrobe-2
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
@@ -3,4 +3,7 @@
   advertisements:
   - advertisement-pride-1
   - advertisement-pride-2
-  - advertisement-pride-3
+  - advertisement-pride-3
+  thankyous:
+  - thankyou-pride-1
+  - thankyou-pride-2
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -28,25 +28,25 @@
       collection: HarpyGrowls
     Purr:
       collection: HarpyPurrs
-    Ring:
+    HarpyRing:
       collection: HarpyRings
-    HonkHarpy:
+    HarpyHonk:
       collection: HarpyHonks
-    Pew:
+    HarpyPew:
       collection: HarpyPews
-    Bang:
+    HarpyBang:
       collection: HarpyBangs
-    Beep:
+    HarpyBeep:
       collection: HarpyBeeps
-    Rev:
+    HarpyRev:
       collection: HarpyRevs
-#    Click:
-#      collection: HarpyClicks
+    Click:
+      collection: HarpyClicks
     Chitter:
       collection: HarpyChitter
     Squeak:
       collection: HarpySqueak
-    Caw:
+    HarpyCaw:
       collection: HarpyCaws
     Chirp:
       collection: HarpyChirps
@@ -58,6 +58,10 @@
       collection: VulpkaninWhines
     Howl:
       collection: VulpkaninHowls
+    Honk:
+      collection: BikeHorn
+    Weh:
+      collection: Weh
 
 - type: emoteSounds
   id: MaleVulpkanin
@@ -72,12 +76,20 @@
       collection: MaleSneezes
     Cough:
       collection: MaleCoughs
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
     Crying:
       collection: MaleCry
     Whistle:
       collection: Whistles
-    Sigh:
-      collection: MaleSigh
+    Weh:
+      collection: Weh
     Growl:
       collection: VulpkaninGrowls
     Snarl:
@@ -102,12 +114,20 @@
       collection: FemaleSneezes
     Cough:
       collection: FemaleCoughs
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
     Crying:
       collection: FemaleCry
     Whistle:
       collection: Whistles
-    Sigh:
-      collection: FemaleSigh
+    Weh:
+      collection: Weh
     Growl:
       collection: VulpkaninGrowls
     Snarl: