diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl deleted file mode 100644 index 871f2f17290..00000000000 --- a/Resources/Locale/en-US/deltav/markings/harpy.ftl +++ /dev/null @@ -1,56 +0,0 @@ -marking-HarpyWingDefault = Basic Wings -marking-HarpyWingDefault-harpy = Wings - -marking-HarpyWingFolded = Folded Wings -marking-HarpyWingFolded-harpyfolded = Wings - -marking-HarpyWingClassic = Classic Wings -marking-HarpyWingClassic-classicharpy = Wings - -marking-HarpyWing2ToneClassic = Classic Two Tone Wings -marking-HarpyWing2ToneClassic-harpy2tone1 = Top Half -marking-HarpyWing2ToneClassic-harpy2tone2 = Bottom Half - -marking-HarpyWing3ToneClassic = Classic Three Tone Wings -marking-HarpyWing3ToneClassic-harpy3tone1 = Top Third -marking-HarpyWing3ToneClassic-harpy3tone2 = Middle Third -marking-HarpyWing3ToneClassic-harpy3tone3 = Bottom Third - -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 - -marking-HarpyTailPhoenix = Basic Tail -marking-HarpyTailPhoenix-phoenix_tail = Tail - -marking-HarpyTailRooster = Rooster Tail -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 - -marking-HarpyLegsDefault = Avian Legs -marking-HarpyLegsDefault-thighs = Thighs - -marking-HarpyFeetDefault = Avian Feet -marking-HarpyFeetDefault-feet = Feet -marking-HarpyFeetDefault-talons = Talons diff --git a/Resources/Locale/en-US/markings/harpy.ftl b/Resources/Locale/en-US/markings/harpy.ftl new file mode 100644 index 00000000000..6d6ba75a936 --- /dev/null +++ b/Resources/Locale/en-US/markings/harpy.ftl @@ -0,0 +1,77 @@ +marking-HarpyWingDefaultHuescale = Basic Wings (Huescale) +marking-HarpyWingDefaultHuescale-huescale_harpy = Wings + +marking-HarpyWingDefaultWhitescale = Basic Wings (Whitescale) +marking-HarpyWingDefaultWhitescale-whitescale_harpy = Wings + +marking-HarpyWingFoldedHuescale = Folded Wings (Huescale) +marking-HarpyWingFoldedHuescale-huescale_harpy_folded = Wings + +marking-HarpyWingFoldedWhitescale = Folded Wings (Whitescale) +marking-HarpyWingFoldedWhitescale-whitescale_harpy_folded = Wings + +marking-HarpyWingOwlHuescale = Owl Wings (Huescale) +marking-HarpyWingOwlHuescale-huescale_harpy_wing_owl = Wings + +marking-HarpyWingOwlWhitescale = Owl Wings (Whitescale) +marking-HarpyWingOwlWhitescale-whitescale_harpy_wing_owl = Wings + +marking-HarpyWingClassic = Classic Wings +marking-HarpyWingClassic-classic_harpy = Wings + +marking-HarpyWing2ToneClassic = Classic Two Tone Wings +marking-HarpyWing2ToneClassic-harpy_2tone_1 = Top Half +marking-HarpyWing2ToneClassic-harpy_2tone_2 = Bottom Half + +marking-HarpyWing3ToneClassic = Classic Three Tone Wings +marking-HarpyWing3ToneClassic-harpy_3tone_1 = Top Third +marking-HarpyWing3ToneClassic-harpy_3tone_2 = Middle Third +marking-HarpyWing3ToneClassic-harpy_3tone_3 = Bottom Third + +marking-HarpyWingSpeckledClassic = Speckled Classic Wings +marking-HarpyWingSpeckledClassic-harpy_speckled_1 = Main +marking-HarpyWingSpeckledClassic-harpy_speckled_2 = Speckles + +marking-HarpyWingUndertoneClassic = Classic Wings with Undertone +marking-HarpyWingUndertoneClassic-harpy_undertone_1 = Front +marking-HarpyWingUndertoneClassic-harpy_undertone_2 = Back + +marking-HarpyWingTipsClassic = Classic Wings with Feather Tips +marking-HarpyWingTipsClassic-harpy_wingtip_1 = Main +marking-HarpyWingTipsClassic-harpy_wingtip_2 = Feathertips + +marking-HarpyEarsDefault = Feather Tufts +marking-HarpyEarsDefault-harpy_ears_default = Tufts + +marking-HarpyEarsLarge = Large Feather Tufts +marking-HarpyEarsLarge-harpy_ears_large = Tufts + +marking-HarpyTailPhoenix = Basic Tail +marking-HarpyTailPhoenix-phoenix_tail = Tail + +marking-HarpyTailRooster = Rooster Tail +marking-HarpyTailRooster-rooster_tail = Tail + +marking-HarpyTailFinch = Finch Tail +marking-HarpyTailFinch-finch_tail = Tail + +marking-HarpyTailForkedHuescale = Forked Tailfin (Huescale) +marking-HarpyTailForkedHuescale-huescale_forked_tailfin = Tail + +marking-HarpyTailForkedWhitescale = Forked Tailfin (Whitescale) +marking-HarpyTailForkedWhitescale-whitescale_forked_tailfin = 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 + +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/Body/Parts/harpy.yml b/Resources/Prototypes/Body/Parts/harpy.yml similarity index 75% rename from Resources/Prototypes/DeltaV/Body/Parts/harpy.yml rename to Resources/Prototypes/Body/Parts/harpy.yml index 358cb1de11f..9e51334406f 100644 --- a/Resources/Prototypes/DeltaV/Body/Parts/harpy.yml +++ b/Resources/Prototypes/Body/Parts/harpy.yml @@ -24,10 +24,10 @@ components: - type: Sprite netsync: false - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "torso_m" - type: Icon - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "torso_m" - type: BodyPart partType: Torso @@ -39,10 +39,10 @@ components: - type: Sprite netsync: false - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "head_m" - type: Icon - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "head_m" - type: BodyPart partType: Head @@ -62,10 +62,10 @@ components: - type: Sprite netsync: false - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "l_arm" - type: Icon - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "l_arm" - type: BodyPart partType: Arm @@ -78,10 +78,10 @@ components: - type: Sprite netsync: false - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "r_arm" - type: Icon - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "r_arm" - type: BodyPart partType: Arm @@ -94,10 +94,10 @@ components: - type: Sprite netsync: false - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "l_hand" - type: Icon - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "l_hand" - type: BodyPart partType: Hand @@ -110,10 +110,10 @@ components: - type: Sprite netsync: false - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "r_hand" - type: Icon - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "r_hand" - type: BodyPart partType: Hand @@ -126,10 +126,10 @@ components: - type: Sprite netsync: false - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "l_leg" - type: Icon - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "l_leg" - type: BodyPart partType: Leg @@ -143,10 +143,10 @@ components: - type: Sprite netsync: false - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "r_leg" - type: Icon - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "r_leg" - type: BodyPart partType: Leg @@ -160,10 +160,10 @@ components: - type: Sprite netsync: false - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "l_foot" - type: Icon - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "l_foot" - type: BodyPart partType: Foot @@ -176,10 +176,10 @@ components: - type: Sprite netsync: false - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "r_foot" - type: Icon - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: "r_foot" - type: BodyPart partType: Foot diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index fdaee45ccc8..401f903b662 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -210,7 +210,7 @@ - WhitelistChameleon - type: entity - parent: ClothingOuterBaseLarge + parent: ClothingOuterBase id: ClothingOuterArmorCaptainCarapace name: "captain's carapace" description: "An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest." diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 902c57418e4..8b06a610cdd 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -23,6 +23,10 @@ walkModifier: 0.9 sprintModifier: 0.9 - type: HeldSpeedModifier + - type: Tag + tags: + - WhitelistChameleon + - HidesHarpyWings - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index a05d346c2f2..a71e5afb00d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -516,6 +516,7 @@ - MonkeyWearable - Hardsuit - WhitelistChameleon + - HidesHarpyWings # Syndicate Medic Hardsuit - type: entity @@ -534,6 +535,7 @@ tags: - Hardsuit - WhitelistChameleon + - HidesHarpyWings #Syndicate Elite Hardsuit - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 58faf268470..b81b3d1e7f0 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -14,6 +14,7 @@ - SuitEVA - MonkeyWearable - WhitelistChameleon + - HidesHarpyWings #Syndicate EVA - type: entity @@ -31,6 +32,7 @@ - SuitEVA - MonkeyWearable - WhitelistChameleon + - HidesHarpyWings #Emergency EVA - type: entity @@ -72,6 +74,7 @@ - SuitEVA - MonkeyWearable - WhitelistChameleon + - HidesHarpyWings #NTSRA Voidsuit / Ancient Voidsuit - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml similarity index 63% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml rename to Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml index bd1ad12a326..697781be939 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml @@ -2,7 +2,7 @@ # Ears Markings - type: marking - id: HarpyWingDefault + id: HarpyWingDefaultHuescale bodyPart: RArm markingCategory: Arms speciesRestriction: [Harpy] @@ -16,7 +16,24 @@ color: "#964b00" sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy + state: huescale_harpy + +- type: marking + id: HarpyWingDefaultWhitescale + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + color: "#964b00" + sprites: + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi + state: whitescale_harpy - type: marking id: HarpyWingClassic @@ -33,10 +50,61 @@ color: "#964b00" sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: classicharpy + state: classic_harpy + +- type: marking + id: HarpyWingFoldedHuescale + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + color: "#964b00" + sprites: + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi + state: huescale_harpy_folded + +- type: marking + id: HarpyWingFoldedWhitescale + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + color: "#964b00" + sprites: + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi + state: whitescale_harpy_folded + +- type: marking + id: HarpyWingOwlHuescale + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + color: "#964b00" + sprites: + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi + state: huescale_harpy_wing_owl - type: marking - id: HarpyWingFolded + id: HarpyWingOwlWhitescale bodyPart: RArm markingCategory: Arms speciesRestriction: [Harpy] @@ -50,7 +118,7 @@ color: "#964b00" sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpyfolded + state: whitescale_harpy_wing_owl - type: marking id: HarpyEarsDefault @@ -69,6 +137,23 @@ - sprite: Mobs/Customization/Harpy/harpy_ears.rsi state: harpy_ears_default +- type: marking + id: HarpyEarsLarge + bodyPart: Head + markingCategory: HeadTop + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + color: "#964b00" + sprites: + - sprite: Mobs/Customization/Harpy/harpy_ears.rsi + state: harpy_ears_large + - type: marking id: HarpyTailPhoenix bodyPart: Tail @@ -102,6 +187,37 @@ - sprite: Mobs/Customization/Harpy/harpy_tails.rsi state: rooster_tail +- type: marking + id: HarpyTailForkedWhitescale + 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: whitescale_forked_tailfin + +- type: marking + id: HarpyTailForkedHuescale + 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: huescale_forked_tailfin - type: marking id: HarpyTailFinch @@ -144,9 +260,9 @@ speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy2tone1 + state: harpy_2tone_1 - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy2tone2 + state: harpy_2tone_2 - type: marking id: HarpyWing3ToneClassic @@ -155,11 +271,11 @@ speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy3tone1 + state: harpy_3tone_1 - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy3tone2 + state: harpy_3tone_2 - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpy3tone3 + state: harpy_3tone_3 - type: marking id: HarpyWingSpeckledClassic @@ -168,9 +284,9 @@ speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpyspeckled1 + state: harpy_speckled_1 - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpyspeckled2 + state: harpy_speckled_2 - type: marking id: HarpyWingUndertoneClassic @@ -179,9 +295,9 @@ speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpyundertone1 + state: harpy_undertone_1 - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpyundertone2 + state: harpy_undertone_2 - type: marking id: HarpyWingTipsClassic @@ -190,9 +306,9 @@ speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpywingtip1 + state: harpy_wingtip_1 - sprite: Mobs/Customization/Harpy/harpy_wings.rsi - state: harpywingtip2 + state: harpy_wingtip_2 - type: marking id: HarpyChestDefault diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/Entities/Mobs/Player/harpy.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml rename to Resources/Prototypes/Entities/Mobs/Player/harpy.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml similarity index 99% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml rename to Resources/Prototypes/Entities/Mobs/Species/harpy.yml index 9b851ffa522..b265d9343a3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml @@ -76,7 +76,7 @@ - map: [ "mask" ] - map: [ "head" ] - map: [ "singingLayer" ] - sprite: DeltaV/Effects/harpysinger.rsi + sprite: Effects/harpysinger.rsi state: singing_music_notes visible: false - type: HumanoidAppearance diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/digitigrade_inventory_template.yml similarity index 100% rename from Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml rename to Resources/Prototypes/InventoryTemplates/digitigrade_inventory_template.yml diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/SoundCollections/harpy.yml similarity index 100% rename from Resources/Prototypes/DeltaV/SoundCollections/harpy.yml rename to Resources/Prototypes/SoundCollections/harpy.yml diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml similarity index 77% rename from Resources/Prototypes/DeltaV/Species/harpy.yml rename to Resources/Prototypes/Species/harpy.yml index 384b327ff24..43d28daab06 100644 --- a/Resources/Prototypes/DeltaV/Species/harpy.yml +++ b/Resources/Prototypes/Species/harpy.yml @@ -63,88 +63,88 @@ Arms: points: 1 required: false - defaultMarkings: [ HarpyWingDefault ] + defaultMarkings: [ HarpyWingDefaultHuescale ] - type: humanoidBaseSprite id: MobHarpyHead baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: head_m - type: humanoidBaseSprite id: MobHarpyHeadMale baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: head_m - type: humanoidBaseSprite id: MobHarpyHeadFemale baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: head_f - type: humanoidBaseSprite id: MobHarpyTorso baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: torso_m - type: humanoidBaseSprite id: MobHarpyTorsoMale baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: torso_m - type: humanoidBaseSprite id: MobHarpyTorsoFemale baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: torso_f - type: humanoidBaseSprite id: MobHarpyLLeg baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: l_leg - type: humanoidBaseSprite id: MobHarpyLHand baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: l_hand - type: humanoidBaseSprite id: MobHarpyLArm baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: l_arm - type: humanoidBaseSprite id: MobHarpyLFoot baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: l_foot - type: humanoidBaseSprite id: MobHarpyRLeg baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: r_leg - type: humanoidBaseSprite id: MobHarpyRHand baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: r_hand - type: humanoidBaseSprite id: MobHarpyRArm baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: r_arm - type: humanoidBaseSprite id: MobHarpyRFoot baseSprite: - sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + sprite: Mobs/Species/Harpy/parts.rsi state: r_foot diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-harpy.png index f041f046bbc..b52bd4a7eb2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..1a896e64f55 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json index 88e5b353cb0..3067907ba97 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14, harpy by VMSolidus", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..17b5c141f6c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json index 9ecf4115a97..6cfe1ea214d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14", + "copyright": "Made by PuroSlavKing (github) for SS14, harpy by VMSolidus", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-harpy.png index d2622538579..d914262edf5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..7407a35a89f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json index 2cfc2220e1a..2de954bbf90 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by EmoGarbage404", + "copyright": "Made by EmoGarbage404, harpy by VMSolidus", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..2c4083711a5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json index a9fe29a5892..090140fa8cd 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github), harpy by VMSolidus", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-harpy.png index 54b2f24d036..d83b9ac4f95 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..4a4bfff3389 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json index 6ba7a445cd7..f6910b12aa0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14, harpy edit by VMSolidus", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-harpy.png index 865364771e1..54657c95378 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-harpy.png index 2510e35db9f..9eacc90753d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-harpy.png index 38403243634..a7194f6aae8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-harpy.png index 2d682adeae0..c9869a1c8d3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png index 8ccba9f1fca..1dc418613e9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..2ff52d7425c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json index e482264df5f..def2d42704e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-harpy.png index 229b19e724d..b1873a8f626 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-harpy.png index 43af6d982d9..72055773a3c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-harpy.png index 4900a6765b3..50e39fbef8e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-harpy.png index 9a6a1dabfb6..c07dd366a74 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..63f1e6b2873 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json index 7863947d1cc..b85c75656c4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, harpy by VMSolidus", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -23,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-harpy.png index 01080df27dd..6e8e808cff2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json index 90e3c14bb5e..88d91565d77 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github)", + "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github), harpy by VMSolidus", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..3ed8b58be5a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json index d0d17fbfba6..b05021b6c0c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi, harpy edit by VMSolidus", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..4c8d9b623c1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json index 659ed1dddfd..e9a9a4453d8 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..25cc5f10ac3 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json index 86e27c9c1f7..4dcd7b13b58 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..8618317bfa6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json index b2c50fc4c67..8d09b75006a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..2103d1f8416 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json index e164425199e..0482d086421 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..2284f606f34 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json index e164425199e..0482d086421 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-OUTERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..15592bbab1b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json index e482264df5f..0a8c670a890 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-harpy.png new file mode 100644 index 00000000000..a7b07afefa2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json index e482264df5f..0a8c670a890 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png index ff95b7299f4..93dda474b61 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png index dd5a7508a9a..e73d681178c 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png index c87fddc15fe..948bdd090c8 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png index 65bbca12fa7..13eca7f0a62 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png index ae58f653ccb..b01d76dbb83 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png index 16687721a7f..1e009b91c85 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png index 1af2f8defa6..5eb7edc8a25 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png index 81a103a0842..4a2a80204ae 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_f.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_f.png deleted file mode 100644 index 23dde35cd8e..00000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_f.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Effects/harpysinger.rsi/meta.json b/Resources/Textures/Effects/harpysinger.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Effects/harpysinger.rsi/meta.json rename to Resources/Textures/Effects/harpysinger.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Effects/harpysinger.rsi/singing_music_notes.png b/Resources/Textures/Effects/harpysinger.rsi/singing_music_notes.png similarity index 100% rename from Resources/Textures/DeltaV/Effects/harpysinger.rsi/singing_music_notes.png rename to Resources/Textures/Effects/harpysinger.rsi/singing_music_notes.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png index bc449db5ea7..1cfada1c9eb 100644 Binary files a/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png and b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png index 62080c4f1dc..272459e82ec 100644 Binary files a/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png and b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png new file mode 100644 index 00000000000..5ace395ce7d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json index 8b80a5a45f5..256abc36f49 100644 --- a/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By @leonardo_dabepis", + "copyright": "By @leonardo_dabepis, large by VMSolidus", "size": { "x": 32, "y": 32 @@ -10,7 +10,10 @@ { "name": "harpy_ears_default", "directions": 4 + }, + { + "name": "harpy_ears_large", + "directions": 4 } - ] } diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png new file mode 100644 index 00000000000..c6addb53ec1 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json index bf58e418285..f33401617c0 100644 --- a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch by @stillxicarus", + "copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch & Forked Tailfin by @stillxicarus", "size": { "x": 32, "y": 32 @@ -14,6 +14,14 @@ { "name": "rooster_tail", "directions": 4 + }, + { + "name": "huescale_forked_tailfin", + "directions": 4 + }, + { + "name": "whitescale_forked_tailfin", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png new file mode 100644 index 00000000000..b92610a9605 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png index dd870ea01de..b1c31bc83b7 100644 Binary files a/Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classic_harpy.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classic_harpy.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_1.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_1.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_2.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_2.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_1.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_1.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_2.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_2.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_3.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_3.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_1.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_1.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_2.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_2.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_1.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_1.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_2.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_2.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_1.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_1.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_2.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_2.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png deleted file mode 100644 index 32dde55ffdb..00000000000 Binary files a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy.png diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png new file mode 100644 index 00000000000..838e05deb4d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png new file mode 100644 index 00000000000..c136dc27940 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json index 4f2afaec699..7737af0afc2 100644 --- a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json @@ -5,62 +5,78 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "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 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", "states": [ { - "name": "harpy", + "name": "huescale_harpy", "directions": 4 }, { - "name": "harpyfolded", + "name": "whitescale_harpy", "directions": 4 }, { - "name": "harpy2tone1", + "name": "huescale_harpy_folded", "directions": 4 }, { - "name": "harpy2tone2", + "name": "whitescale_harpy_folded", "directions": 4 }, { - "name": "harpy3tone1", + "name": "harpy_2tone_1", "directions": 4 }, { - "name": "harpy3tone2", + "name": "harpy_2tone_2", "directions": 4 }, { - "name": "harpy3tone3", + "name": "harpy_3tone_1", "directions": 4 }, { - "name": "harpyspeckled1", + "name": "harpy_3tone_2", "directions": 4 }, { - "name": "harpyspeckled2", + "name": "harpy_3tone_3", "directions": 4 }, { - "name": "harpyundertone1", + "name": "harpy_speckled_1", "directions": 4 }, { - "name": "harpyundertone2", + "name": "harpy_speckled_2", "directions": 4 }, { - "name": "harpywingtip1", + "name": "harpy_undertone_1", "directions": 4 }, { - "name": "harpywingtip2", + "name": "harpy_undertone_2", "directions": 4 }, { - "name": "classicharpy", + "name": "harpy_wingtip_1", + "directions": 4 + }, + { + "name": "harpy_wingtip_2", + "directions": 4 + }, + { + "name": "classic_harpy", + "directions": 4 + }, + { + "name": "huescale_harpy_wing_owl", + "directions": 4 + }, + { + "name": "whitescale_harpy_wing_owl", "directions": 4 } ] diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png new file mode 100644 index 00000000000..0c2f826ec57 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png new file mode 100644 index 00000000000..e6777aee73b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png differ diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png new file mode 100644 index 00000000000..bbf46cdb9c3 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-l.png b/Resources/Textures/Mobs/Species/Harpy/organs.rsi/lung-l.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-l.png rename to Resources/Textures/Mobs/Species/Harpy/organs.rsi/lung-l.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-r.png b/Resources/Textures/Mobs/Species/Harpy/organs.rsi/lung-r.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-r.png rename to Resources/Textures/Mobs/Species/Harpy/organs.rsi/lung-r.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Harpy/organs.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/meta.json rename to Resources/Textures/Mobs/Species/Harpy/organs.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/full.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/full.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/full.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_f.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_f.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_f.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_m.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_m.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_m.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_arm.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_arm.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_arm.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_foot.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_foot.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_foot.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_hand.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_hand.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_hand.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_leg.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_leg.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_leg.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/meta.json rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_arm.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_arm.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_arm.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_foot.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_foot.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_foot.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_hand.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_hand.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_hand.png diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_leg.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_leg.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_leg.png diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_f.png new file mode 100644 index 00000000000..8cd598f06e9 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_m.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_m.png rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_m.png