diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl index c2e9beb5c87..3c1a2e3b9b2 100644 --- a/Resources/Locale/en-US/deltav/markings/harpy.ftl +++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl @@ -1,26 +1,32 @@ marking-HarpyWingDefault = Basic Wings marking-HarpyWingDefault-harpy = Wings -marking-HarpyWing2Tone = Two Tone Wings -marking-HarpyWing2Tone-harpy2tone1 = Top Half -marking-HarpyWing2Tone-harpy2tone2 = Bottom Half +marking-HarpyWingFolded = Folded Wings +marking-HarpyWingFolded-harpyfolded = Wings -marking-HarpyWing3Tone = Three Tone Wings -marking-HarpyWing3Tone-harpy3tone1 = Top Third -marking-HarpyWing3Tone-harpy3tone2 = Middle Third -marking-HarpyWing3tone-harpy3tone3 = Bottom Third +marking-HarpyWingClassic = Classic Wings +marking-HarpyWingClassic-classicharpy = Wings -marking-HarpyWingSpeckled = Speckled Wings -marking-HarpyWingSpeckled-harpyspeckled1 = Main -marking-HarpyWingSpeckled-harpyspeckled2 = Speckles +marking-HarpyWing2ToneClassic = Classic Two Tone Wings +marking-HarpyWing2ToneClassic-harpy2tone1 = Top Half +marking-HarpyWing2ToneClassic-harpy2tone2 = Bottom Half -marking-HarpyWingUndertone = Wings with Undertone -marking-HarpyWingUndertone-harpyundertone1 = Front -marking-HarpyWingUndertone-harpyundertone2 = Back +marking-HarpyWing3ToneClassic = Classic Three Tone Wings +marking-HarpyWing3ToneClassic-harpy3tone1 = Top Third +marking-HarpyWing3ToneClassic-harpy3tone2 = Middle Third +marking-HarpyWing3ToneClassic-harpy3tone3 = Bottom Third -marking-HarpyWingTips = Wings with Feather Tips -marking-HarpyWingTips-harpywingtip1 = Main -marking-HarpyWingTips-harpywingtip2 = Feathertips +marking-HarpyWingSpeckledClassic = Speckled Classic Wings +marking-HarpyWingSpeckledClassic-harpyspeckled1 = Main +marking-HarpyWingSpeckledClassic-harpyspeckled2 = Speckles + +marking-HarpyWingUndertoneClassic = Classic Wings with Undertone +marking-HarpyWingUndertoneClassic-harpyundertone1 = Front +marking-HarpyWingUndertoneClassic-harpyundertone2 = Back + +marking-HarpyWingTipsClassic = Classic Wings with Feather Tips +marking-HarpyWingTipsClassic-harpywingtip1 = Main +marking-HarpyWingTipsClassic-harpywingtip2 = Feathertips marking-HarpyEarsDefault = Feather Tufts marking-HarpyEarsDefault-harpy_ears_default = Tufts @@ -30,3 +36,17 @@ marking-HarpyTailPhoenix-phoenix_tail = Tail marking-HarpyTailRooster = Rooster Tail marking-HarpyTailRooster-rooster_tail = Tail + +marking-HarpyTailFinch = Finch Tail +marking-HarpyTailFinch-finch_tail = Tail + +marking-HarpyChestDefault = Wing & Groin Under-Clothes +marking-HarpyChestDefault-upper = Wing Under-Clothes +marking-HarpyChestDefault-lower = Groin Under-Clothes + +marking-HarpyLegsDefault = Avian Legs +marking-HarpyLegsDefault-thighs = Thighs + +marking-HarpyFeetDefault = Avian Feet +marking-HarpyFeetDefault-feet = Feet +marking-HarpyFeetDefault-talons = Talons diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml index e1629358a5c..9118692a082 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml @@ -192,6 +192,8 @@ sprites: - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi state: upper + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi + state: lower - type: marking id: HarpyLegsDefault diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 62f131f213d..5e1d9d5460d 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyeTape bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyeTape bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Chest - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Chest - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Vulpkanin] # Delta V - Felinid, Vulpkanin + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Vulpkanin] # Delta V - Felinid, Vulpkanin coloring: default: type: @@ -291,4 +291,4 @@ color: "#FFFFFF" sprites: - sprite: Mobs/Customization/gauze.rsi - state: gauze_lizardblindfold \ No newline at end of file + state: gauze_lizardblindfold diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png index fa74b6fc6ed..bc449db5ea7 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png index 08982eb4968..62080c4f1dc 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png index fa27e2b74a6..00ddb37abd9 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png index fa02af63598..d37935c9316 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png index 77464d46cd4..89b2463c48d 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png index 3be8deb516e..3edaf057e7b 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png index 50a301c5517..cc7ad928781 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png index 17120f36f60..bd11f128114 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png index 8a4b36bfc3d..a27169651dd 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png index c47058b38f7..c378328a02f 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png index 54359f5929c..00cf7c36794 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png index c62e612dd69..32aef4b6218 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png index 2cb8eab2e9f..4410790851d 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png index c1c108f6bc3..ace8b76f087 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png index 76a6b6b400c..f603ce356be 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png index 4fccbd27f34..94ad0126cd4 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png differ