From 423f2468e9019e056c835731d81286cdda9e4b5c Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sun, 15 Dec 2024 19:05:08 +0100 Subject: [PATCH 1/2] fix --- .../Clothing/ClientClothingSystem.cs | 3 ++- .../DeltaV/Entities/Mobs/Species/rodentia.yml | 14 +++++------ .../Entities/Mobs/Species/vulpkanin.yml | 14 +++++------ .../Entities/Mobs/Species/arachne.yml | 12 +++++----- .../Prototypes/Entities/Mobs/Species/base.yml | 24 +++++++++---------- .../Entities/Mobs/Species/diona.yml | 14 +++++------ .../Entities/Mobs/Species/reptilian.yml | 14 +++++------ 7 files changed, 48 insertions(+), 47 deletions(-) diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index 96bbcc54f2..878d71cac1 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -321,7 +321,8 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot if (layerData.State is not null && inventory.SpeciesId is not null && layerData.State.EndsWith(inventory.SpeciesId)) continue; - _displacement.TryAddDisplacement(displacementData, sprite, index, key, revealedLayers); + if (_displacement.TryAddDisplacement(displacementData, sprite, index, key, revealedLayers)) + index++; } } diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml index 782a198af4..0f63672e23 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml @@ -122,13 +122,13 @@ - type: Flammable fireStackIncreaseMultiplier: 1.25 - type: Inventory - speciesId: rodentia - femaleDisplacements: # Floof - displacements - jumpsuit: - sizeMaps: - 32: - sprite: Mobs/Species/Human/displacement.rsi - state: jumpsuit-female + # speciesId: rodentia + # femaleDisplacements: # Floof - displacements + # jumpsuit: + # sizeMaps: + # 32: + # sprite: Mobs/Species/Human/displacement.rsi + # state: jumpsuit-female - type: entity save: false diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index 6ccd88f911..63e20f4b2a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -105,13 +105,13 @@ - type: Flammable fireStackIncreaseMultiplier: 1.25 - type: Inventory - speciesId: vulpkanin - femaleDisplacements: # Floof - displacements - jumpsuit: - sizeMaps: - 32: - sprite: Mobs/Species/Human/displacement.rsi - state: jumpsuit-female + # speciesId: vulpkanin + # femaleDisplacements: # Floof - displacements + # jumpsuit: + # sizeMaps: + # 32: + # sprite: Mobs/Species/Human/displacement.rsi + # state: jumpsuit-female - type: entity save: false diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml index 3e251c5fb2..ac3b765110 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml @@ -93,12 +93,12 @@ speechSounds: Alto - type: Inventory templateId: anytaur - femaleDisplacements: # Floof - displacements - jumpsuit: - sizeMaps: - 32: - sprite: Mobs/Species/Human/displacement.rsi - state: jumpsuit-female + # femaleDisplacements: # Floof - displacements + # jumpsuit: + # sizeMaps: + # 32: + # sprite: Mobs/Species/Human/displacement.rsi + # state: jumpsuit-female - type: Tag tags: - CanPilot diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index b5180dc8fb..e82e12a604 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -143,12 +143,12 @@ - type: IdExaminable - type: Hands - type: Inventory - femaleDisplacements: # Floof - displacements - jumpsuit: - sizeMaps: - 32: - sprite: Mobs/Species/Human/displacement.rsi - state: jumpsuit-female + # femaleDisplacements: # Floof - displacements + # jumpsuit: + # sizeMaps: + # 32: + # sprite: Mobs/Species/Human/displacement.rsi + # state: jumpsuit-female - type: InventorySlots - type: FloatingVisuals - type: Climbing @@ -318,12 +318,12 @@ components: - type: Hands - type: Inventory - femaleDisplacements: # Floof - displacements - jumpsuit: - sizeMaps: - 32: - sprite: Mobs/Species/Human/displacement.rsi - state: jumpsuit-female + # femaleDisplacements: # Floof - displacements + # jumpsuit: + # sizeMaps: + # 32: + # sprite: Mobs/Species/Human/displacement.rsi + # state: jumpsuit-female - type: InventorySlots - type: ContainerContainer - type: Icon diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index a27f4be9e6..bbb76d0a25 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -86,13 +86,13 @@ layer: - MobLayer - type: Inventory - templateId: diona - femaleDisplacements: # Floof - displacements - jumpsuit: - sizeMaps: - 32: - sprite: Mobs/Species/Human/displacement.rsi - state: jumpsuit-female + # templateId: diona + # femaleDisplacements: # Floof - displacements + # jumpsuit: + # sizeMaps: + # 32: + # sprite: Mobs/Species/Human/displacement.rsi + # state: jumpsuit-female - type: Speech speechVerb: Plant - type: Vocal diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index dc51b62f0e..027ba71115 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -24,13 +24,13 @@ - id: FoodMeatLizard amount: 5 - type: Inventory - speciesId: reptilian - femaleDisplacements: # Floof - displacements - jumpsuit: - sizeMaps: - 32: - sprite: Mobs/Species/Human/displacement.rsi - state: jumpsuit-female + # speciesId: reptilian + # femaleDisplacements: # Floof - displacements + # jumpsuit: + # sizeMaps: + # 32: + # sprite: Mobs/Species/Human/displacement.rsi + # state: jumpsuit-female - type: LizardAccent - type: Speech speechSounds: Lizard From 91ae2397d626e64fec99880dfb1894d0a3ba26d3 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Sun, 15 Dec 2024 21:06:03 +0100 Subject: [PATCH 2/2] Update rodentia.yml --- Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml index 0f63672e23..b82d6cad01 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml @@ -122,7 +122,7 @@ - type: Flammable fireStackIncreaseMultiplier: 1.25 - type: Inventory - # speciesId: rodentia + speciesId: rodentia # femaleDisplacements: # Floof - displacements # jumpsuit: # sizeMaps: