Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Female Displacement Disabled #413

Merged
merged 2 commits into from
Dec 15, 2024
Merged

Female Displacement Disabled #413

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
423f246
fix
FoxxoTrystan Dec 15, 2024
91ae239
Update rodentia.yml
FoxxoTrystan Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Content.Client/Clothing/ClientClothingSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
}
}

Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make sure not to comment out the speciesId fields, they may be needed for other purposes

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops

# femaleDisplacements: # Floof - displacements
# jumpsuit:
# sizeMaps:
# 32:
# sprite: Mobs/Species/Human/displacement.rsi
# state: jumpsuit-female

- type: entity
save: false
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/Entities/Mobs/Species/arachne.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions Resources/Prototypes/Entities/Mobs/Species/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/Entities/Mobs/Species/diona.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading