DeltaV-Station · Colin-Tel · Oct 17, 2023 · Oct 14, 2023 · Oct 14, 2023 · Oct 15, 2023
@@ -0,0 +1,28 @@
+using Content.Server.Instruments;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Systems;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.DeltaV.Harpy
+{
+    public sealed class HarpySingerSystem : EntitySystem
+    {
+        [Dependency] private readonly InstrumentSystem _instrument = default!;
+        [Dependency] private readonly MobStateSystem _mobState = default!;
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<InstrumentComponent, MobStateChangedEvent>(HarpyStopSinging);
+        }
+        //Immediately closes the Midi UI window if a Singer is incapacitated
+        private void HarpyStopSinging(EntityUid uid, InstrumentComponent component, MobStateChangedEvent args)
+
+        {
+            if (HasComp<ActiveInstrumentComponent>(uid) && TryComp<ActorComponent>(uid, out var actor) && _mobState.IsIncapacitated(uid))
+            {
+                _instrument.ToggleInstrumentUi(uid, actor.PlayerSession);
+            }
+        }
+    }
+}
@@ -25,3 +25,4 @@ private void OnShutdown(EntityUid uid, HarpySingerComponent component, Component
         }
     }
 }
+
@@ -1,5 +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-HarpyWing3Tone = Three Tone Wings
+marking-HarpyWing3Tone-harpy3tone1 = Top Third
+marking-HarpyWing3Tone-harpy3tone2 = Middle Third
+marking-HarpyWing3tone-harpy3tone3 = Bottom Third
+
+marking-HarpyWingSpeckled = Speckled Wings
+marking-HarpyWingSpeckled-harpyspeckled1 = Main
+marking-HarpyWingSpeckled-harpyspeckled2 = Speckles
+
+marking-HarpyWingUndertone = Wings with Undertone
+marking-HarpyWingUndertone-harpyundertone1 = Front
+marking-HarpyWingUndertone-harpyundertone2 = Back
+
+marking-HarpyWingTips = Wings with Feather Tips
+marking-HarpyWingTips-harpywingtip1 = Main
+marking-HarpyWingTips-harpywingtip2 = Feathertips
+
 marking-HarpyEarsDefault = Feather Tufts
-marking-HarpyTailSwallow = Swallow Tail
-marking-HarpyTailPhoenix = Phoenix Tail
-marking-HarpyTailRooster = Rooster Tail
+marking-HarpyEarsDefault-harpy_ears_default = Tufts
+
+marking-HarpyTailPhoenix = Basic Tail
+marking-HarpyTailPhoenix-phoenix_tail = Tail
+
+marking-HarpyTailRooster = Rooster Tail
+marking-HarpyTailRooster-rooster_tail = Tail
@@ -7,18 +7,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.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
-
 - type: marking
   id: HarpyEarsDefault
   bodyPart: Head
@@ -45,3 +36,60 @@
   sprites:
     - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
       state: rooster_tail 
+
+- type: marking
+  id: HarpyWing2Tone
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Harpy]
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpy2tone1
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpy2tone2
+
+- type: marking
+  id: HarpyWing3Tone
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Harpy]
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpy3tone1
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpy3tone2
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpy3tone3
+
+- type: marking
+  id: HarpyWingSpeckled
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Harpy]
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpyspeckled1
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpyspeckled2
+
+- type: marking
+  id: HarpyWingUndertone
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Harpy]
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpyundertone1
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpyundertone2
+
+- type: marking
+  id: HarpyWingTips
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Harpy]
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpywingtip1
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+      state: harpywingtip2
@@ -9,6 +9,16 @@
   - type: Instrument
     allowPercussion: false
     program: 52
+  - type: SwappableInstrument
+    instrumentList:
+      "Voice": {52: 0}
+      "Trumpet": {56: 0}
+      "Electric": {27: 0}
+      "Bass": {33: 0}
+      "Rock": {29: 0}
+      "Acoustic": {24: 0}
+      "Flute": {73: 0}
+      "Sax": {66: 0}
   - type: UserInterface
     interfaces:
     - key: enum.InstrumentUiKey.Key
@@ -151,11 +161,11 @@
 - type: entity
   id: ActionHarpyPlayMidi
   name: Play MIDI
-  description: Sing your heart out!
+  description: Sing your heart out! Right click yourself to set an instrument.
   noSpawn: true
   components:
   - type: InstantAction
-    checkCanInteract: false
+    checkCanInteract: true
     icon: DeltaV/Interface/Actions/harpy_sing.png
     event: !type:OpenUiActionEvent
       key: enum.InstrumentUiKey.Key
@@ -52,6 +52,12 @@
       collection: HarpyCaws
     Chirp:
       collection: HarpyChirps
+    Snarl:
+      collection: VulpakinSnarls
+    Bark:
+      collection: VulpakinBarks
+    Whine:
+      collection: VulpakinWhines
 
 - type: emoteSounds
   id: MaleVulpakin

@@ -1,16 +1,12 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Swallow 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, Phoenix and Rooster by @leonardo_dabepis",
+    "copyright": "Phoenix and Rooster by @leonardo_dabepis",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-        {
-            "name": "harpy_tail_swallow",
-            "directions": 4
-        },
         {
             "name": "phoenix_tail",
             "directions": 4

@@ -0,0 +1,59 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "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",
+    "states": [
+        {
+            "name": "harpy",
+            "directions": 4
+        },
+        {
+            "name": "harpy2tone1",
+            "directions": 4
+        },
+        {
+            "name": "harpy2tone2",
+            "directions": 4
+        },
+        {
+            "name": "harpy3tone1",
+            "directions": 4
+        },
+        {
+            "name": "harpy3tone2",
+            "directions": 4
+        },
+        {
+            "name": "harpy3tone3",
+            "directions": 4
+        },
+        {
+            "name": "harpyspeckled1",
+            "directions": 4
+        },
+        {
+            "name": "harpyspeckled2",
+            "directions": 4
+        },
+        {
+            "name": "harpyundertone1",
+            "directions": 4
+        },
+        {
+            "name": "harpyundertone2",
+            "directions": 4
+        },
+        {
+            "name": "harpywingtip1",
+            "directions": 4
+        },
+        {
+            "name": "harpywingtip2",
+            "directions": 4
+        }
+    ]
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,3 +25,4 @@ private void OnShutdown(EntityUid uid, HarpySingerComponent component, Component
		}
		}
		}