upstream fix

Spatison · Jan 29, 2025 · 148d16a · 148d16a
1 parent 9c871a8
commit 148d16a
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 39 deletions.
diff --git a/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs b/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs
@@ -1,11 +1,11 @@
-using Content.Server.Nutrition.Components;
 using Content.Shared.Actions;
 using Content.Shared.Actions.Events;
 using Content.Shared.Audio;
 using Content.Shared.Damage;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;

diff --git a/Resources/Locale/en-US/_white/prototypes/mobs/сustomization/markings/human-hair.ftl b/Resources/Locale/en-US/_white/prototypes/mobs/сustomization/markings/human-hair.ftl
@@ -1,4 +1,3 @@
-marking-HumanHairAfricanPigtails = Pigtails (African)
 marking-HumanHairAfropuffdouble = Afro Puff, Double
 marking-HumanHairAfropuffleft = Afro Puff, Left
 marking-HumanHairAfropuffright = Afro Puff, Right
@@ -38,7 +37,7 @@ marking-HumanHairHalfshaveSnout = Half-Shaved 2 (Trimmed)
 marking-HumanHairHightight = High Tight
 marking-HumanHairHyenamane = Hyena Mane
 marking-HumanHairJessica = Jessica
-marking-HumanHairLong4 = Long 4
+marking-HumanHairLong5 = Long 5
 marking-HumanHairLongdtails = Long Tails
 marking-HumanHairLongerAlt = Long (Alt.)
 marking-HumanHairLongovereyeAlt = Long (Over Eye Alt.)

diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/mobs/сustomization/markings/human-hair.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/mobs/сustomization/markings/human-hair.ftl
@@ -1,4 +1,3 @@
-marking-HumanHairAfricanPigtails = Хвостики (Африканские)
 marking-HumanHairAfropuffdouble = Aфро-пуф, Двойной
 marking-HumanHairAfropuffleft = Aфро-пуф, Левый
 marking-HumanHairAfropuffright = Aфро-пуф, Правый
@@ -38,7 +37,7 @@ marking-HumanHairHalfshaveSnout = Наполовину выбритая 2 (Об
 marking-HumanHairHightight = Хай-тайт
 marking-HumanHairHyenamane = Грива гиены
 marking-HumanHairJessica = Джессика
-marking-HumanHairLong4 = Длинная 4
+marking-HumanHairLong5 = Длинная 5
 marking-HumanHairLongdtails = Длинные хвосты
 marking-HumanHairLongerAlt = Длинная (Альт.)
 marking-HumanHairLongovereyeAlt = Длинная (Через глаз альт.)

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -80,8 +80,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.04
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    coefficient: 0.01
   - type: ExplosionResistance
     damageCoefficient: 0.5
   - type: Armor

diff --git a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
@@ -108,14 +108,17 @@
     templateId: digitigrade
     displacements:
       jumpsuit:
-        layer:
-          sprite: Mobs/Species/Harpy/displacement.rsi
-          state: jumpsuit
-          copyToShaderParameters:
-            # Value required, provide a dummy. Gets overridden when applied.
-            layerKey: dummy
-            parameterTexture: displacementMap
-            parameterUV: displacementUV
+        # WD EDIT START
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Harpy/displacement.rsi
+            state: jumpsuit
+            copyToShaderParameters:
+              # Value required, provide a dummy. Gets overridden when applied.
+              layerKey: dummy
+              parameterTexture: displacementMap
+              parameterUV: displacementUV
+        # WD EDIT START
   - type: HarpyVisuals
   - type: UltraVision
   - type: Tag
@@ -156,14 +159,17 @@
     templateId: digitigrade
     displacements:
       jumpsuit:
-        layer:
-          sprite: Mobs/Species/Harpy/displacement.rsi
-          state: jumpsuit
-          copyToShaderParameters:
-            # Value required, provide a dummy. Gets overridden when applied.
-            layerKey: dummy
-            parameterTexture: displacementMap
-            parameterUV: displacementUV
+        # WD EDIT START
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Harpy/displacement.rsi
+            state: jumpsuit
+            copyToShaderParameters:
+              # Value required, provide a dummy. Gets overridden when applied.
+              layerKey: dummy
+              parameterTexture: displacementMap
+              parameterUV: displacementUV
+        # WD EDIT START
   - type: Sprite
     scale: 0.9, 0.9
     layers:

diff --git a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1,11 +1,3 @@
-- type: marking
-  id: HumanHairAfricanPigtails
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: africanpigtails
-
 - type: marking
   id: HumanHairAfropuffdouble
   bodyPart: Hair
@@ -311,12 +303,12 @@
       state: jessica
 
 - type: marking
-  id: HumanHairLong4
+  id: HumanHairLong5
   bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: long4
+      state: long5
 
 - type: marking
   id: HumanHairLongdtails

diff --git a/Resources/Textures/_White/Mobs/Customization/human_hair.rsi/africanpigtails.png b/Resources/Textures/_White/Mobs/Customization/human_hair.rsi/africanpigtails.png
diff --git a/...bs/Customization/human_hair.rsi/long4.png → ...bs/Customization/human_hair.rsi/long5.png b/...bs/Customization/human_hair.rsi/long4.png → ...bs/Customization/human_hair.rsi/long5.png
diff --git a/Resources/Textures/_White/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/_White/Mobs/Customization/human_hair.rsi/meta.json
@@ -7,10 +7,6 @@
     "y": 32
   },
   "states": [
-    {
-      "name": "africanpigtails",
-      "directions": 4
-    },
     {
       "name": "afropuffdouble",
       "directions": 4
@@ -164,7 +160,7 @@
       "directions": 4
     },
     {
-      "name": "long4",
+      "name": "long5",
       "directions": 4
     },
     {

diff --git a/RobustToolbox b/RobustToolbox