Skip to content

Commit

Permalink
White Dream Harpy Markings (#696)
Browse files Browse the repository at this point in the history
# Description

ONIKS was kind enough to provide me with several new Harpy markings,
consisting of alternate Bat-wings, Haven Tail, Long Forked Tail, and
Swallow Tail. I have also taken the liberty of actually making a basic
set of "Bionic Wings", which are just a slightly edited version of the
"harpsuit" wing sleeve, including hardsuit lights. Unfortunately due to
limitations in the game's code concerning markings, I couldn't make the
lights use the unshaded shader. This limitation irritates me. I'll
probably fix that in a separate PR.

I actually also received a pack of Arachnid and Felinid sprites! But I'm
going to add those in a different PR entirely.

<details><summary><h1>Media</h1></summary>
<p>

Bionic wings

![image](https://github.com/user-attachments/assets/6acc64a9-be6b-435b-9c61-91287ef65c10)

Bat Wings

![image](https://github.com/user-attachments/assets/e44fe12e-8410-47ca-a4c1-5e644fd36b8a)

Haven tail

![image](https://github.com/user-attachments/assets/2adadcdd-04fc-458d-8491-61bd52a3b4d1)

Swallow tail

![image](https://github.com/user-attachments/assets/615391eb-0314-4e6d-a87b-101d0a307955)

Long Forked Tail

![image](https://github.com/user-attachments/assets/e3d672f7-b8cb-4497-a2a3-87d0c224847d)

</p>
</details>

# Changelog

:cl:
- add: The following new markings have been added for Harpies: Bat
Wings, Simple Bionic Wings, Haven Tail, Swallow tail, and Long Forked
Tail
  • Loading branch information
VMSolidus authored Aug 7, 2024
1 parent 732b8e8 commit 2a6790b
Show file tree
Hide file tree
Showing 12 changed files with 125 additions and 2 deletions.
18 changes: 18 additions & 0 deletions Resources/Locale/en-US/markings/harpy.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ marking-HarpyWingTipsClassic = Classic Wings with Feather Tips
marking-HarpyWingTipsClassic-harpy_wingtip_1 = Main
marking-HarpyWingTipsClassic-harpy_wingtip_2 = Feathertips
marking-HarpyWingBat = Bat Wings (Whitescale)
marking-HarpyWingBat-bat_wings_tone_1 = Limbs
marking-HarpyWingBat-bat_wings_tone_2 = Membrane
marking-HarpyWingBionic = Simple Bionic Wings (Whitescale)
marking-HarpyWingBionic-bionic_wings_tone_1 = Wings
marking-HarpyWingBionic-bionic_wings_tone_2 = Lights (Unshaded)
marking-HarpyEarsDefault = Feather Tufts
marking-HarpyEarsDefault-harpy_ears_default = Tufts
Expand All @@ -65,6 +73,16 @@ marking-HarpyTailPeacock = Peacock Tail
marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
marking-HarpyTailPeacock-peacock_tail_eyes = Eyes
marking-HarpyTailHaven = Haven Tail (Whitescale)
marking-HarpyTailHaven-haven_tone_1 = Outer Feathers
marking-HarpyTailHaven-haven_tone_2 = Inner Feathers
marking-HarpyTailForkedLong = Long Forked Tail (Whitescale)
marking-HarpyTailForkedLong-forked_long = Tail
marking-HarpyTailSwallow = Swallow Tail (Whitescale)
marking-HarpyTailForkedLong-forked_long = Tail
marking-HarpyChestDefault = Wing & Groin Under-Clothes
marking-HarpyChestDefault-upper = Wing Under-Clothes
marking-HarpyChestDefault-lower = Groin Under-Clothes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,56 @@
- sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
state: peacock_tail_eyes

- type: marking
id: HarpyTailHaven
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Harpy]
coloring:
default:
type:
!type:CategoryColoring
category: Hair
fallbackTypes:
- !type:SimpleColoring
sprites:
- sprite: Mobs/Customization/Harpy/harpy_tails.rsi
state: haven_tone_1
- sprite: Mobs/Customization/Harpy/harpy_tails.rsi
state: haven_tone_2

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

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

- type: marking
id: HarpyWing2ToneClassic
bodyPart: RArm
Expand Down Expand Up @@ -310,6 +360,29 @@
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy_wingtip_2

- type: marking
id: HarpyWingBat
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: bat_wings_tone_1
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: bat_wings_tone_2

- type: marking
id: HarpyWingBionic
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: bionic_wings_tone_1
- sprite: Mobs/Customization/Harpy/harpy_wings.rsi
state: bionic_wings_tone_2
shader: unshaded

- type: marking
id: HarpyChestDefault
bodyPart: Chest
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch & Forked Tailfin by @stillxicarus",
"copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch & Forked Tailfin by @stillxicarus, haven & forked_long & swallow by @Kilath",
"size": {
"x": 32,
"y": 32
Expand All @@ -22,6 +22,22 @@
{
"name": "whitescale_forked_tailfin",
"directions": 4
},
{
"name": "haven_tone_1",
"directions": 4
},
{
"name": "haven_tone_2",
"directions": 4
},
{
"name": "forked_long",
"directions": 4
},
{
"name": "swallow_tail",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "classicharpy Taken from S.P.L.U.R.T at commit https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/285f6f86ac41a6246f250993486effeab8581c2c, edited by @raistlin_jag | harpyfolded, harpy, and owl by @stillxicarus",
"copyright": "classicharpy Taken from S.P.L.U.R.T at commit https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/285f6f86ac41a6246f250993486effeab8581c2c, edited by @raistlin_jag | harpyfolded, harpy, and owl by @stillxicarus, bat wings by @Kilath",
"states": [
{
"name": "huescale_harpy",
Expand Down Expand Up @@ -78,6 +78,22 @@
{
"name": "whitescale_harpy_wing_owl",
"directions": 4
},
{
"name": "bat_wings_tone_1",
"directions": 4
},
{
"name": "bat_wings_tone_2",
"directions": 4
},
{
"name": "bionic_wings_tone_1",
"directions": 4
},
{
"name": "bionic_wings_tone_2",
"directions": 4
}
]
}

0 comments on commit 2a6790b

Please sign in to comment.