diff --git a/Content.Client/DeltaV/Harpy/HarpyVisualsComponent.cs b/Content.Client/DeltaV/Harpy/HarpyVisualsComponent.cs new file mode 100644 index 00000000000..1c3253c74ef --- /dev/null +++ b/Content.Client/DeltaV/Harpy/HarpyVisualsComponent.cs @@ -0,0 +1,5 @@ +namespace Content.Client.DeltaV.Harpy; + +[RegisterComponent] +public sealed partial class HarpyVisualsComponent : Component +{ } diff --git a/Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs b/Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs new file mode 100644 index 00000000000..73c05e052b6 --- /dev/null +++ b/Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs @@ -0,0 +1,44 @@ +using Robust.Client.Graphics; +using Robust.Client.Player; +using Robust.Shared.Enums; +using Robust.Shared.Prototypes; +using Content.Shared.Abilities; + +namespace Content.Client.DeltaV.Overlays; + +public sealed partial class UltraVisionOverlay : Overlay +{ + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] IEntityManager _entityManager = default!; + + + public override bool RequestScreenTexture => true; + public override OverlaySpace Space => OverlaySpace.WorldSpace; + private readonly ShaderInstance _ultraVisionShader; + + public UltraVisionOverlay() + { + IoCManager.InjectDependencies(this); + _ultraVisionShader = _prototypeManager.Index("UltraVision").Instance().Duplicate(); + } + + protected override void Draw(in OverlayDrawArgs args) + { + if (ScreenTexture == null) + return; + if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} player) + return; + if (!_entityManager.HasComponent(player)) + return; + + _ultraVisionShader?.SetParameter("SCREEN_TEXTURE", ScreenTexture); + + + var worldHandle = args.WorldHandle; + var viewport = args.WorldBounds; + worldHandle.SetTransform(Matrix3.Identity); + worldHandle.UseShader(_ultraVisionShader); + worldHandle.DrawRect(viewport, Color.White); + } +} diff --git a/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs b/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs new file mode 100644 index 00000000000..00a0f362421 --- /dev/null +++ b/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs @@ -0,0 +1,31 @@ +using Content.Shared.Abilities; +using Robust.Client.Graphics; + +namespace Content.Client.DeltaV.Overlays; + +public sealed partial class UltraVisionSystem : EntitySystem +{ + [Dependency] private readonly IOverlayManager _overlayMan = default!; + + private UltraVisionOverlay _overlay = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnUltraVisionInit); + SubscribeLocalEvent(OnUltraVisionShutdown); + + _overlay = new(); + } + + private void OnUltraVisionInit(EntityUid uid, UltraVisionComponent component, ComponentInit args) + { + _overlayMan.AddOverlay(_overlay); + } + + private void OnUltraVisionShutdown(EntityUid uid, UltraVisionComponent component, ComponentShutdown args) + { + _overlayMan.RemoveOverlay(_overlay); + } +} diff --git a/Content.Shared/DeltaV/Abilities/DefaultVisionComponent.cs b/Content.Shared/DeltaV/Abilities/DefaultVisionComponent.cs new file mode 100644 index 00000000000..0126450e5d4 --- /dev/null +++ b/Content.Shared/DeltaV/Abilities/DefaultVisionComponent.cs @@ -0,0 +1,8 @@ +using Robust.Shared.GameStates; +namespace Content.Shared.DeltaV.Abilities; + +[RegisterComponent] +[NetworkedComponent] + +public sealed partial class DefaultVisionComponent : Component +{} diff --git a/Content.Shared/DeltaV/Abilities/DefaultVisionSystem.cs b/Content.Shared/DeltaV/Abilities/DefaultVisionSystem.cs new file mode 100644 index 00000000000..599fc0db140 --- /dev/null +++ b/Content.Shared/DeltaV/Abilities/DefaultVisionSystem.cs @@ -0,0 +1,19 @@ +using Content.Shared.Abilities; +using Content.Shared.DeltaV.Abilities; + +namespace Content.Client.DeltaV.Overlays; + +public sealed partial class DefaultVisionSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDefaultVisionInit); + } + + private void OnDefaultVisionInit(EntityUid uid, DefaultVisionComponent component, ComponentInit args) + { + RemComp(uid); + } +} diff --git a/Content.Shared/DeltaV/Abilities/UltraVisionComponent.cs b/Content.Shared/DeltaV/Abilities/UltraVisionComponent.cs new file mode 100644 index 00000000000..5f631c54f25 --- /dev/null +++ b/Content.Shared/DeltaV/Abilities/UltraVisionComponent.cs @@ -0,0 +1,8 @@ +using Robust.Shared.GameStates; +namespace Content.Shared.Abilities; + +[RegisterComponent] +[NetworkedComponent] + +public sealed partial class UltraVisionComponent : Component +{} diff --git a/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs b/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs index 1ee3f795d58..f2edeeb8726 100644 --- a/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs +++ b/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs @@ -1,6 +1,7 @@ using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Robust.Shared.Serialization; namespace Content.Shared.DeltaV.Harpy { diff --git a/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs b/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs new file mode 100644 index 00000000000..f75fcee8d42 --- /dev/null +++ b/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs @@ -0,0 +1,40 @@ +using Content.Shared.Inventory.Events; +using Content.Shared.Tag; +using Content.Shared.Humanoid; + +namespace Content.Shared.DeltaV.Harpy; + +public sealed class HarpyVisualsSystem : EntitySystem +{ + [Dependency] private readonly TagSystem _tagSystem = default!; + [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidSystem = default!; + + [ValidatePrototypeId] + private const string HarpyWingsTag = "HidesHarpyWings"; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDidEquipEvent); + SubscribeLocalEvent(OnDidUnequipEvent); + } + + private void OnDidEquipEvent(EntityUid uid, HarpySingerComponent component, DidEquipEvent args) + { + if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, HarpyWingsTag)) + { + _humanoidSystem.SetLayerVisibility(uid, HumanoidVisualLayers.RArm, false); + _humanoidSystem.SetLayerVisibility(uid, HumanoidVisualLayers.Tail, false); + } + } + + private void OnDidUnequipEvent(EntityUid uid, HarpySingerComponent component, DidUnequipEvent args) + { + if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, HarpyWingsTag)) + { + _humanoidSystem.SetLayerVisibility(uid, HumanoidVisualLayers.RArm, true); + _humanoidSystem.SetLayerVisibility(uid, HumanoidVisualLayers.Tail, true); + } + } +} diff --git a/Content.Shared/DeltaV/Harpy/SharedHarpyVisualsComponent.cs b/Content.Shared/DeltaV/Harpy/SharedHarpyVisualsComponent.cs new file mode 100644 index 00000000000..cc0f7c39354 --- /dev/null +++ b/Content.Shared/DeltaV/Harpy/SharedHarpyVisualsComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.Serialization; + +namespace Content.Shared.DeltaV.Harpy; + +[Serializable, NetSerializable] +public enum HardsuitWings : byte +{ + Worn +} diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs index 0d4122b6466..1e7881113fe 100644 --- a/Content.Shared/Roles/StartingGearPrototype.cs +++ b/Content.Shared/Roles/StartingGearPrototype.cs @@ -1,3 +1,4 @@ +using Content.Shared.DeltaV.Harpy; using Content.Shared.Preferences; using Robust.Shared.Prototypes; @@ -32,7 +33,8 @@ public string GetGear(string slot, HumanoidCharacterProfile? profile) { if (profile != null) { - if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(InnerClothingSkirt)) + if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(InnerClothingSkirt) + || slot == "jumpsuit" && profile.Species == "Harpy" && !string.IsNullOrEmpty(InnerClothingSkirt)) //DeltaV adds this line to prevent Harpies from starting with jumpsuits return InnerClothingSkirt; if (slot == "back" && profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(Satchel)) return Satchel; diff --git a/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl index bd8719fd56b..fd5635de4a9 100644 --- a/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl +++ b/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl @@ -7,3 +7,8 @@ chat-speech-verb-felinid-1 = mraows chat-speech-verb-felinid-2 = mews chat-speech-verb-felinid-3 = meows chat-speech-verb-felinid-4 = purrs out + +chat-speech-verb-harpy-1 = chirps +chat-speech-verb-harpy-2 = tweets +chat-speech-verb-harpy-3 = caws +chat-speech-verb-harpy-4 = trills 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/Locale/en-US/deltav/traits/traits.ftl b/Resources/Locale/en-US/deltav/traits/traits.ftl index 6698832a8cf..0eaff0408a4 100644 --- a/Resources/Locale/en-US/deltav/traits/traits.ftl +++ b/Resources/Locale/en-US/deltav/traits/traits.ftl @@ -1,5 +1,9 @@ trait-scottish-accent-name = Scottish Accent trait-scottish-accent-desc = Fer tha folk who come frae Hielan clan. +trait-ultravision-desc = Whether through custom bionic eyes, random mutation, + or being a Harpy, you perceive the world with ultraviolet light. + +trait-defaultvision-desc = You lack any vision variation from the norm for a non-human species. trait-uncloneable-name = Uncloneable trait-uncloneable-desc = Cannot be cloned diff --git a/Resources/Prototypes/DeltaV/Body/Parts/harpy.yml b/Resources/Prototypes/DeltaV/Body/Parts/harpy.yml new file mode 100644 index 00000000000..358cb1de11f --- /dev/null +++ b/Resources/Prototypes/DeltaV/Body/Parts/harpy.yml @@ -0,0 +1,186 @@ +- type: entity + id: PartHarpy + parent: BaseItem + name: "harpy body part" + abstract: true + components: + - type: Damageable + damageContainer: Biological + - type: BodyPart + - type: ContainerContainer + containers: + bodypart: !type:Container + ents: [] + - type: StaticPrice #DynamicPrice + price: 100 + - type: Tag + tags: + - Trash + +- type: entity + id: TorsoHarpy + name: "harpy torso" + parent: PartHarpy + components: + - type: Sprite + netsync: false + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "torso_m" + - type: Icon + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "torso_m" + - type: BodyPart + partType: Torso + +- type: entity + id: HeadHarpy + name: "harpy head" + parent: PartHarpy + components: + - type: Sprite + netsync: false + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "head_m" + - type: Icon + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "head_m" + - type: BodyPart + partType: Head + vital: true + - type: Input + context: "ghost" + - type: InputMover + - type: GhostOnMove + - type: Tag + tags: + - Head + +- type: entity + id: LeftArmHarpy + name: "left harpy arm" + parent: PartHarpy + components: + - type: Sprite + netsync: false + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "l_arm" + - type: Icon + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "l_arm" + - type: BodyPart + partType: Arm + symmetry: Left + +- type: entity + id: RightArmHarpy + name: "right harpy arm" + parent: PartHarpy + components: + - type: Sprite + netsync: false + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "r_arm" + - type: Icon + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "r_arm" + - type: BodyPart + partType: Arm + symmetry: Right + +- type: entity + id: LeftHandHarpy + name: "left harpy hand" + parent: PartHarpy + components: + - type: Sprite + netsync: false + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "l_hand" + - type: Icon + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "l_hand" + - type: BodyPart + partType: Hand + symmetry: Left + +- type: entity + id: RightHandHarpy + name: "right harpy hand" + parent: PartHarpy + components: + - type: Sprite + netsync: false + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "r_hand" + - type: Icon + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "r_hand" + - type: BodyPart + partType: Hand + symmetry: Right + +- type: entity + id: LeftLegHarpy + name: "left harpy leg" + parent: PartHarpy + components: + - type: Sprite + netsync: false + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "l_leg" + - type: Icon + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "l_leg" + - type: BodyPart + partType: Leg + symmetry: Left + - type: MovementBodyPart + +- type: entity + id: RightLegHarpy + name: "right harpy leg" + parent: PartHarpy + components: + - type: Sprite + netsync: false + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "r_leg" + - type: Icon + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "r_leg" + - type: BodyPart + partType: Leg + symmetry: Right + - type: MovementBodyPart + +- type: entity + id: LeftFootHarpy + name: "left harpy foot" + parent: PartHarpy + components: + - type: Sprite + netsync: false + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "l_foot" + - type: Icon + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "l_foot" + - type: BodyPart + partType: Foot + symmetry: Left + +- type: entity + id: RightFootHarpy + name: "right harpy foot" + parent: PartHarpy + components: + - type: Sprite + netsync: false + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "r_foot" + - type: Icon + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: "r_foot" + - type: BodyPart + partType: Foot + symmetry: Right diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml index 65073a778fa..5b3615c55d8 100644 --- a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml +++ b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml @@ -4,14 +4,14 @@ root: torso slots: head: - part: HeadHuman + part: HeadHarpy connections: - torso organs: brain: OrganHumanBrain eyes: OrganHumanEyes torso: - part: TorsoHuman + part: TorsoHarpy connections: - left arm - right arm @@ -20,31 +20,31 @@ organs: heart: OrganHumanHeart lungs: OrganHarpyLungs - stomach: OrganHumanStomach - liver: OrganHumanLiver - kidneys: OrganHumanKidneys + stomach: OrganAnimalStomach + liver: OrganAnimalLiver + kidneys: OrganAnimalKidneys right arm: - part: RightArmHuman + part: RightArmHarpy connections: - right hand left arm: - part: LeftArmHuman + part: LeftArmHarpy connections: - left hand right hand: - part: RightHandHuman + part: RightHandHarpy left hand: - part: LeftHandHuman + part: LeftHandHarpy right leg: - part: RightLegHuman + part: RightLegHarpy connections: - right foot left leg: - part: LeftLegHuman + part: LeftLegHarpy connections: - left foot right foot: - part: RightFootHuman + part: RightFootHarpy left foot: - part: LeftFootHuman + part: LeftFootHarpy diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml index 9ea84c4d0a2..9118692a082 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml @@ -18,6 +18,40 @@ - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy +- type: marking + id: HarpyWingClassic + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + color: "#964b00" + sprites: + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + state: classicharpy + +- type: marking + id: HarpyWingFolded + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + color: "#964b00" + sprites: + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + state: harpyfolded + - type: marking id: HarpyEarsDefault bodyPart: Head @@ -57,12 +91,36 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring sprites: - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi - state: rooster_tail + state: rooster_tail + + +- type: marking + id: HarpyTailFinch + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + sprites: + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi + state: finch_tail - type: marking - id: HarpyWing2Tone + id: HarpyWing2ToneClassic bodyPart: RArm markingCategory: Arms speciesRestriction: [Harpy] @@ -73,7 +131,7 @@ state: harpy2tone2 - type: marking - id: HarpyWing3Tone + id: HarpyWing3ToneClassic bodyPart: RArm markingCategory: Arms speciesRestriction: [Harpy] @@ -86,7 +144,7 @@ state: harpy3tone3 - type: marking - id: HarpyWingSpeckled + id: HarpyWingSpeckledClassic bodyPart: RArm markingCategory: Arms speciesRestriction: [Harpy] @@ -97,7 +155,7 @@ state: harpyspeckled2 - type: marking - id: HarpyWingUndertone + id: HarpyWingUndertoneClassic bodyPart: RArm markingCategory: Arms speciesRestriction: [Harpy] @@ -108,7 +166,7 @@ state: harpyundertone2 - type: marking - id: HarpyWingTips + id: HarpyWingTipsClassic bodyPart: RArm markingCategory: Arms speciesRestriction: [Harpy] @@ -117,3 +175,55 @@ state: harpywingtip1 - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi state: harpywingtip2 + +- type: marking + id: HarpyChestDefault + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + color: "#964b00" + 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 + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + color: "#964b00" + sprites: + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi + state: thighs + +- type: marking + id: HarpyFeetDefault + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [Harpy] + coloring: + default: + fallbackTypes: + - !type:SimpleColoring + color: "#964b00" + sprites: + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi + state: feet + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi + state: talons diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index 7548add4969..a4498299c9a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -106,7 +106,8 @@ types: Piercing: 5 - type: Speech - speechSounds: Alto + speechSounds: Harpy + speechVerb: Harpy - type: Vocal sounds: Male: SoundsHarpy @@ -121,6 +122,11 @@ - type: MovementSpeedModifier baseWalkSpeed: 2.5 baseSprintSpeed: 5.0 + - type: Inventory + speciesId: harpy + templateId: digitigrade + - type: HarpyVisuals + - type: UltraVision - type: entity save: false @@ -132,6 +138,8 @@ components: - type: HumanoidAppearance species: Harpy + - type: Inventory + speciesId: harpy - type: Sprite scale: 0.9, 0.9 layers: diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml new file mode 100644 index 00000000000..158541571aa --- /dev/null +++ b/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml @@ -0,0 +1,119 @@ +- type: inventoryTemplate + id: digitigrade + slots: + - name: shoes + slotTexture: shoes + slotFlags: FEET + stripTime: 3 + uiWindowPos: 1,0 + strippingWindowPos: 1,3 + displayName: Shoes + - name: jumpsuit + slotTexture: uniform + slotFlags: INNERCLOTHING + stripTime: 6 + uiWindowPos: 0,1 + strippingWindowPos: 0,2 + displayName: Jumpsuit + whitelist: + tags: + - Skirt + - name: outerClothing + slotTexture: suit + slotFlags: OUTERCLOTHING + stripTime: 6 + uiWindowPos: 1,1 + strippingWindowPos: 1,2 + displayName: Suit + - name: gloves + slotTexture: gloves + slotFlags: GLOVES + uiWindowPos: 2,1 + strippingWindowPos: 2,2 + displayName: Gloves + - name: neck + slotTexture: neck + slotFlags: NECK + uiWindowPos: 0,2 + strippingWindowPos: 0,1 + displayName: Neck + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,2 + strippingWindowPos: 1,1 + displayName: Mask + - name: eyes + slotTexture: glasses + slotFlags: EYES + stripTime: 3 + uiWindowPos: 0,3 + strippingWindowPos: 0,0 + displayName: Eyes + - name: ears + slotTexture: ears + slotFlags: EARS + stripTime: 3 + uiWindowPos: 2,2 + strippingWindowPos: 2,0 + displayName: Ears + - name: head + slotTexture: head + slotFlags: HEAD + uiWindowPos: 1,3 + strippingWindowPos: 1,0 + displayName: Head + - name: pocket1 + slotTexture: pocket + slotFlags: POCKET + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 0,3 + strippingWindowPos: 0,4 + dependsOn: jumpsuit + displayName: Pocket 1 + stripHidden: true + - name: pocket2 + slotTexture: pocket + slotFlags: POCKET + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 2,3 + strippingWindowPos: 1,4 + dependsOn: jumpsuit + displayName: Pocket 2 + stripHidden: true + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + dependsOn: outerClothing + displayName: Suit Storage + - name: id + slotTexture: id + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 2,1 + strippingWindowPos: 2,4 + dependsOn: jumpsuit + displayName: ID + - name: belt + slotTexture: belt + slotFlags: BELT + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 3,1 + strippingWindowPos: 1,5 + displayName: Belt + - name: back + slotTexture: back + slotFlags: BACK + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 3,0 + strippingWindowPos: 0,5 + displayName: Back diff --git a/Resources/Prototypes/DeltaV/Shaders/birdvision.yml b/Resources/Prototypes/DeltaV/Shaders/birdvision.yml new file mode 100644 index 00000000000..43dc7ae2485 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Shaders/birdvision.yml @@ -0,0 +1,4 @@ +- type: shader + id: UltraVision + kind: source + path: "/Textures/DeltaV/Shaders/ultravision.swsl" diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml index 0df69e9d729..bcc4dd22c44 100644 --- a/Resources/Prototypes/DeltaV/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Species/harpy.yml @@ -3,11 +3,33 @@ name: species-name-harpy roundStart: true prototype: MobHarpy - sprites: MobHumanSprites + sprites: MobHarpySprites markingLimits: MobHarpyMarkingLimits dollPrototype: MobHarpyDummy skinColoration: HumanToned +- type: speciesBaseSprites + id: MobHarpySprites + sprites: + Head: MobHarpyHead + Hair: MobHumanoidAnyMarking + FacialHair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking + Chest: MobHarpyTorso + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Tail: MobHumanoidAnyMarking + Eyes: MobHumanoidEyes + LArm: MobHarpyLArm + RArm: MobHarpyRArm + LHand: MobHarpyLHand + RHand: MobHarpyRHand + LLeg: MobHarpyLLeg + RLeg: MobHarpyRLeg + LFoot: MobHarpyLFoot + RFoot: MobHarpyRFoot + + - type: markingPoints id: MobHarpyMarkingLimits points: @@ -27,7 +49,8 @@ defaultMarkings: [ HarpyEarsDefault ] Chest: points: 1 - required: false + required: true + defaultMarkings: [ HarpyChestDefault ] Legs: points: 2 required: false @@ -35,3 +58,87 @@ points: 1 required: false defaultMarkings: [ HarpyWingDefault ] + +- type: humanoidBaseSprite + id: MobHarpyHead + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobHarpyHeadMale + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobHarpyHeadFemale + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobHarpyTorso + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobHarpyTorsoMale + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobHarpyTorsoFemale + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobHarpyLLeg + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobHarpyLHand + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobHarpyLArm + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobHarpyLFoot + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobHarpyRLeg + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobHarpyRHand + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobHarpyRArm + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobHarpyRFoot + baseSprite: + sprite: DeltaV/Mobs/Species/Harpy/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml new file mode 100644 index 00000000000..cb6c1bfa42d --- /dev/null +++ b/Resources/Prototypes/DeltaV/Traits/altvision.yml @@ -0,0 +1,13 @@ +- type: trait + id: UltraVision + name: Ultraviolet Vision + description: trait-ultravision-desc + components: + - type: UltraVision + +- type: trait + id: DefaultVision + name: Normal Vision + description: trait-defaultvision-desc + components: + - type: DefaultVision diff --git a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml index c1b56dd28b7..89db03d2fcc 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml @@ -6,3 +6,12 @@ path: /Audio/DeltaV/Voice/Talk/vulp_ask.ogg exclaimSound: path: /Audio/DeltaV/Voice/Talk/vulp_exclaim.ogg + +- type: speechSounds + id: Harpy + saySound: + path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg + askSound: + path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg + exclaimSound: + path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml index 01288498fe6..9ffa21b8c8e 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml @@ -13,3 +13,11 @@ - chat-speech-verb-felinid-2 - chat-speech-verb-felinid-3 - chat-speech-verb-felinid-4 + +- type: speechVerb + id: Harpy + speechVerbStrings: + - chat-speech-verb-harpy-1 + - chat-speech-verb-harpy-2 + - chat-speech-verb-harpy-3 + - chat-speech-verb-harpy-4 diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index d636db0146d..72181758e38 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -18,6 +18,9 @@ - type: Tag id: HandLabeler +- type: Tag + id: HidesHarpyWings + - type: Tag id: MagazinePistolSpecial # For the .38 special ammo and pistol @@ -38,3 +41,6 @@ - type: Tag id: PaperSlip + +- type: Tag + id: Skirt diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 82df2c21e8f..13524efa9e6 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -92,6 +92,7 @@ tags: - Hardsuit - WhitelistChameleon + - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites - type: entity abstract: true @@ -110,6 +111,9 @@ - type: HeldSpeedModifier - type: Item size: Huge + - type: Tag + tags: + - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 0329f82b5b1..9a5e0211f36 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -59,3 +59,6 @@ - type: Clothing slots: [innerclothing] femaleMask: UniformTop + - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts + tags: + - Skirt diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 623f7becfc1..c68075dc508 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, Arachnid, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, 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, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, 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, Arachnid, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, 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, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, 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, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, 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, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, 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/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 2468b2c5346..cca16443e2c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -2,7 +2,7 @@ id: ScarEyeRight bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -16,7 +16,7 @@ id: ScarEyeLeft bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index b17fb5d1f3c..b9ffd9ba0d6 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: type: @@ -16,7 +16,7 @@ id: TattooNightlingChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: type: @@ -30,7 +30,7 @@ id: TattooSilverburghLeftLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: type: @@ -44,7 +44,7 @@ id: TattooSilverburghRightLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: type: @@ -86,7 +86,7 @@ id: TattooCampbellLeftLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: type: @@ -100,7 +100,7 @@ id: TattooCampbellRightLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: type: diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-harpy.png new file mode 100644 index 00000000000..8be453ab873 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-harpy.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json index b0b6e0a2b03..93d9fece1d0 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json @@ -58,6 +58,10 @@ { "name": "equipped-head-vulpkanin", "directions": 4 + }, + { + "name": "equipped-head-harpy", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json index ac71856cd7a..cc8edd38197 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "off-equipped-HELMET-harpy", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-harpy", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-harpy.png new file mode 100644 index 00000000000..4c614ca87c7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-harpy.png new file mode 100644 index 00000000000..d5caee7ec03 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-harpy.png new file mode 100644 index 00000000000..95b5e1fd7f3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json index 855e3345c98..f6b86138919 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-HELMET-harpy", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json index 4dae2c687da..1ac1729cd2d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json @@ -42,7 +42,15 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-vulpkanin", + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-harpy", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-harpy", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-harpy.png new file mode 100644 index 00000000000..fea5970d5d2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-harpy.png new file mode 100644 index 00000000000..614b148f17a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-harpy.png differ 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 new file mode 100644 index 00000000000..f041f046bbc Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json index e482264df5f..ef5e62cca40 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "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 new file mode 100644 index 00000000000..d2622538579 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json index 342d7844737..7f50fdcf083 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "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 new file mode 100644 index 00000000000..54b2f24d036 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json index 7786f981121..1cfa2a9cfe4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json @@ -1,26 +1,30 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14", + "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "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 new file mode 100644 index 00000000000..865364771e1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json index e482264df5f..ef5e62cca40 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..2510e35db9f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json index e482264df5f..cbf3391af71 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json @@ -1,26 +1,30 @@ { "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 version by VMSolidus", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..38403243634 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json index d977572f2ab..0261a0564f1 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..2d682adeae0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json index e482264df5f..ef5e62cca40 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..8ccba9f1fca Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json index 31ae448b3ed..64b98f1e798 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "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 new file mode 100644 index 00000000000..229b19e724d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json index e482264df5f..ef5e62cca40 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..43af6d982d9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json index c661a435c14..f6a942a8956 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json @@ -8,21 +8,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..4900a6765b3 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json index 40d49ce92f7..80c2af9eba2 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..9a6a1dabfb6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json index 7863947d1cc..4aa4d60ccb8 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..01080df27dd Binary files /dev/null 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 373d282410c..90e3c14bb5e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/meta.json index 58442928cec..41acd5c4fd5 100644 --- a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/meta.json @@ -6,28 +6,36 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-flash" - }, - { - "name": "off-equipped-HELMET", - "directions": 4 - }, - { - "name": "on-equipped-HELMET", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-harpy", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-harpy.png b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-harpy.png new file mode 100644 index 00000000000..a2b4c824221 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-harpy.png new file mode 100644 index 00000000000..8ddb6b20116 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/meta.json index 58442928cec..41acd5c4fd5 100644 --- a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/meta.json @@ -6,28 +6,36 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-flash" - }, - { - "name": "off-equipped-HELMET", - "directions": 4 - }, - { - "name": "on-equipped-HELMET", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-harpy", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-harpy.png b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-harpy.png new file mode 100644 index 00000000000..9fa3969d420 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-harpy.png new file mode 100644 index 00000000000..2d59f86324c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/meta.json index 58442928cec..41acd5c4fd5 100644 --- a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/meta.json @@ -6,28 +6,36 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-flash" - }, - { - "name": "off-equipped-HELMET", - "directions": 4 - }, - { - "name": "on-equipped-HELMET", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-harpy", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-harpy.png b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-harpy.png new file mode 100644 index 00000000000..86878824614 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-harpy.png new file mode 100644 index 00000000000..d8ac647ca83 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-harpy.png differ 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 new file mode 100644 index 00000000000..ff95b7299f4 Binary files /dev/null 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/advanced.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json index 1253f8b4e63..4844e816bd1 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..dd5a7508a9a Binary files /dev/null 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/corpsman.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json index 1253f8b4e63..4844e816bd1 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..c87fddc15fe Binary files /dev/null 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/hos.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json index 1253f8b4e63..4844e816bd1 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..65bbca12fa7 Binary files /dev/null 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/medical.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json index 1253f8b4e63..4844e816bd1 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..ae58f653ccb Binary files /dev/null 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/officer.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json index 1253f8b4e63..4844e816bd1 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..16687721a7f Binary files /dev/null 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/riot.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json index 1253f8b4e63..4844e816bd1 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..1af2f8defa6 Binary files /dev/null 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/standard.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json index 1253f8b4e63..4844e816bd1 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..81a103a0842 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json index 1253f8b4e63..4844e816bd1 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json @@ -6,21 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } 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 new file mode 100644 index 00000000000..bc449db5ea7 Binary files /dev/null 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/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json new file mode 100644 index 00000000000..d4f4136903f --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and and modified by @raistlin_jag with parts by @ps3moira", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "upper", + "directions": 4 + }, + { + "name": "lower", + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..62080c4f1dc Binary files /dev/null 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 new file mode 100644 index 00000000000..d37935c9316 Binary files /dev/null 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/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json new file mode 100644 index 00000000000..53abefa9a80 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @ps3moira", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "feet", + "directions": 4 + }, + { + "name": "thighs", + "directions": 4 + }, + { + "name": "talons", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png new file mode 100644 index 00000000000..cc55693289c Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.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 new file mode 100644 index 00000000000..89b2463c48d Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json index b795894cae1..bf58e418285 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json +++ b/Resources/Textures/DeltaV/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", + "copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch by @stillxicarus", "size": { "x": 32, "y": 32 @@ -15,6 +15,5 @@ "name": "rooster_tail", "directions": 4 } - ] } diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png index e3aace5e8c7..0254b0fe3e2 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png index 1cbca989d19..e6a4e00271d 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png new file mode 100644 index 00000000000..b151d4a48d2 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json new file mode 100644 index 00000000000..8284a502d40 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Finch by @stillxicarus", + "size": { + "x": 36, + "y": 32 + }, + "states": [ + { + "name": "finch_tail", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png new file mode 100644 index 00000000000..dd870ea01de Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png new file mode 100644 index 00000000000..6f39a925124 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png index ce932f0df5f..4ed888072fa 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.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 2030ff8cf2d..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 f8825513a34..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 4bd00186567..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 7e431a95b43..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 477e6873e8f..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/harpyfolded.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png new file mode 100644 index 00000000000..32dde55ffdb Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.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 f48d8e6538d..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 b687a2bf9f0..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 7a792111c50..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 8a753996b72..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 49f7e0c1353..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 bde6c006920..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 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json index 0785ff1aaa6..4f2afaec699 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json @@ -5,12 +5,16 @@ "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", + "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", "states": [ { "name": "harpy", "directions": 4 }, + { + "name": "harpyfolded", + "directions": 4 + }, { "name": "harpy2tone1", "directions": 4 @@ -54,6 +58,10 @@ { "name": "harpywingtip2", "directions": 4 + }, + { + "name": "classicharpy", + "directions": 4 } ] } diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-l.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-l.png new file mode 100644 index 00000000000..32aca484b9f Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-l.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-r.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-r.png new file mode 100644 index 00000000000..7e29649ccd8 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-r.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/meta.json new file mode 100644 index 00000000000..e639085d8d0 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lung-l" + }, + { + "name": "lung-r" + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/full.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/full.png new file mode 100644 index 00000000000..e358746ec8b Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/full.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_f.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_f.png new file mode 100644 index 00000000000..b705d2d50e8 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_f.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_m.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_m.png new file mode 100644 index 00000000000..e555d030bea Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_m.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_arm.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_arm.png new file mode 100644 index 00000000000..87c10adfa22 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_foot.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_foot.png new file mode 100644 index 00000000000..a03b643ad62 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_hand.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_hand.png new file mode 100644 index 00000000000..2e0ec001ce2 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_leg.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_leg.png new file mode 100644 index 00000000000..a70f92524b6 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/meta.json new file mode 100644 index 00000000000..4073a762e89 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf, Legs and lower torso parts made by @ps3moira, Full reference with parts made by @Still-Icarus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_arm.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_arm.png new file mode 100644 index 00000000000..6a47ac86071 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_foot.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_foot.png new file mode 100644 index 00000000000..ef502c30f5c Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_hand.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_hand.png new file mode 100644 index 00000000000..2c16b27041c Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_leg.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_leg.png new file mode 100644 index 00000000000..9cdd3b85566 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_leg.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 new file mode 100644 index 00000000000..23dde35cd8e Binary files /dev/null and b/Resources/Textures/DeltaV/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/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_m.png new file mode 100644 index 00000000000..9a30fbfb574 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_m.png differ diff --git a/Resources/Textures/DeltaV/Shaders/ultravision.swsl b/Resources/Textures/DeltaV/Shaders/ultravision.swsl new file mode 100644 index 00000000000..a0dccaf2459 --- /dev/null +++ b/Resources/Textures/DeltaV/Shaders/ultravision.swsl @@ -0,0 +1,14 @@ +uniform sampler2D SCREEN_TEXTURE; + +void fragment() { + highp vec4 color = zTextureSpec(SCREEN_TEXTURE, UV); + + highp mat3 m = mat3( + vec3(0.000,1.000,0.000), + vec3(0.000,0.000,1.000), + vec3(-0.165,0.165,1.000) + ); + highp vec3 result = color.rgb * m; + + COLOR = vec4(result, 1); +}