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

Jump to bottom

Harpy Peacock Tail #428

Merged
merged 9 commits into from
Jun 20, 2024
Merged

Harpy Peacock Tail #428

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
770a2b0
YE
VMSolidus May 31, 2024
5dceb82
Merge branch 'master' into Harpy-Markings-Wave-2
VMSolidus Jun 15, 2024
8e61fc8
Update Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails…
VMSolidus Jun 15, 2024
acf2ae3
That's right, I'm their maintainer, and I maintain them here now
VMSolidus Jun 15, 2024
4a251af
Update harpy.yml
VMSolidus Jun 15, 2024
777698d
renaming folders
VMSolidus Jun 16, 2024
4022a47
Merge branch 'master' into Harpy-Markings-Wave-2
VMSolidus Jun 17, 2024
3ae0a5e
Update harpy.yml
VMSolidus Jun 19, 2024
5de2a6a
Update harpy.yml
VMSolidus Jun 19, 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
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/deltav/markings/harpy.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ marking-HarpyTailRooster-rooster_tail = Tail
marking-HarpyTailFinch = Finch Tail
marking-HarpyTailFinch-finch_tail = Tail

marking-HarpyTailPeacock = Peacock Tail
marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
marking-HarpyTailPeacock-peacock_tail_eyes = Eyes

marking-HarpyChestDefault = Wing & Groin Under-Clothes
marking-HarpyChestDefault-upper = Wing Under-Clothes
marking-HarpyChestDefault-lower = Groin Under-Clothes
Expand Down
64 changes: 41 additions & 23 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy

- type: marking
Expand All @@ -32,7 +32,7 @@
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: classicharpy

- type: marking
Expand All @@ -49,7 +49,7 @@
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpyfolded

- type: marking
Expand All @@ -66,7 +66,7 @@
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi
- sprite: Mobs/Customization/Harpy/harpy_ears.rsi
state: harpy_ears_default

- type: marking
Expand All @@ -83,7 +83,7 @@
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
- sprite: Mobs/Customization/Harpy/harpy_tails.rsi
state: phoenix_tail

- type: marking
Expand All @@ -99,7 +99,7 @@
fallbackTypes:
- !type:SimpleColoring
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
- sprite: Mobs/Customization/Harpy/harpy_tails.rsi
state: rooster_tail


Expand All @@ -116,18 +116,36 @@
fallbackTypes:
- !type:SimpleColoring
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi
- sprite: Mobs/Customization/Harpy/harpy_tails36x36.rsi
state: finch_tail

- type: marking
id: HarpyTailPeacock
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Harpy]
coloring:
default:
type:
!type:CategoryColoring
category: Hair
fallbackTypes:
- !type:SimpleColoring
sprites:
- sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
state: peacock_tail_feathers
- sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
state: peacock_tail_eyes

- type: marking
id: HarpyWing2ToneClassic
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy2tone1
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy2tone2

- type: marking
Expand All @@ -136,11 +154,11 @@
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy3tone1
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy3tone2
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy3tone3

- type: marking
Expand All @@ -149,9 +167,9 @@
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpyspeckled1
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpyspeckled2

- type: marking
Expand All @@ -160,9 +178,9 @@
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpyundertone1
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpyundertone2

- type: marking
Expand All @@ -171,9 +189,9 @@
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpywingtip1
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpywingtip2

- type: marking
Expand All @@ -190,9 +208,9 @@
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
- sprite: Mobs/Customization/Harpy/harpy_chest.rsi
state: upper
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
- sprite: Mobs/Customization/Harpy/harpy_chest.rsi
state: lower

- type: marking
Expand All @@ -209,7 +227,7 @@
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
- sprite: Mobs/Customization/Harpy/harpy_legs.rsi
state: thighs

- type: marking
Expand All @@ -223,7 +241,7 @@
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
- sprite: Mobs/Customization/Harpy/harpy_legs.rsi
state: feet
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
- sprite: Mobs/Customization/Harpy/harpy_legs.rsi
state: talons
7 changes: 6 additions & 1 deletion Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
visible: false
- map: [ "id" ]
- map: [ "gloves" ]
- map: [ "shoes" ]
- map: [ "ears" ]
- map: [ "outerClothing" ]
- map: [ "eyes" ]
Expand Down Expand Up @@ -127,6 +126,12 @@
templateId: digitigrade
- type: HarpyVisuals
- type: UltraVision
- type: Tag
Copy link
Contributor

Choose a reason for hiding this comment

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

What does this do? Don't they inherit this from basemob?

Copy link
Member Author

Choose a reason for hiding this comment

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

If I add ANY tags, I now have to copy the entire BaseHuman tag component. Because tags aren't inherited for stupid reasons. I'm adding the NoStepShoesRequired tag for Harpies because I removed their shoes slot. This tag is a little stupidly named, but all it does it make it so that they don't get stunned by walking over glass shards. I assume the birbs with their tiny light feet just tip-claw around the shards, unlike how a clumsy human might stomp right into them.

tags:
- CanPilot
- FootstepSound
- DoorBumpOpener
- ShoesRequiredStepTriggerImmune
- type: LanguageSpeaker
speaks:
- GalacticCommon
Expand Down
7 changes: 0 additions & 7 deletions Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
- type: inventoryTemplate
id: digitigrade
slots:
- name: shoes
slotTexture: shoes
slotFlags: FEET
stripTime: 3
uiWindowPos: 1,0
strippingWindowPos: 1,3
displayName: Shoes
- name: jumpsuit
slotTexture: uniform
slotFlags: INNERCLOTHING
Expand Down
0 ...omization/Harpy/harpy_chest.rsi/lower.png → ...omization/Harpy/harpy_chest.rsi/lower.png
View file
Open in desktop
File renamed without changes
0 ...omization/Harpy/harpy_chest.rsi/meta.json → ...omization/Harpy/harpy_chest.rsi/meta.json
View file
Open in desktop
File renamed without changes.
0 ...omization/Harpy/harpy_chest.rsi/upper.png → ...omization/Harpy/harpy_chest.rsi/upper.png
View file
Open in desktop
File renamed without changes
0 ...rpy/harpy_ears.rsi/harpy_ears_default.png → ...rpy/harpy_ears.rsi/harpy_ears_default.png
View file
Open in desktop
File renamed without changes
0 ...tomization/Harpy/harpy_ears.rsi/meta.json → ...tomization/Harpy/harpy_ears.rsi/meta.json
View file
Open in desktop
File renamed without changes.
0 ...stomization/Harpy/harpy_legs.rsi/feet.png → ...stomization/Harpy/harpy_legs.rsi/feet.png
View file
Open in desktop
File renamed without changes
0 ...tomization/Harpy/harpy_legs.rsi/meta.json → ...tomization/Harpy/harpy_legs.rsi/meta.json
View file
Open in desktop
File renamed without changes.
0 ...omization/Harpy/harpy_legs.rsi/talons.png → ...omization/Harpy/harpy_legs.rsi/talons.png
View file
Open in desktop
File renamed without changes
0 ...omization/Harpy/harpy_legs.rsi/thighs.png → ...omization/Harpy/harpy_legs.rsi/thighs.png
View file
Open in desktop
File renamed without changes
0 ...omization/Harpy/harpy_tails.rsi/meta.json → ...omization/Harpy/harpy_tails.rsi/meta.json
View file
Open in desktop
File renamed without changes.
0 ...on/Harpy/harpy_tails.rsi/phoenix_tail.png → ...on/Harpy/harpy_tails.rsi/phoenix_tail.png
View file
Open in desktop
File renamed without changes
0 ...on/Harpy/harpy_tails.rsi/rooster_tail.png → ...on/Harpy/harpy_tails.rsi/rooster_tail.png
View file
Open in desktop
File renamed without changes
0 ...n/Harpy/harpy_tailsx72.rsi/finch_tail.png → ...Harpy/harpy_tails36x36.rsi/finch_tail.png
View file
Open in desktop
File renamed without changes
0 ...zation/Harpy/harpy_tailsx72.rsi/meta.json → ...tion/Harpy/harpy_tails36x36.rsi/meta.json
View file
Open in desktop
File renamed without changes.
19 changes: 19 additions & 0 deletions Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Peacock by stillxicarus (Discord)",
"size": {
"x": 48,
"y": 48
},
"states": [
{
"name": "peacock_tail_feathers",
"directions": 4
},
{
"name": "peacock_tail_eyes",
"directions": 4
}
]
}
Binary file added ...es/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...extures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...s/Customization/Harpy/harpy_wingcover.png → ...s/Customization/Harpy/harpy_wingcover.png
View file
Open in desktop
File renamed without changes
0 ...on/Harpy/harpy_wings.rsi/classicharpy.png → ...on/Harpy/harpy_wings.rsi/classicharpy.png
View file
Open in desktop
File renamed without changes
0 ...omization/Harpy/harpy_wings.rsi/harpy.png → ...omization/Harpy/harpy_wings.rsi/harpy.png
View file
Open in desktop
File renamed without changes
0 ...ion/Harpy/harpy_wings.rsi/harpy2tone1.png → ...ion/Harpy/harpy_wings.rsi/harpy2tone1.png
View file
Open in desktop
File renamed without changes
0 ...ion/Harpy/harpy_wings.rsi/harpy2tone2.png → ...ion/Harpy/harpy_wings.rsi/harpy2tone2.png
View file
Open in desktop
File renamed without changes
0 ...ion/Harpy/harpy_wings.rsi/harpy3tone1.png → ...ion/Harpy/harpy_wings.rsi/harpy3tone1.png
View file
Open in desktop
File renamed without changes
0 ...ion/Harpy/harpy_wings.rsi/harpy3tone2.png → ...ion/Harpy/harpy_wings.rsi/harpy3tone2.png
View file
Open in desktop
File renamed without changes
0 ...ion/Harpy/harpy_wings.rsi/harpy3tone3.png → ...ion/Harpy/harpy_wings.rsi/harpy3tone3.png
View file
Open in desktop
File renamed without changes
0 ...ion/Harpy/harpy_wings.rsi/harpyfolded.png → ...ion/Harpy/harpy_wings.rsi/harpyfolded.png
View file
Open in desktop
File renamed without changes
0 .../Harpy/harpy_wings.rsi/harpyspeckled1.png → .../Harpy/harpy_wings.rsi/harpyspeckled1.png
View file
Open in desktop
File renamed without changes
0 .../Harpy/harpy_wings.rsi/harpyspeckled2.png → .../Harpy/harpy_wings.rsi/harpyspeckled2.png
View file
Open in desktop
File renamed without changes
0 ...Harpy/harpy_wings.rsi/harpyundertone1.png → ...Harpy/harpy_wings.rsi/harpyundertone1.png
View file
Open in desktop
File renamed without changes
0 ...Harpy/harpy_wings.rsi/harpyundertone2.png → ...Harpy/harpy_wings.rsi/harpyundertone2.png
View file
Open in desktop
File renamed without changes
0 ...n/Harpy/harpy_wings.rsi/harpywingtip1.png → ...n/Harpy/harpy_wings.rsi/harpywingtip1.png
View file
Open in desktop
File renamed without changes
0 ...n/Harpy/harpy_wings.rsi/harpywingtip2.png → ...n/Harpy/harpy_wings.rsi/harpywingtip2.png
View file
Open in desktop
File renamed without changes
0 ...omization/Harpy/harpy_wings.rsi/meta.json → ...omization/Harpy/harpy_wings.rsi/meta.json
View file
Open in desktop
File renamed without changes.
Loading