From 686d00e720f18a362eccd0c1aa7a9f1c55278460 Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Sun, 1 Oct 2023 16:15:42 -0400 Subject: [PATCH 01/25] Funny birb start --- .../DeltaV/Harpy/HarpySingerComponent.cs | 17 +++ .../DeltaV/Harpy/HarpySingerSystem.cs | 27 ++++ .../Locale/en-US/deltav/species/species.ftl | 1 + .../DeltaV/Body/Prototypes/harpy.yml | 52 +++++++ .../DeltaV/Entities/Mobs/Player/harpy.yml | 35 +++++ .../DeltaV/Entities/Mobs/Species/harpy.yml | 61 ++++++++ .../DeltaV/SoundCollections/harpy.yml | 136 ++++++++++++++++++ 7 files changed, 329 insertions(+) create mode 100644 Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs create mode 100644 Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs create mode 100644 Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml create mode 100644 Resources/Prototypes/DeltaV/SoundCollections/harpy.yml diff --git a/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs b/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs new file mode 100644 index 00000000000..e36ac4f98ac --- /dev/null +++ b/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.DeltaV.Harpy +{ + [RegisterComponent, NetworkedComponent] + public sealed partial class HarpySingerComponent : Component + { + [DataField("midiActionId", serverOnly: true, + customTypeSerializer: typeof(PrototypeIdSerializer))] + public string? MidiActionId = "ActionPAIPlayMidi"; + + [DataField("midiAction", serverOnly: true)] // server only, as it uses a server-BUI event !type + public EntityUid? MidiAction; + } +} diff --git a/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs new file mode 100644 index 00000000000..bdc378d4e94 --- /dev/null +++ b/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs @@ -0,0 +1,27 @@ +using Content.Shared.Actions; + +namespace Content.Shared.DeltaV.Harpy +{ + public class HarpySingerSystem : EntitySystem + { + [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnStartup); + SubscribeLocalEvent(OnShutdown); + } + + private void OnStartup(EntityUid uid, HarpySingerComponent component, ComponentStartup args) + { + _actionsSystem.AddAction(uid, ref component.MidiAction, component.MidiActionId); + } + + private void OnShutdown(EntityUid uid, HarpySingerComponent component, ComponentShutdown args) + { + _actionsSystem.RemoveAction(uid, component.MidiAction); + } + } +} diff --git a/Resources/Locale/en-US/deltav/species/species.ftl b/Resources/Locale/en-US/deltav/species/species.ftl index 924cf46c3b5..83437bd651f 100644 --- a/Resources/Locale/en-US/deltav/species/species.ftl +++ b/Resources/Locale/en-US/deltav/species/species.ftl @@ -1,3 +1,4 @@ ## Species Names species-name-vulpkanin = Vulpkanin +species-name-harpy = Harpy diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml new file mode 100644 index 00000000000..d685e09f331 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml @@ -0,0 +1,52 @@ +- type: body + id: Harpy + name: "harpy" + root: torso + slots: + head: + part: HeadHuman + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoHuman + connections: + - left arm + - right arm + - left leg + - right leg + - tail + organs: + heart: OrganHumanHeart + lungs: OrganBirdLungs + stomach: OrganHumanStomach + liver: OrganHumanLiver + kidneys: OrganHumanKidneys + right arm: + part: RightArmHarpy + connections: + - right hand + left arm: + part: LeftArmHarpy + connections: + - left hand + right hand: + part: RightHandHarpy + left hand: + part: LeftHandHarpy + right leg: + part: RightLegHarpy + connections: + - right foot + left leg: + part: LeftLegHarpy + connections: + - left foot + right foot: + part: RightFootHarpy + left foot: + part: LeftFootHarpy + tail: + part: TailHarpy diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml new file mode 100644 index 00000000000..3f17cca1d84 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml @@ -0,0 +1,35 @@ +- type: entity + save: false + name: Urist McHarpy + parent: MobHarpyBase + id: MobHarpy + components: + - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others + - type: MindContainer + showExamineInfo: true + - type: Input + context: "human" + - type: MobMover + - type: InputMover + - type: Respirator + damage: + types: + Asphyxiation: 1.15 + damageRecovery: + types: + Asphyxiation: -1.15 + - type: Alerts + - type: Actions + - type: Eye + - type: CameraRecoil + - type: Examiner + - type: CanHostGuardian + - type: NpcFactionMember + factions: + - NanoTrasen +# - type: PotentialPsionic diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml new file mode 100644 index 00000000000..0b1397124ef --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -0,0 +1,61 @@ +- type: entity + save: false + name: Urist McHarpy + parent: BaseMobHuman + id: MobHarpyBase + abstract: true + components: + - type: HarpySinger + - type: Instrument + allowPercussion: true + allowProgramChange: true + - type: UserInterface + interfaces: + - key: enum.InstrumentUiKey.Key + type: InstrumentBoundUserInterface + - type: Sprite + scale: 0.9, 0.9 + - type: HumanoidAppearance + species: Harpy + - type: Fixtures + fixtures: # TODO: This needs a second fixture just for mob collisions. + fix1: + shape: + !type:PhysShapeCircle + radius: 0.28 + density: 140 + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer + - type: Body + prototype: Harpy + - type: Damageable + damageModifierSet: Harpy + - type: MeleeWeapon + soundHit: + collection: Punch + animation: WeaponArcClaw + damage: + types: + Blunt: 1 + Slash: 5 + - type: Speech + speechSounds: Alto + - type: Vocal + sounds: + Male: MaleHarpy + Female: FemaleHarpy + Unsexed: MaleHarpy + +- type: entity + save: false + name: Urist McHands + parent: MobHumanDummy + id: MobHarpyDummy + noSpawn: true + description: A dummy Harpy meant to be used in character setup. + components: + - type: HumanoidAppearance + species: Harpy diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml new file mode 100644 index 00000000000..43636ec3e96 --- /dev/null +++ b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml @@ -0,0 +1,136 @@ +- type: soundCollection + id: HarpyScreams + files: + - /Audio/Nyanotrasen/Voice/Felinid/cat_scream1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_scream2.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_scream3.ogg + - /Audio/Animals/monkey_scream.ogg + +- type: soundCollection + id: HarpyHisses + files: + - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss2.ogg + - /Audio/Weapons/ebladeon.ogg + - /Audio/Weapons/eblade1.ogg + - /Audio/Items/hiss.ogg + - /Audio/Items/hypospray.ogg + - /Audio/Items/ratchet.ogg + - /Audio/Items/welder.ogg + - /Audio/Items/snake_hiss.ogg + +- type: soundCollection + id: HarpyMeows + files: + - /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_meow2.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_meow3.ogg + - /Audio/Items/Toys/meow1.ogg + - /Audio/Animals/cat_meow.ogg + +- type: soundCollection + id: HarpyMews + files: + - /Audio/Nyanotrasen/Voice/Felinid/cat_mew1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_mew2.ogg + +- type: soundCollection + id: HarpyGrowls + files: + - /Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg + - /Audio/Animals/bear.ogg + +- type: soundCollection + id: HarpyPurrs + files: + - /Audio/Nyanotrasen/Voice/Felinid/cat_purr1.ogg + +- type: soundCollection + id: HarpyBooms + files: + - /Audio/Effects/flash_bang.ogg + +- type: soundCollection + id: HarpyRings + files: + - /Audio/Items/desk_bell_ring.ogg + - /Audio/Items/ring.ogg + +- type: soundCollection + id: HarpySirens + files: + - /Audio + +- type: soundCollection + id: HarpyHonks + files: + - /Audio/Items/bikehorn.ogg + - /Audio/Items/brokenbikehorn.ogg + +- type: soundCollection + id: HarpyPews + files: + - /Audio/Weapons/Guns/Gunshots/silenced.ogg + - /Audio/Weapons/Guns/Gunshots/taser.ogg + - /Audio/Weapons/Guns/Gunshots/taser2.ogg + - /Audio/Weapons/Guns/Gunshots/laser.ogg + - /Audio/Weapons/Guns/Gunshots/laser3.ogg + - /Audio/Weapons/emitter.ogg + - /Audio/Effects/Arcade/player_attack.ogg + - /Audio/Effects/Arcade/player_charge.ogg + - /Audio/Effects/Arcade/player_heal.ogg + +- type: soundCollection + id: HarpyBangs + files: + - /Audio/Weapons/Guns/Gunshots/atreides.ogg + - /Audio/Weapons/Guns/Gunshots/bang.ogg + - /Audio/Weapons/Guns/Gunshots/mk58.ogg + - /Audio/Weapons/Guns/Gunshots/pistol.ogg + - /Audio/Weapons/Guns/Gunshots/c-20r.ogg + - /Audio/Items/snap.ogg + +- type: soundCollection + id: HarpyBeeps + files: + - /Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg + - /Audio/Weapons/flash.ogg + - /Audio/Items/beep.ogg + - /Audio/Items/flashlight_pda.ogg + - /Audio/Items/locator_beep.ogg + - /Audio/Items/toolbox_drop.ogg + - /Audio/Items/Defib/defib_charge.ogg + - /Audio/Items/Defib/defib_ready.ogg + - /Audio/Items/Defib/defib_safety_off.ogg + - /Audio/Items/Defib/defib_safety_on.ogg + - /Audio/Items/Medical/healthscanner.ogg + - /Audio/Effects/RingtoneNotes/a.ogg + - /Audio/Effects/RingtoneNotes/asharp.ogg + - /Audio/Effects/RingtoneNotes/b.ogg + - /Audio/Effects/RingtoneNotes/c.ogg + - /Audio/Effects/RingtoneNotes/csharp.ogg + - /Audio/Effects/RingtoneNotes/d.ogg + - /Audio/Effects/RingtoneNotes/dsharp.ogg + - /Audio/Effects/RingtoneNotes/e.ogg + - /Audio/Effects/RingtoneNotes/f.ogg + - /Audio/Effects/RingtoneNotes/fsharp.ogg + - /Audio/Effects/RingtoneNotes/g.ogg + - /Audio/Effects/RingtoneNotes/gsharp.ogg + - /Audio/Effects/Arcade/gameover.ogg + - /Audio/Effects/Arcade/win.ogg + +- type: soundCollection + id: HarpyRevs + files: + - /Audio/Weapons/chainsawwield.ogg + +- type: soundCollection + id: HarpyClicks + files: + - /Audio/Items/deconstruct.ogg + - /Audio/Items/flashlight_off.ogg + - /Audio/Items/flashlight_on.ogg + - /Audio/Items/pistol_cock.ogg + - /Audio/Items/pistol_magin.ogg + - /Audio/Items/pistol_magout.ogg + - /Audio/Items/rped.ogg From 52a85d7ecdf560986e1d62506ec36fc5c7d99d62 Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Sun, 1 Oct 2023 17:10:25 -0400 Subject: [PATCH 02/25] Adding yet another harpy.yml One day the linter will be happy. That day is not today --- .../DeltaV/Body/Prototypes/harpy.yml | 6 +-- Resources/Prototypes/DeltaV/Species/harpy.yml | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Species/harpy.yml diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml index d685e09f331..f6c90d1287d 100644 --- a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml +++ b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml @@ -17,10 +17,9 @@ - right arm - left leg - right leg - - tail organs: heart: OrganHumanHeart - lungs: OrganBirdLungs + lungs: OrganHumanLungs stomach: OrganHumanStomach liver: OrganHumanLiver kidneys: OrganHumanKidneys @@ -48,5 +47,4 @@ part: RightFootHarpy left foot: part: LeftFootHarpy - tail: - part: TailHarpy + diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml new file mode 100644 index 00000000000..33e7835c522 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Species/harpy.yml @@ -0,0 +1,38 @@ +- type: species + id: Harpy + name: species-name-harpy + roundStart: true + prototype: MobHarpy + sprites: MobHumanSprites + markingLimits: MobHarpyMarkingLimits + dollPrototype: MobHarpyDummy + skinColoration: HumanToned + +- type: markingPoints + id: MobHarpyMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ HarpyTailBasic ] + HeadTop: + points: 1 + required: true + defaultMarkings: [ HarpyEarsBasic ] + Chest: + points: 1 + required: false + Legs: + points: 2 + required: true + defaultMarkings: [ HarpyLegs] + Arms: + points: 2 + required: true + defaultmarkings: [ HarpyWingsBasic ] From c78a978ee1775c884287c01566436bd0341aa07e Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Mon, 2 Oct 2023 14:21:52 -0400 Subject: [PATCH 03/25] Adding the traitor item, sans component Still need to refactor ActionChangeVoiceMask into an implantable component on the DeltaV namespace --- .../en-US/deltav/store/uplink-catalog.ftl.txt | 3 +++ .../DeltaV/Catalog/uplink_catalog.yml | 19 ++++++++++++++++++- .../Entities/Objects/Misc/implanters.yml | 7 +++++++ .../Objects/Misc/subdermal_implants.yml | 9 +++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt new file mode 100644 index 00000000000..2eb1ce7eaff --- /dev/null +++ b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt @@ -0,0 +1,3 @@ +# Implants +uplink-bionic-syrinx-name = Bionic Syrinx Implanter +uplink-bionic-syrinx-desc = An implant that expands the vocal range and capacity of a Harpy, to include perfect imitation of any humanoid voice. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml index 23a81afdc0b..b7444c041c8 100644 --- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml @@ -1,4 +1,4 @@ -#- type: listing +#- type: listing # id: UplinkCyborgBeaconSyndicate # name: uplink-borg-beacon-name # description: uplink-borg-beacon-desc @@ -17,3 +17,20 @@ # blacklist: # components: # - SurplusBundle +- type: listing + id: UplinkBionicSyrinx + name: uplink-bionic-syrinx-name + description: uplink-bionic-syrinx-desc + productEntity: BionicSyrinx + cost: + Telecrystal: 6 + categories: + - UplinkImplants + conditions: + - !type:BuyerSpeciesCondition + whitelist: + - Harpy + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml new file mode 100644 index 00000000000..74f03ce25a0 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml @@ -0,0 +1,7 @@ +- type: entity + id: BionicSyrinxImplaner + name: bionic syrinx implanter + parent: BaseImplantOnlyImplanterSyndi + components: + - type: Implanter + implant: BionicSyrinxImplant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml new file mode 100644 index 00000000000..33d1e220b0c --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml @@ -0,0 +1,9 @@ +- type: entity + parent: BaseSubdermalImplant + id: BionicSyrinxImplant + name: bionic syrinx implant + description: This implant expands a harpy's innate mimickry abilities. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionChangeVoiceMask From c8eaba2bbc04ff086ac094ece82a6dbe3182262c Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Mon, 2 Oct 2023 15:59:39 -0400 Subject: [PATCH 04/25] GUH, EMOTES --- .../DeltaV/Entities/Mobs/Species/harpy.yml | 6 +- .../DeltaV/SoundCollections/harpy.yml | 198 +++++++++++------- .../DeltaV/Voice/speech_emote_sounds.yml | 44 ++++ .../Prototypes/DeltaV/Voice/speech_emotes.yml | 95 +++++++++ 4 files changed, 259 insertions(+), 84 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml create mode 100644 Resources/Prototypes/DeltaV/Voice/speech_emotes.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index 0b1397124ef..94da0caddee 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -45,9 +45,9 @@ speechSounds: Alto - type: Vocal sounds: - Male: MaleHarpy - Female: FemaleHarpy - Unsexed: MaleHarpy + Male: SoundsHarpy + Female: SoundsHarpy + Unsexed: SoundsHarpy - type: entity save: false diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml index 43636ec3e96..4acfe9934dd 100644 --- a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml +++ b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml @@ -1,136 +1,172 @@ - type: soundCollection id: HarpyScreams files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_scream1.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_scream2.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_scream3.ogg - - /Audio/Animals/monkey_scream.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_scream1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_scream2.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_scream3.ogg + - /Audio/Animals/monkey_scream.ogg + - /Audio/Voice/Human/malescream_1.ogg + - /Audio/Voice/Human/malescream_2.ogg + - /Audio/Voice/Human/malescream_3.ogg + - /Audio/Voice/Human/malescream_4.ogg + - /Audio/Voice/Human/malescream_5.ogg + - /Audio/Voice/Human/malescream_6.ogg + - /Audio/Voice/Human/femalescream_1.ogg + - /Audio/Voice/Human/femalescream_2.ogg + - /Audio/Voice/Human/femalescream_3.ogg + - /Audio/Voice/Human/femalescream_4.ogg + - /Audio/Voice/Human/femalescream_5.ogg + +- type: soundCollection + id: HarpyLaugh + files: + - /Audio/Voice/Human/manlaugh1.ogg + - /Audio/Voice/Human/manlaugh2.ogg + - /Audio/Voice/Human/womanlaugh.ogg + - /Audio/Voice/Diona/diona_rustle1.ogg + - /Audio/Voice/Diona/diona_rustle2.ogg + - /Audio/Voice/Diona/diona_rustle3.ogg + - /Audio/Animals/lizard_happy.ogg + - /Audio/Animals/ferret_happy.ogg - type: soundCollection id: HarpyHisses files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss2.ogg - - /Audio/Weapons/ebladeon.ogg - - /Audio/Weapons/eblade1.ogg - - /Audio/Items/hiss.ogg - - /Audio/Items/hypospray.ogg - - /Audio/Items/ratchet.ogg - - /Audio/Items/welder.ogg - - /Audio/Items/snake_hiss.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss2.ogg + - /Audio/Weapons/ebladeon.ogg + - /Audio/Weapons/eblade1.ogg + - /Audio/Items/hiss.ogg + - /Audio/Items/hypospray.ogg + - /Audio/Items/ratchet.ogg + - /Audio/Items/welder.ogg + - /Audio/Items/snake_hiss.ogg + +- type: soundCollection + id: HarpySigh + files: + - /Audio/Voice/Human/male_sigh.ogg + - /Audio/Voice/Human/female_sigh.ogg + +- type: soundCollection + id: HarpyCry + files: + - /Audio/Voice/Human/cry_male_1.ogg + - /Audio/Voice/Human/cry_male_2.ogg + - /Audio/Voice/Human/cry_male_3.ogg + - /Audio/Voice/Human/cry_male_4.ogg + - /Audio/Voice/Human/cry_female_1.ogg + - /Audio/Voice/Human/cry_female_2.ogg + - /Audio/Voice/Human/cry_female_3.ogg + - /Audio/Voice/Human/cry_female_4.ogg - type: soundCollection id: HarpyMeows files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_meow2.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_meow3.ogg - - /Audio/Items/Toys/meow1.ogg - - /Audio/Animals/cat_meow.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_meow2.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_meow3.ogg + - /Audio/Items/Toys/meow1.ogg + - /Audio/Animals/cat_meow.ogg - type: soundCollection id: HarpyMews files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_mew1.ogg - - /Audio/Nyanotrasen/Voice/Felinid/cat_mew2.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_mew1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_mew2.ogg - type: soundCollection id: HarpyGrowls files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg - - /Audio/Animals/bear.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg + - /Audio/Animals/bear.ogg - type: soundCollection id: HarpyPurrs files: - - /Audio/Nyanotrasen/Voice/Felinid/cat_purr1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_purr1.ogg - type: soundCollection id: HarpyBooms files: - - /Audio/Effects/flash_bang.ogg + - /Audio/Effects/flash_bang.ogg - type: soundCollection id: HarpyRings files: - - /Audio/Items/desk_bell_ring.ogg - - /Audio/Items/ring.ogg - -- type: soundCollection - id: HarpySirens - files: - - /Audio + - /Audio/Items/desk_bell_ring.ogg + - /Audio/Items/ring.ogg - type: soundCollection id: HarpyHonks files: - - /Audio/Items/bikehorn.ogg - - /Audio/Items/brokenbikehorn.ogg + - /Audio/Items/bikehorn.ogg + - /Audio/Items/brokenbikehorn.ogg - type: soundCollection id: HarpyPews files: - - /Audio/Weapons/Guns/Gunshots/silenced.ogg - - /Audio/Weapons/Guns/Gunshots/taser.ogg - - /Audio/Weapons/Guns/Gunshots/taser2.ogg - - /Audio/Weapons/Guns/Gunshots/laser.ogg - - /Audio/Weapons/Guns/Gunshots/laser3.ogg - - /Audio/Weapons/emitter.ogg - - /Audio/Effects/Arcade/player_attack.ogg - - /Audio/Effects/Arcade/player_charge.ogg - - /Audio/Effects/Arcade/player_heal.ogg + - /Audio/Weapons/Guns/Gunshots/silenced.ogg + - /Audio/Weapons/Guns/Gunshots/taser.ogg + - /Audio/Weapons/Guns/Gunshots/taser2.ogg + - /Audio/Weapons/Guns/Gunshots/laser.ogg + - /Audio/Weapons/Guns/Gunshots/laser3.ogg + - /Audio/Weapons/emitter.ogg + - /Audio/Effects/Arcade/player_attack.ogg + - /Audio/Effects/Arcade/player_charge.ogg + - /Audio/Effects/Arcade/player_heal.ogg - type: soundCollection id: HarpyBangs files: - - /Audio/Weapons/Guns/Gunshots/atreides.ogg - - /Audio/Weapons/Guns/Gunshots/bang.ogg - - /Audio/Weapons/Guns/Gunshots/mk58.ogg - - /Audio/Weapons/Guns/Gunshots/pistol.ogg - - /Audio/Weapons/Guns/Gunshots/c-20r.ogg - - /Audio/Items/snap.ogg + - /Audio/Weapons/Guns/Gunshots/atreides.ogg + - /Audio/Weapons/Guns/Gunshots/bang.ogg + - /Audio/Weapons/Guns/Gunshots/mk58.ogg + - /Audio/Weapons/Guns/Gunshots/pistol.ogg + - /Audio/Weapons/Guns/Gunshots/c-20r.ogg + - /Audio/Items/snap.ogg - type: soundCollection id: HarpyBeeps files: - - /Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg - - /Audio/Weapons/flash.ogg - - /Audio/Items/beep.ogg - - /Audio/Items/flashlight_pda.ogg - - /Audio/Items/locator_beep.ogg - - /Audio/Items/toolbox_drop.ogg - - /Audio/Items/Defib/defib_charge.ogg - - /Audio/Items/Defib/defib_ready.ogg - - /Audio/Items/Defib/defib_safety_off.ogg - - /Audio/Items/Defib/defib_safety_on.ogg - - /Audio/Items/Medical/healthscanner.ogg - - /Audio/Effects/RingtoneNotes/a.ogg - - /Audio/Effects/RingtoneNotes/asharp.ogg - - /Audio/Effects/RingtoneNotes/b.ogg - - /Audio/Effects/RingtoneNotes/c.ogg - - /Audio/Effects/RingtoneNotes/csharp.ogg - - /Audio/Effects/RingtoneNotes/d.ogg - - /Audio/Effects/RingtoneNotes/dsharp.ogg - - /Audio/Effects/RingtoneNotes/e.ogg - - /Audio/Effects/RingtoneNotes/f.ogg - - /Audio/Effects/RingtoneNotes/fsharp.ogg - - /Audio/Effects/RingtoneNotes/g.ogg - - /Audio/Effects/RingtoneNotes/gsharp.ogg - - /Audio/Effects/Arcade/gameover.ogg - - /Audio/Effects/Arcade/win.ogg + - /Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg + - /Audio/Weapons/flash.ogg + - /Audio/Items/beep.ogg + - /Audio/Items/flashlight_pda.ogg + - /Audio/Items/locator_beep.ogg + - /Audio/Items/toolbox_drop.ogg + - /Audio/Items/Defib/defib_charge.ogg + - /Audio/Items/Defib/defib_ready.ogg + - /Audio/Items/Defib/defib_safety_off.ogg + - /Audio/Items/Defib/defib_safety_on.ogg + - /Audio/Items/Medical/healthscanner.ogg + - /Audio/Effects/RingtoneNotes/a.ogg + - /Audio/Effects/RingtoneNotes/asharp.ogg + - /Audio/Effects/RingtoneNotes/b.ogg + - /Audio/Effects/RingtoneNotes/c.ogg + - /Audio/Effects/RingtoneNotes/csharp.ogg + - /Audio/Effects/RingtoneNotes/d.ogg + - /Audio/Effects/RingtoneNotes/dsharp.ogg + - /Audio/Effects/RingtoneNotes/e.ogg + - /Audio/Effects/RingtoneNotes/f.ogg + - /Audio/Effects/RingtoneNotes/fsharp.ogg + - /Audio/Effects/RingtoneNotes/g.ogg + - /Audio/Effects/RingtoneNotes/gsharp.ogg + - /Audio/Effects/Arcade/gameover.ogg + - /Audio/Effects/Arcade/win.ogg - type: soundCollection id: HarpyRevs files: - - /Audio/Weapons/chainsawwield.ogg + - /Audio/Weapons/chainsawwield.ogg - type: soundCollection id: HarpyClicks files: - - /Audio/Items/deconstruct.ogg - - /Audio/Items/flashlight_off.ogg - - /Audio/Items/flashlight_on.ogg - - /Audio/Items/pistol_cock.ogg - - /Audio/Items/pistol_magin.ogg - - /Audio/Items/pistol_magout.ogg - - /Audio/Items/rped.ogg + - /Audio/Items/deconstruct.ogg + - /Audio/Items/flashlight_off.ogg + - /Audio/Items/flashlight_on.ogg + - /Audio/Items/pistol_cock.ogg + - /Audio/Items/pistol_magin.ogg + - /Audio/Items/pistol_magout.ogg + - /Audio/Items/rped.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml new file mode 100644 index 00000000000..0f02f498eda --- /dev/null +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -0,0 +1,44 @@ +# species +- type: emoteSounds + id: SoundsHarpy + params: + variation: 0.125 + sounds: + Scream: + collection: HarpyScreams + Laugh: + collection: HarpyLaugh + Sneeze: + collection: HarpySneezes + Cough: + collection: HarpyCoughs + Crying: + collection: HarpyCry + Whistle: + collection: HarpyWhistles + Hiss: + collection: HarpyHisses + Meow: + collection: HarpyMeows + Mew: + collection: HarpyMews + Growl: + collection: HarpyGrowls + Purr: + collection: HarpyPurrs + Boom: + collection: HarpyBooms + Ring: + collection: HarpyRings + Honk: + collection: HarpyHonks + Pew: + collection: HarpyPews + Bang: + collection: HarpyBangs + Beep: + collection: HarpyBeeps + Rev: + collection: HarpyRevs + Click: + collection: HarpyClicks diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml new file mode 100644 index 00000000000..4767dc85c3b --- /dev/null +++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml @@ -0,0 +1,95 @@ +# vocal emotes + +- type: emote + id: Boom + category: Vocal + chatMessages: [booms.] + chatTriggers: + - boom + - booms + - booms. + - purrs! + - purring + - boomed + +- type: emote + id: Honk + category: Vocal + chatMessages: [honks.] + chatTriggers: + - honk + - honks + - honks. + - honks! + - honking + - honked + +- type: emote + id: Ring + category: Vocal + chatMessages: [rings.] + chatTriggers: + - ring + - rings + - rings. + - rings! + - ringing + - ringed + +- type: emote + id: Pew + category: Vocal + chatMessages: [pews.] + chatTriggers: + - pew + - pews + - pew. + - pew! + +- type: emote + id: Bang + category: Vocal + chatMessages: [bangs.] + chatTriggers: + - bang + - bangs + - bang. + - bang! + - banging + - banged + +- type: emote + id: Beep + category: Vocal + chatMessages: [beeps.] + chatTriggers: + - beep + - beeps + - beep. + - beep! + - beeping + - beeped + +- type: emote + id: Rev + category: Vocal + chatMessages: [revs.] + chatTriggers: + - rev + - revs + - rev. + - rev! + - revving + - revved + +- type: emote + id: Click + category: Vocal + chatMessages: [clicks.] + chatTriggers: + - click + - clicks + - click. + - click! + - clicking + - clicked From 2fb85e90592ae0d0d561ba0b66e345ac47d49af6 Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Mon, 2 Oct 2023 16:37:07 -0400 Subject: [PATCH 05/25] URIST MCHARPY WORKS --- .../Prototypes/DeltaV/Body/Prototypes/harpy.yml | 16 ++++++++-------- .../Prototypes/DeltaV/SoundCollections/harpy.yml | 1 - Resources/Prototypes/DeltaV/Species/harpy.yml | 4 ---- .../DeltaV/Voice/speech_emote_sounds.yml | 2 +- .../Prototypes/DeltaV/Voice/speech_emotes.yml | 6 +++--- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml index f6c90d1287d..c5bba3da271 100644 --- a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml +++ b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml @@ -24,27 +24,27 @@ liver: OrganHumanLiver kidneys: OrganHumanKidneys right arm: - part: RightArmHarpy + part: RightArmHuman connections: - right hand left arm: - part: LeftArmHarpy + part: LeftArmHuman connections: - left hand right hand: - part: RightHandHarpy + part: RightHandHuman left hand: - part: LeftHandHarpy + part: LeftHandHuman right leg: - part: RightLegHarpy + part: RightLegHuman connections: - right foot left leg: - part: LeftLegHarpy + part: LeftLegHuman connections: - left foot right foot: - part: RightFootHarpy + part: RightFootHuman left foot: - part: LeftFootHarpy + part: LeftFootHuman diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml index 4acfe9934dd..c7379c314ce 100644 --- a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml +++ b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml @@ -40,7 +40,6 @@ - /Audio/Items/hypospray.ogg - /Audio/Items/ratchet.ogg - /Audio/Items/welder.ogg - - /Audio/Items/snake_hiss.ogg - type: soundCollection id: HarpySigh diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml index 33e7835c522..8ddd47757f1 100644 --- a/Resources/Prototypes/DeltaV/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Species/harpy.yml @@ -20,19 +20,15 @@ Tail: points: 1 required: true - defaultMarkings: [ HarpyTailBasic ] HeadTop: points: 1 required: true - defaultMarkings: [ HarpyEarsBasic ] Chest: points: 1 required: false Legs: points: 2 required: true - defaultMarkings: [ HarpyLegs] Arms: points: 2 required: true - defaultmarkings: [ HarpyWingsBasic ] diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 0f02f498eda..cd2d23a8d25 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -30,7 +30,7 @@ collection: HarpyBooms Ring: collection: HarpyRings - Honk: + HonkHarpy: collection: HarpyHonks Pew: collection: HarpyPews diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml index 4767dc85c3b..271b1976a63 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml @@ -8,12 +8,12 @@ - boom - booms - booms. - - purrs! - - purring + - booms! + - booming - boomed - type: emote - id: Honk + id: HonkHarpy category: Vocal chatMessages: [honks.] chatTriggers: From 5f1f20690cf55e4d67ffb35fd5b580cde72479e0 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 2 Oct 2023 17:41:48 -0400 Subject: [PATCH 06/25] Rename uplink-catalog.ftl.txt to uplink-catalog.ftl Signed-off-by: VMSolidus --- .../deltav/store/{uplink-catalog.ftl.txt => uplink-catalog.ftl} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Resources/Locale/en-US/deltav/store/{uplink-catalog.ftl.txt => uplink-catalog.ftl} (91%) diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl similarity index 91% rename from Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt rename to Resources/Locale/en-US/deltav/store/uplink-catalog.ftl index 2eb1ce7eaff..d08b3adeb95 100644 --- a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt +++ b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl @@ -1,3 +1,3 @@ # Implants uplink-bionic-syrinx-name = Bionic Syrinx Implanter -uplink-bionic-syrinx-desc = An implant that expands the vocal range and capacity of a Harpy, to include perfect imitation of any humanoid voice. \ No newline at end of file +uplink-bionic-syrinx-desc = An implant that expands the vocal range and capacity of a Harpy, to include perfect imitation of any humanoid voice. From 49e58cb0d7e95fe62858678e0585ae0ce6bc4c4d Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Mon, 2 Oct 2023 17:42:29 -0400 Subject: [PATCH 07/25] Icon Fix --- .../DeltaV/Harpy/HarpySingerComponent.cs | 2 +- .../en-US/deltav/store/uplink-catalog.ftl.txt | 2 +- .../DeltaV/Entities/Mobs/Species/harpy.yml | 12 ++++++++++++ .../DeltaV/Interface/Actions/harpy_sing.png | Bin 0 -> 441 bytes 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/DeltaV/Interface/Actions/harpy_sing.png diff --git a/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs b/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs index e36ac4f98ac..1ee3f795d58 100644 --- a/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs +++ b/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs @@ -9,7 +9,7 @@ public sealed partial class HarpySingerComponent : Component { [DataField("midiActionId", serverOnly: true, customTypeSerializer: typeof(PrototypeIdSerializer))] - public string? MidiActionId = "ActionPAIPlayMidi"; + public string? MidiActionId = "ActionHarpyPlayMidi"; [DataField("midiAction", serverOnly: true)] // server only, as it uses a server-BUI event !type public EntityUid? MidiAction; diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt index 2eb1ce7eaff..d08b3adeb95 100644 --- a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt +++ b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl.txt @@ -1,3 +1,3 @@ # Implants uplink-bionic-syrinx-name = Bionic Syrinx Implanter -uplink-bionic-syrinx-desc = An implant that expands the vocal range and capacity of a Harpy, to include perfect imitation of any humanoid voice. \ No newline at end of file +uplink-bionic-syrinx-desc = An implant that expands the vocal range and capacity of a Harpy, to include perfect imitation of any humanoid voice. diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index 94da0caddee..0b5e12d495e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -59,3 +59,15 @@ components: - type: HumanoidAppearance species: Harpy + +- type: entity + id: ActionHarpyPlayMidi + name: Play MIDI + description: Imitate whatever sounds you want + noSpawn: true + components: + - type: InstantAction + checkCanInteract: false + icon: DeltaV/Interface/Actions/harpy_sing.png + event: !type:OpenUiActionEvent + key: enum.InstrumentUiKey.Key diff --git a/Resources/Textures/DeltaV/Interface/Actions/harpy_sing.png b/Resources/Textures/DeltaV/Interface/Actions/harpy_sing.png new file mode 100644 index 0000000000000000000000000000000000000000..0109e9aae9ffc3627d9a9f068d9f3638a7ab607d GIT binary patch literal 441 zcmV;q0Y?6bP)Px$SxH1eR9J=Wm%mK|F%-ssjzYr#p+iC<5C%w>1)!v102ly7#RQZvKo}s!RY;it z20%heKp+O7p+Ha|Vv6{Y*s)K!i;*u9Ut_&zpYOfz{jsfx2VHQz0;okapcGVuJv6}6 zS1|%MSH{1tM=&6`c?i?SCJ(`%Fd%Tl;$tQ`1OEmjH=sxox`jTIQK9n7E6d~z%+m=q zz{A0zrQGgaS#sGdco#dIsEByPkiVQ9Kt&2V}vUb#ew2CI_-W$6LR?_v+it z-(zI?84zfImy<03HZC5mg&uv3S5*ZW_&D!a3*?jw=~?z1_yObDTxeWqkCgxb01jnX jNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjfqo1ya literal 0 HcmV?d00001 From e5911b46b149597680934a504005b45f89dfb935 Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Mon, 2 Oct 2023 17:50:09 -0400 Subject: [PATCH 08/25] Changing DAW to Synthesizer by Debug's request --- Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index 0b5e12d495e..9f99c8d2184 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -8,7 +8,7 @@ - type: HarpySinger - type: Instrument allowPercussion: true - allowProgramChange: true + program: 62 - type: UserInterface interfaces: - key: enum.InstrumentUiKey.Key From 7e6445c33d4de6c63c461bee3530a631744bcabc Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Mon, 2 Oct 2023 17:59:53 -0400 Subject: [PATCH 09/25] removing percussion so it sounds better --- Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index 9f99c8d2184..9329f67844a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -7,7 +7,7 @@ components: - type: HarpySinger - type: Instrument - allowPercussion: true + allowPercussion: false program: 62 - type: UserInterface interfaces: From 9ab4fd5f3e8bd4586e1aeb9634b7beb1b8443922 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 2 Oct 2023 18:24:18 -0400 Subject: [PATCH 10/25] Update implanters.yml Signed-off-by: VMSolidus --- .../Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml index 74f03ce25a0..9849642f939 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml @@ -1,5 +1,5 @@ - type: entity - id: BionicSyrinxImplaner + id: BionicSyrinxImplanter name: bionic syrinx implanter parent: BaseImplantOnlyImplanterSyndi components: From 2589d26926b28980653544d0e7073ae69343a3f9 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 2 Oct 2023 18:24:38 -0400 Subject: [PATCH 11/25] Update uplink_catalog.yml Signed-off-by: VMSolidus --- Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml index b7444c041c8..9e383162eab 100644 --- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml @@ -21,7 +21,7 @@ id: UplinkBionicSyrinx name: uplink-bionic-syrinx-name description: uplink-bionic-syrinx-desc - productEntity: BionicSyrinx + productEntity: BionicSyrinxImplanter cost: Telecrystal: 6 categories: From c1b22da13648d770650ad828866d529b091f8782 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 3 Oct 2023 14:31:26 -0400 Subject: [PATCH 12/25] Update speech_emote_sounds.yml Signed-off-by: VMSolidus --- Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 0192038b7c3..bb2b6bf45a1 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -43,7 +43,6 @@ Click: collection: HarpyClicks - - type: emoteSounds id: MaleVulpakin Scream: @@ -66,6 +65,7 @@ collection: VulpakinBarks Whine: collection: VulpakinWhines + - type: emoteSounds id: FemaleVulpakin params: From 3f6b1de28d009d54f3e188a04c035000d2ae5458 Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Tue, 3 Oct 2023 14:32:02 -0400 Subject: [PATCH 13/25] Create modifier_sets.yml --- Resources/Prototypes/DeltaV/Damage/modifier_sets.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Damage/modifier_sets.yml diff --git a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml new file mode 100644 index 00000000000..b3c0ec9678b --- /dev/null +++ b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml @@ -0,0 +1,10 @@ +- type: damageModifierSet + id: Vulpkanin + coefficients: + Heat: 1.15 +- type: damageModifierSet + id: Harpy + coefficients: + Blunt: 1.15 + Slash: 1.15 + Pierce: 1.15 From a51f487760f708f76fb974cc0574368c54ea86ec Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Wed, 4 Oct 2023 11:49:49 -0400 Subject: [PATCH 14/25] More fixins --- Resources/Prototypes/DeltaV/Damage/modifier_sets.yml | 2 +- Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml index ad8851f3957..ceae9ab272c 100644 --- a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml +++ b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml @@ -5,7 +5,7 @@ - type: damageModifierSet id: Harpy - coefficients: + coefficients: Blunt: 1.15 Slash: 1.15 Pierce: 1.15 diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index bb2b6bf45a1..51c623b978f 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -45,6 +45,9 @@ - type: emoteSounds id: MaleVulpakin + params: + variation: 0.125 + sounds: Scream: collection: MaleScreams Laugh: From 811b6637fd3385b4e914c85304249a6781517cfa Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Fri, 6 Oct 2023 15:12:00 -0400 Subject: [PATCH 15/25] THE WINGS ARE HERE --- .../Locale/en-US/deltav/markings/harpy.ftl | 1 + .../Mobs/Customization/Markings/harpy.yml | 11 +++ .../DeltaV/Entities/Mobs/Species/harpy.yml | 83 ++++++++++++++++++ Resources/Prototypes/DeltaV/Species/harpy.yml | 8 +- .../Harpy/harpy_wings_default.rsi/harpy.png | Bin 0 -> 9638 bytes .../Harpy/harpy_wings_default.rsi/meta.json | 15 ++++ 6 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/markings/harpy.ftl create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi/harpy.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi/meta.json diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl new file mode 100644 index 00000000000..21d8cd13dd7 --- /dev/null +++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl @@ -0,0 +1 @@ +marking-HarpyWingDefault = Basic Wings \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml new file mode 100644 index 00000000000..a8a24b83b44 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml @@ -0,0 +1,11 @@ +# All the Harpy customization + +# Ears Markings +- type: marking + id: HarpyWingDefault + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Harpy] + sprites: + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi + state: harpy diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index 9329f67844a..b352eb6fefb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -15,6 +15,47 @@ type: InstrumentBoundUserInterface - type: Sprite scale: 0.9, 0.9 + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "underpants" ] + - map: [ "undershirt" ] + - map: [ "socks" ] + - map: [ "jumpsuit" ] + - map: ["enum.HumanoidVisualLayers.LFoot"] + - map: ["enum.HumanoidVisualLayers.RFoot"] + - map: ["enum.HumanoidVisualLayers.LHand"] + - map: ["enum.HumanoidVisualLayers.RHand"] + - map: [ "id" ] + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: [ "clownedon" ] # Dynamically generated + sprite: "Effects/creampie.rsi" + state: "creampie_human" + visible: false +# Yes, RArm has to be down here + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "mask" ] + - map: [ "head" ] + - type: HumanoidAppearance species: Harpy - type: Fixtures @@ -59,6 +100,48 @@ components: - type: HumanoidAppearance species: Harpy + - type: Sprite + scale: 0.9, 0.9 + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "underpants" ] + - map: [ "undershirt" ] + - map: [ "socks" ] + - map: [ "jumpsuit" ] + - map: ["enum.HumanoidVisualLayers.LFoot"] + - map: ["enum.HumanoidVisualLayers.RFoot"] + - map: ["enum.HumanoidVisualLayers.LHand"] + - map: ["enum.HumanoidVisualLayers.RHand"] + - map: [ "id" ] + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: [ "clownedon" ] # Dynamically generated + sprite: "Effects/creampie.rsi" + state: "creampie_human" + visible: false +# Yes, RArm has to be down here + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "mask" ] + - map: [ "head" ] - type: entity id: ActionHarpyPlayMidi diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml index 8ddd47757f1..49365cb0347 100644 --- a/Resources/Prototypes/DeltaV/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Species/harpy.yml @@ -28,7 +28,9 @@ required: false Legs: points: 2 - required: true + required: false Arms: - points: 2 - required: true + points: 1 + required: false + defaultMarkings: [ HarpyWingDefault ] + diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi/harpy.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi/harpy.png new file mode 100644 index 0000000000000000000000000000000000000000..be6423a49a8519c3dfd7eca79b36ca1a21688ad8 GIT binary patch literal 9638 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 Date: Sat, 7 Oct 2023 19:06:52 -0400 Subject: [PATCH 16/25] Fixing harpy wings --- .../Harpy/harpy_wings_default.rsi/harpy.png | Bin 9638 -> 3165 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi/harpy.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi/harpy.png index be6423a49a8519c3dfd7eca79b36ca1a21688ad8..c95611d4daef0dd33a42ed092255aa537ddd33ee 100644 GIT binary patch delta 2141 zcmZvd3pA8l8^_;qzY}9phh_|tA*Lb>;~mCrOv5xz%IU&1Gnfp+7-Hp^p-?DVFJ0WF zFWq%JH`(-EIB5ZZGM(D6A0yX{?ZSGd%~_8%<3WNBY0@NIn32ZTZ)Be((F@>KQ z&Fn&8CG?#SchNF7cpjSljhtx+`~8jR&sehmys+IUSkjt9>CaoPI_8_WAs#H}w#mt= z37z@&)$bjBkwV*!LyJld4hm1ya_a|&-!{(I$`YE3kQb5GE4-|?v}FVU0IE^mfiVD} z)%1PB@+`G}0RTles8`nyrU{wqxyx&+p&+)No5Jdfg0AZ!p-w$(2nGisceoYAhi`<6 z;g(Pb+yYvJdqeK}1SnnK+YH5I;5@m!2s$5+W=GINSvFCTp=gvBi9*G>Qb~C9R%(IZ1yOg!2K z4eeY@fX=SPK+S871t^=Jl$>q;SKZm>{~7sF=gx{@@Yqq`5Bpo=2c@}tu4b!!xYf=G z7N7n-1LLFUjBpko#fn_Dz(a#B`IltXtCt|alH6T?jXyA5c!Or?s+0P-e*IM);Ugij zRL6mU-dP8$6m65J)xk0_8VEzVR8g`kECr*}GEi6>eGML+4=3sOOWoxyoF!8`5ld zXX6W|+0$Y`<9&CxKW|n(Qta?dem_ZW|01o0Oz0-%+~{cmwqDk$IBL_l=^cv@kTo|q z$B{i%ob|UC&KDFE3<_FXNo8lmV)4rS{Jeyw@{Z^$3&a4&ntHj7$}BUTN@u@(^Ecu0 zA1XhBu2IQ`GrAkjmKGICJGQA8;c+;%sSnQbYB~J_*7*vPUjtQr{rt#YomGHrX=y2X zO8o=oT9SK!YwOq;3n9CtPsn)q;DP!D<216-=wdwh8Wv_R827#O;x;|8% z9_!-f11(f0#?wWvrnYunc9!yBcHHv=H`fH8=+VxQt2D3i&^yooRwR8@%53`3?mDRp z=tMcDm`0q_m~5@=$vXDLWpJEfjg=S|W(R`&yCbk^4=q`UX4@Nt5dn{;y>xTb20S8! z>_lpASEV49xVQHxD#7}B1dJ?u?|D!Go0*_W7;jJUW9m|CIM+7o6XpXCRUj>lt{W!W z;9G7CU3aw*x+NPbmOo2j>E}%QGSImb$Z9#;vLUAK@l(W2xD)9{76v_-jAz6LVaO7b z_Gw${rH7Fc*eQQ-$cr~&Z$vUwR46hl-&cK+AaGO@*#;?9B`IX}TuE~G&0yKV`lOWg zkde|yTTKHGXL`Z?&0Bp7YQyfX1leD3@<}o&9_75rxHn~QN9|;8#$Bd_JvJ+)NITZI z8y8m@tA+%C8#y}JsYV@&ug60v?M0#;Q(op9dry;+wx5rcof13zR|v#Az>`Tg;^X4B zFMk=4NTMbix{Bb??7wbncMt8ugWwTe4T5BMK)^_!!0OwlhZ!HgA%z?cr|Az{Yzldx z*J5(=+LzXR&#ju}-(<4->RY#T{z_yyYP>Kh4eu@UDZhSd_R1B^b8kiAro}ghk1Ja+ zfcae~bMH~TOk{vWHA!ISaYiB7Q#>~^f?j@^x%zCPvVsL|=K|%V!^8m%k@-TZtgAT+ zE8pLy;dCu;o-yjy9jsc>NuY=7Y%`;rWE8h^nyy_PRW{hqeMsJN!{Oe z`#6<_O0-?Ny5nEvat^~vN=k*-A=KDYDXb=ynNsee@v-OxN!UtfQ#<3&)O z%6_XQi>rJ=m$_64Il+EK&$=@4MQUTdg%G5~Tr9|YM;$N@hr2qGiZ3zqL(hVv16U@evyoke!& zU#B{aOzb_dH{K}@Q6?Wf*Zefs=6WHz79njR%q1^f-PGjG3H?>Dpx-^faKxp Je$y>D<=+>J!7~5= literal 9638 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 Date: Sat, 7 Oct 2023 22:46:10 -0400 Subject: [PATCH 17/25] Finally finished with all of the "Natural" sounds, birb sounds next --- .../DeltaV/SoundCollections/harpy.yml | 62 ++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml index c7379c314ce..1aab3bad720 100644 --- a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml +++ b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml @@ -16,6 +16,9 @@ - /Audio/Voice/Human/femalescream_3.ogg - /Audio/Voice/Human/femalescream_4.ogg - /Audio/Voice/Human/femalescream_5.ogg + - /Audio/Voice/Moth/moth_scream.ogg + - /Audio/Voice/Skeleton/skeleton_scream.ogg + - /Audio/Voice/Reptilian/reptilian_scream.ogg - type: soundCollection id: HarpyLaugh @@ -28,6 +31,7 @@ - /Audio/Voice/Diona/diona_rustle3.ogg - /Audio/Animals/lizard_happy.ogg - /Audio/Animals/ferret_happy.ogg + - /Audio/Voice/Moth/moth_laugh.ogg - type: soundCollection id: HarpyHisses @@ -40,6 +44,15 @@ - /Audio/Items/hypospray.ogg - /Audio/Items/ratchet.ogg - /Audio/Items/welder.ogg + - /Audio/Machines/airlock_close.ogg + - /Audio/Machines/airlock_ext_close.ogg + - /Audio/Machines/airlock_ext_open.ogg + - /Audio/Machines/airlock_open.ogg + - /Audio/Machines/disposalflush.ogg + - /Audio/Machines/printer.ogg + - /Audio/Machines/windoor_open.ogg + - /Audio/Effects/spray.ogg + - /Audio/Effects/spray2.ogg - type: soundCollection id: HarpySigh @@ -84,6 +97,7 @@ id: HarpyPurrs files: - /Audio/Nyanotrasen/Voice/Felinid/cat_purr1.ogg + - /Audio/Mecha/sound_mecha_hydraulic.ogg - type: soundCollection id: HarpyBooms @@ -95,6 +109,8 @@ files: - /Audio/Items/desk_bell_ring.ogg - /Audio/Items/ring.ogg + - /Audio/Machines/ding.ogg + - /Audio/Machines/warning_buzzer.ogg - type: soundCollection id: HarpyHonks @@ -114,6 +130,12 @@ - /Audio/Effects/Arcade/player_attack.ogg - /Audio/Effects/Arcade/player_charge.ogg - /Audio/Effects/Arcade/player_heal.ogg + - /Audio/Magic/blink.ogg + - /Audio/Magic/staff_animation.ogg + - /Audio/Magic/staff_change.ogg + - /Audio/Magic/staff_chaos.ogg + - /Audio/Magic/staff_door.ogg + - /Audio/Magic/staff_healing.ogg - type: soundCollection id: HarpyBangs @@ -124,6 +146,13 @@ - /Audio/Weapons/Guns/Gunshots/pistol.ogg - /Audio/Weapons/Guns/Gunshots/c-20r.ogg - /Audio/Items/snap.ogg + - /Audio/Machines/airlock_creaking.ogg + - /Audio/Machines/blastdoor.ogg + - /Audio/Machines/machine_vend.ogg + - /Audio/Magic/disintegrate.ogg + - /Audio/Magic/fireball.ogg + - /Audio/Magic/forcewall.ogg + - /Audio/Magic/knock.ogg - type: soundCollection id: HarpyBeeps @@ -153,11 +182,24 @@ - /Audio/Effects/RingtoneNotes/gsharp.ogg - /Audio/Effects/Arcade/gameover.ogg - /Audio/Effects/Arcade/win.ogg + - /Audio/Machines/airlock_deny.ogg + - /Audio/Machines/alarm.ogg + - /Audio/Machines/beep.ogg + - /Audio/Machines/boltsdown.ogg + - /Audio/Machines/boltsup.ogg + - /Audio/Machines/custom_deny.ogg + - /Audio/Machines/high_tech_confirm.ogg + - /Audio/Machines/microwave_done_beep.ogg + - /Audio/Machines/scan_finish.ogg + - /Audio/Machines/vending_jingle.ogg - type: soundCollection id: HarpyRevs files: - - /Audio/Weapons/chainsawwield.ogg + - /Audio/Weapons/chainsawwield.ogg + - /Audio/Machines/blender.ogg + - /Audio/Machines/juicer.ogg + - /Audio/Machines/reclaimer_startup.ogg - type: soundCollection id: HarpyClicks @@ -169,3 +211,21 @@ - /Audio/Items/pistol_magin.ogg - /Audio/Items/pistol_magout.ogg - /Audio/Items/rped.ogg + - /Audio/Machines/door_lock_off.ogg + - /Audio/Machines/door_lock_on.ogg + - /Audio/Machines/id_swipe.ogg + - /Audio/Machines/machine_switch.ogg + - /Audio/Machines/screwdriveropen.ogg + +- type: soundCollection + id: HarpyChitter + - /Audio/Voice/Moth/moth_chitter.ogg + - /Audio/Machines/circuitprinter.ogg + - /Audio/Machines/diagnoser_printing.ogg + - /Audio/Machines/uniformprinter.ogg + - /Audio/Machines/vaccinator_running.ogg + +- type: soundCollection + id: HarpySqueak + - /Audio/Voice/Moth/moth_squeak.ogg + - /Audio/Animals/mouse_squeak.ogg From 49d4e44455138c5de99844882f3a899327f3cf23 Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Tue, 10 Oct 2023 17:27:17 -0400 Subject: [PATCH 18/25] Adding default tail. --- .../Locale/en-US/deltav/markings/harpy.ftl | 3 ++- .../Mobs/Customization/Markings/harpy.yml | 9 +++++++++ Resources/Prototypes/DeltaV/Species/harpy.yml | 2 +- .../harpy_tails.rsi/harpy_tail_swallow.png | Bin 0 -> 317 bytes .../Harpy/harpy_tails.rsi/meta.json | 16 ++++++++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/harpy_tail_swallow.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl index 21d8cd13dd7..1d26b7699da 100644 --- a/Resources/Locale/en-US/deltav/markings/harpy.ftl +++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl @@ -1 +1,2 @@ -marking-HarpyWingDefault = Basic Wings \ No newline at end of file +marking-HarpyWingDefault = Basic Wings +marking-HarpyTailSwallow = Swallow Tail \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml index a8a24b83b44..235e7ff1b9f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml @@ -9,3 +9,12 @@ sprites: - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi state: harpy + +- type: marking + id: HarpyTailSwallow + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Harpy] + sprites: + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi + state: harpy_tail_swallow diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml index 49365cb0347..b2e3df551c1 100644 --- a/Resources/Prototypes/DeltaV/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Species/harpy.yml @@ -20,6 +20,7 @@ Tail: points: 1 required: true + defaultMarkings: [ HarpyTailSwallow ] HeadTop: points: 1 required: true @@ -33,4 +34,3 @@ points: 1 required: false defaultMarkings: [ HarpyWingDefault ] - diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/harpy_tail_swallow.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/harpy_tail_swallow.png new file mode 100644 index 0000000000000000000000000000000000000000..655f973255e559557253e1854a8819e277c48efd GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z&YnH{|NsB5UcI__@gh*{*#l>9AjMh|NA#Uv2s&2 z4~hvmBsefMGBUEbDKB`Om7no?S}=7xtKuJqear05H*ObP0CX{fr>mdKI;Vst E00xD5+W-In literal 0 HcmV?d00001 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 new file mode 100644 index 00000000000..715d3022924 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json @@ -0,0 +1,16 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from S.P.L.U.R.T at https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/blob/master/modular_splurt/icons/mob/mam_tails.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "harpy_tail_swallow", + "directions": 4 + } + + ] +} From 14f8b6e2487126277103348bb702a67f33eb5602 Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Tue, 10 Oct 2023 20:00:45 -0400 Subject: [PATCH 19/25] Semifinal commit, all defaults are ready --- .../Locale/en-US/deltav/markings/harpy.ftl | 5 ++- .../Mobs/Customization/Markings/harpy.yml | 29 +++++++++++++++++- .../DeltaV/Entities/Mobs/Species/harpy.yml | 2 +- Resources/Prototypes/DeltaV/Species/harpy.yml | 1 + .../harpy_ears.rsi/harpy_ears_default.png | Bin 0 -> 786 bytes .../Harpy/harpy_ears.rsi/meta.json | 16 ++++++++++ .../Harpy/harpy_tails.rsi/meta.json | 10 +++++- .../Harpy/harpy_tails.rsi/phoenix_tail.png | Bin 0 -> 1076 bytes .../Harpy/harpy_tails.rsi/rooster_tail.png | Bin 0 -> 1052 bytes 9 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl index 1d26b7699da..302a24e06fb 100644 --- a/Resources/Locale/en-US/deltav/markings/harpy.ftl +++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl @@ -1,2 +1,5 @@ marking-HarpyWingDefault = Basic Wings -marking-HarpyTailSwallow = Swallow Tail \ No newline at end of file +marking-HarpyEarsDefault = Feather Tufts +marking-HarpyTailSwallow = Swallow Tail +marking-HarpyTailPhoenix = Phoenix Tail +marking-HarpyTailRooster = Rooster Tail \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml index 235e7ff1b9f..e0f37587754 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml @@ -17,4 +17,31 @@ speciesRestriction: [Harpy] sprites: - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi - state: harpy_tail_swallow + state: harpy_tail_swallow + +- type: marking + id: HarpyEarsDefault + bodyPart: Head + markingCategory: HeadTop + speciesRestriction: [Harpy] + sprites: + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi + state: harpy_ears_default + +- type: marking + id: HarpyTailPhoenix + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Harpy] + sprites: + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi + state: phoenix_tail + +- type: marking + id: HarpyTailRooster + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Harpy] + sprites: + - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi + state: rooster_tail diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index b352eb6fefb..5f3cf54ae3e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -42,7 +42,6 @@ - map: [ "back" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - map: [ "enum.HumanoidVisualLayers.HeadSide" ] - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - map: [ "enum.HumanoidVisualLayers.Tail" ] - map: [ "pocket1" ] - map: [ "pocket2" ] @@ -53,6 +52,7 @@ # Yes, RArm has to be down here - map: [ "enum.HumanoidVisualLayers.RArm" ] - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - map: [ "mask" ] - map: [ "head" ] diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml index b2e3df551c1..d237b371af8 100644 --- a/Resources/Prototypes/DeltaV/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Species/harpy.yml @@ -24,6 +24,7 @@ HeadTop: points: 1 required: true + defaultMarkings: [ HarpyEarsDefault ] Chest: points: 1 required: false 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 new file mode 100644 index 0000000000000000000000000000000000000000..fa27e2b74a63f4fe460360508f78c5a595514d0d GIT binary patch literal 786 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@XXVb`Ho)PG(@xm{>Y-ulHdG ziDUD(bp>h5h6og%2spa1H7QVLX;bVf=jem0yo-FJ6g>~Cx^}I8@F<`_Aoh>cAN~^2 z7*Q5SL6y$cqZ!s{VK1cW?{ExOx@vV<0@nLg)4iW`yG`fv$P{u zC2u*FsN5_vX~Kd9O};M*1QurnrOmDV*p@Gu`pMu|)QYCbi#voW7cU80vDzzCId)l?tJ z`JwECPs^5SvLCprXYecMWK5n1V^p0lvz=bUK^ub-ewOQd*Ub7~_>bkuwwImn8V)Nb zO#0St{*NIwF~ic=txpjc1)K#Qk;M!QddeWoSh3W;3>YDLo-U3d6>)EGo#t&e5O58g z%%{;HDjK*_JIR%Cii5aYa&b(&F{EOPtRrh_ozPJ7V*B76*r>&{weRj^kf7a7;ay8uyOdJXg*a(N@M)Qp` p*LAZ_UY8FHPQKI#&op0O1}z|)1BgN3Qt)ID<>~6@vd$@?2>`acO& z_l_XV5zHVVGuv9qF6Pj6{5--Z>O)NQ>b|ez7$~SV1AP6&v&`ZS@jP*Q%drIS5f8JH zTp&Inj&eF6@vYDmkKY6rJ^m8RbD0IeFM3MFHdfl0mAFAXMI15o3TvK6+$5x$D_N>z zw8mj0gA|gGprC?H=x`9DYEovMees5G8D;V?`dX-hlcR_dd84FOsH;jUx$f_&>(u)j0ICg>|Nc+*}g7AVh|M`!@GE-GLL_h>YKm+MqEEoaUqGUbK?{j+h2HO)miOo&AVu08Od7;S7LPUSPK)xxlofsz(!mxZ&tX zE{L^+S|qPoHwU$0swn}%+b;ywm&q6m8Dr-z^X2`Vc>i|pJ{6caFBJA zn5K9ico7#uzyz>PY16?st-EEev7y3Gkt?B3DPV6%VGSM+f*j*7!aMQd+h8^YjJ&-U zFgd}*$L};L7t9(Ytj1<(U=BbN64QY^ANz);m!Dh*$;S;Yv_H#UP!e;tMJBGphh13= zZm^#^zY;fN7}v0z_uESwPk56u9AHEssBicthaKmTF0000& z_l_XV5zHVVGuv9qF6Pj6{5--Z>O)NQ>b|ez7$~SV1AP6&v&`ZS@jP*Q%drIS5f8JH zTp&Inj&eF6@vYDmkKY6rJ^m8RbD0IeFM3MFHdfl0mAFAXMI15o3TvK6+$5x$D_N>z zw8mj0gA|gGprC?H=x`9DYEovMees5G8D;V?`dX-hlcR_dd84FOsH;jUx$f_&>(I-merpa!=< zrL;f|{`VIJxCDpQWIbm^c60+`kh6Rwm=UMjcPEL_scCeHfCz|y2#A0Ph`>K3aLUzv zyuz}j|JFd=wsW&`jT-McM>FBuxT#l0sBJ^}!QV{Re@PXMY0fJig?ecwMI;Mq8i zS#v?v02pZt0dtin6RHJZqt7AWNqx4h761is>|=Rms0C3k=69N&0I=A=4zTT9JA}V9JpiyFwwc?u4GdUvsue=2dW1TH z4eVoE9AY7!TgnvgEjN49vs8O4p63Rj4I1q^f&c)GDc)v+t-F_Uw4_}`nt^2?3E}As z!E*j5l#=lf_uOaaZ_j~)l7c+8W8a|(+Ngz^Lk8H>6>%nbO3fYz_h`!ufao~=sVe|r zX$cR}FdhbbI9sBRRQlTrGWtx`2JM7sDVA`ugiSjErY63ZecG`f&j}neB^=(`Cg(9b z<~jD`I^x^vaJ)2b?Py7RuE@uZq%xtVl>old-&c{R=41x&V~CR@|Cfx|*0y8cSDzWE zsRnP(4Q$O-_C!DgL_h>YKmTF0000 Date: Thu, 12 Oct 2023 19:49:33 -0400 Subject: [PATCH 20/25] FINAL COMMIT UNLESS THE LINTERS MURDER ME --- .../Audio/DeltaV/Voice/Harpy/attributions.yml | 9 +++++++ Resources/Audio/DeltaV/Voice/Harpy/caw1.ogg | Bin 0 -> 8200 bytes Resources/Audio/DeltaV/Voice/Harpy/chirp1.ogg | Bin 0 -> 6456 bytes .../Audio/DeltaV/Voice/Harpy/license.txt | 2 ++ .../en-US/deltav/store/uplink-catalog.ftl | 3 --- .../DeltaV/Catalog/uplink_catalog.yml | 17 ------------- .../Entities/Objects/Misc/implanters.yml | 7 ----- .../Objects/Misc/subdermal_implants.yml | 9 ------- .../DeltaV/SoundCollections/harpy.yml | 8 ++++++ .../DeltaV/Voice/speech_emote_sounds.yml | 16 +++++++++--- .../Prototypes/DeltaV/Voice/speech_emotes.yml | 24 ++++++++++++++++++ 11 files changed, 56 insertions(+), 39 deletions(-) create mode 100644 Resources/Audio/DeltaV/Voice/Harpy/attributions.yml create mode 100644 Resources/Audio/DeltaV/Voice/Harpy/caw1.ogg create mode 100644 Resources/Audio/DeltaV/Voice/Harpy/chirp1.ogg create mode 100644 Resources/Audio/DeltaV/Voice/Harpy/license.txt delete mode 100644 Resources/Locale/en-US/deltav/store/uplink-catalog.ftl delete mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml delete mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml diff --git a/Resources/Audio/DeltaV/Voice/Harpy/attributions.yml b/Resources/Audio/DeltaV/Voice/Harpy/attributions.yml new file mode 100644 index 00000000000..f8c5fc72360 --- /dev/null +++ b/Resources/Audio/DeltaV/Voice/Harpy/attributions.yml @@ -0,0 +1,9 @@ +- files: ["caw1.ogg"] + license: "CC-BY-SA-4.0" + copyright: "Original sound by https://xeno-canto.org/756861" + source: "https://xeno-canto.org/756861" + + files: ["chirp1.ogg"] + license: "CC-BY-SA-4.0" + copyright: "Original sound by https://xeno-canto.org/797998" + source: "https://xeno-canto.org/797998" diff --git a/Resources/Audio/DeltaV/Voice/Harpy/caw1.ogg b/Resources/Audio/DeltaV/Voice/Harpy/caw1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..182d3e755bfa77dc8d5ded9775bf32b213f1d690 GIT binary patch literal 8200 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/DeltaV/Voice/Harpy/chirp1.ogg b/Resources/Audio/DeltaV/Voice/Harpy/chirp1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..07303b6626c89630aa752e4c1a514837c5ff6fa3 GIT binary patch literal 6456 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 Vn(i&TMW*T`vjFnPv=Bc4{s+nl0CNBU literal 0 HcmV?d00001 diff --git a/Resources/Audio/DeltaV/Voice/Harpy/license.txt b/Resources/Audio/DeltaV/Voice/Harpy/license.txt new file mode 100644 index 00000000000..d7e2f4ed36b --- /dev/null +++ b/Resources/Audio/DeltaV/Voice/Harpy/license.txt @@ -0,0 +1,2 @@ +caw1.ogg licensed under CC-BY-SA-4.0 taken from https://xeno-canto.org/756861 +chirp1.ogg licensed under CC-BY-SA-4.0 taken from https://xeno-canto.org/797998 diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl deleted file mode 100644 index d08b3adeb95..00000000000 --- a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl +++ /dev/null @@ -1,3 +0,0 @@ -# Implants -uplink-bionic-syrinx-name = Bionic Syrinx Implanter -uplink-bionic-syrinx-desc = An implant that expands the vocal range and capacity of a Harpy, to include perfect imitation of any humanoid voice. diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml index 9e383162eab..a32f57beed8 100644 --- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml @@ -17,20 +17,3 @@ # blacklist: # components: # - SurplusBundle -- type: listing - id: UplinkBionicSyrinx - name: uplink-bionic-syrinx-name - description: uplink-bionic-syrinx-desc - productEntity: BionicSyrinxImplanter - cost: - Telecrystal: 6 - categories: - - UplinkImplants - conditions: - - !type:BuyerSpeciesCondition - whitelist: - - Harpy - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml deleted file mode 100644 index 9849642f939..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: entity - id: BionicSyrinxImplanter - name: bionic syrinx implanter - parent: BaseImplantOnlyImplanterSyndi - components: - - type: Implanter - implant: BionicSyrinxImplant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml deleted file mode 100644 index 33d1e220b0c..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: BaseSubdermalImplant - id: BionicSyrinxImplant - name: bionic syrinx implant - description: This implant expands a harpy's innate mimickry abilities. - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionChangeVoiceMask diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml index 1aab3bad720..c433a4c7ad7 100644 --- a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml +++ b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml @@ -229,3 +229,11 @@ id: HarpySqueak - /Audio/Voice/Moth/moth_squeak.ogg - /Audio/Animals/mouse_squeak.ogg + +- type: soundCollection + id: HarpyCaws + - /Audio/DeltaV/Voice/Harpy/caw1.ogg + +- type: soundCollection + id: HarpyChirps + - /Audio/DeltaV/Voice/Harpy/chirp1.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 51c623b978f..ea835943401 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -9,13 +9,15 @@ Laugh: collection: HarpyLaugh Sneeze: - collection: HarpySneezes + collection: Sneezes Cough: - collection: HarpyCoughs + collection: Coughs + Sigh: + collection: HarpySighs Crying: collection: HarpyCry Whistle: - collection: HarpyWhistles + collection: Whistles Hiss: collection: HarpyHisses Meow: @@ -42,6 +44,14 @@ collection: HarpyRevs Click: collection: HarpyClicks + Chitter: + collection: HarpyChitter + Squeak: + collection: HarpySqueak + Caw: + collection: HarpyCaws + Chirp: + collection: HarpyChirps - type: emoteSounds id: MaleVulpakin diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml index 1c5894b3289..7b7b580086c 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml @@ -92,6 +92,30 @@ - click! - clicking - clicked + +- type: emote + id: Caw + category: Vocal + chatMessages: [caws.] + chatTriggers: + - caw + - caws + - caw. + - caw! + - cawing + - cawed + +- type: emote + id: Chirp + category: Vocal + chatMessages: [chirps.] + chatTriggers: + - chirp + - chirps + - chirp. + - chirp! + - chirping + - chirped #Vulpakin - type: emote From f28487930f8ec0a01f9e45b55dbab30ac4c0d56a Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Thu, 12 Oct 2023 20:06:53 -0400 Subject: [PATCH 21/25] Guh? --- Resources/Prototypes/DeltaV/Damage/modifier_sets.yml | 2 +- Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml index ceae9ab272c..a2b8be8bf6a 100644 --- a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml +++ b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml @@ -8,4 +8,4 @@ coefficients: Blunt: 1.15 Slash: 1.15 - Pierce: 1.15 + Piercing: 1.15 diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index ea835943401..798cd827faa 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -9,11 +9,11 @@ Laugh: collection: HarpyLaugh Sneeze: - collection: Sneezes + collection: MaleSneezes Cough: - collection: Coughs + collection: MaleCoughs Sigh: - collection: HarpySighs + collection: Sighs Crying: collection: HarpyCry Whistle: From fed70a262c996f1218bfdf3a7dde3321fcb37d5f Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Thu, 12 Oct 2023 20:21:39 -0400 Subject: [PATCH 22/25] Final fix --- Resources/Prototypes/DeltaV/SoundCollections/harpy.yml | 4 ++++ Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml index c433a4c7ad7..d490bfbe64c 100644 --- a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml +++ b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml @@ -219,6 +219,7 @@ - type: soundCollection id: HarpyChitter + files: - /Audio/Voice/Moth/moth_chitter.ogg - /Audio/Machines/circuitprinter.ogg - /Audio/Machines/diagnoser_printing.ogg @@ -227,13 +228,16 @@ - type: soundCollection id: HarpySqueak + files: - /Audio/Voice/Moth/moth_squeak.ogg - /Audio/Animals/mouse_squeak.ogg - type: soundCollection id: HarpyCaws + files: - /Audio/DeltaV/Voice/Harpy/caw1.ogg - type: soundCollection id: HarpyChirps + files: - /Audio/DeltaV/Voice/Harpy/chirp1.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 798cd827faa..d1b5d824a75 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -13,7 +13,7 @@ Cough: collection: MaleCoughs Sigh: - collection: Sighs + collection: MaleSigh Crying: collection: HarpyCry Whistle: From 0f8d8b7dfe607ca862f35db2774bf3f9316c91b9 Mon Sep 17 00:00:00 2001 From: evilexecutive Date: Thu, 12 Oct 2023 20:54:18 -0400 Subject: [PATCH 23/25] For reasons I don't know, they didn't have handcuff layers --- Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index 5f3cf54ae3e..6f7c8f4b105 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -31,6 +31,11 @@ - map: ["enum.HumanoidVisualLayers.RFoot"] - map: ["enum.HumanoidVisualLayers.LHand"] - map: ["enum.HumanoidVisualLayers.RHand"] + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false - map: [ "id" ] - map: [ "gloves" ] - map: [ "shoes" ] From e61d60249672de49114cf81b87613610bb686fe9 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 13 Oct 2023 13:03:36 -0400 Subject: [PATCH 24/25] Updating HarpySinger to use microphone as default Birds will sing Signed-off-by: VMSolidus --- Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index 6f7c8f4b105..d9fdeca5afb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -8,7 +8,7 @@ - type: HarpySinger - type: Instrument allowPercussion: false - program: 62 + program: 52 - type: UserInterface interfaces: - key: enum.InstrumentUiKey.Key @@ -151,7 +151,7 @@ - type: entity id: ActionHarpyPlayMidi name: Play MIDI - description: Imitate whatever sounds you want + description: Sing your heart out! noSpawn: true components: - type: InstantAction From 4377106e4fb791ee8c6ff9a8d05ece7cce746c25 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 13 Oct 2023 13:16:35 -0400 Subject: [PATCH 25/25] Confiscating Urist McHarpy's 3rd leg Signed-off-by: VMSolidus --- Resources/Prototypes/DeltaV/Species/harpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml index d237b371af8..0df69e9d729 100644 --- a/Resources/Prototypes/DeltaV/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Species/harpy.yml @@ -20,7 +20,7 @@ Tail: points: 1 required: true - defaultMarkings: [ HarpyTailSwallow ] + defaultMarkings: [ HarpyTailPhoenix ] HeadTop: points: 1 required: true