Harpy Peacock Tail (Simple-Station#428)

Courtesy of @StillIcarus

This adds a new Peacock tail marking to Harpies. I'm also taking this
time to update them to the recent DeltaV changes to the birbs.

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/4f776006-700e-4d92-802c-03e6dd201491)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/5fd143ab-069f-4d1c-b5e0-ee982a95b4b6)

The backside is semi cursed, but that's something I can't do within the
scope of this PR due to sprite system limitations that Death has planned
improvements for. Just ignore them. :)

Have a birb as consolation.

![faridaiscute](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/09373a57-f32f-48eb-b52b-6d12143f62ff)

:cl: VMSolidus
- add: Peacock Tails have been added for Harpies

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>

Resources/Locale/en-US/deltav/markings/harpy.ftl

@@ -40,6 +40,10 @@ marking-HarpyTailRooster-rooster_tail = Tail
 marking-HarpyTailFinch = Finch Tail
 marking-HarpyTailFinch-finch_tail = Tail
 
+marking-HarpyTailPeacock = Peacock Tail
+marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
+marking-HarpyTailPeacock-peacock_tail_eyes = Eyes
+
 marking-HarpyChestDefault = Wing & Groin Under-Clothes
 marking-HarpyChestDefault-upper = Wing Under-Clothes
 marking-HarpyChestDefault-lower = Groin Under-Clothes

Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml

@@ -15,7 +15,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy
 
 - type: marking
@@ -32,7 +32,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: classicharpy
 
 - type: marking
@@ -49,7 +49,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyfolded
 
 - type: marking
@@ -66,7 +66,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_ears.rsi
       state: harpy_ears_default
 
 - type: marking
@@ -83,7 +83,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: phoenix_tail
 
 - type: marking
@@ -99,7 +99,7 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: rooster_tail
 
 
@@ -116,18 +116,36 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails36x36.rsi
       state: finch_tail
 
+- type: marking
+  id: HarpyTailPeacock
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Harpy]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SimpleColoring
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
+      state: peacock_tail_feathers
+    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
+      state: peacock_tail_eyes
+
 - type: marking
   id: HarpyWing2ToneClassic
   bodyPart: RArm
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy2tone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy2tone2
 
 - type: marking
@@ -136,11 +154,11 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone2
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone3
 
 - type: marking
@@ -149,9 +167,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyspeckled1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyspeckled2
 
 - type: marking
@@ -160,9 +178,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyundertone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyundertone2
 
 - type: marking
@@ -171,9 +189,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpywingtip1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpywingtip2
 
 - type: marking
@@ -190,9 +208,9 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
       state: upper
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
       state: lower
 
 - type: marking
@@ -209,7 +227,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: thighs
 
 - type: marking
@@ -223,7 +241,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: feet
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: talons

Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml

@@ -54,7 +54,6 @@
         visible: false
       - map: [ "id" ]
       - map: [ "gloves" ]
-      - map: [ "shoes" ]
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]
@@ -122,12 +121,25 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.5
     baseSprintSpeed: 5.0
-  - type: Inventory 
+  - type: Inventory
     speciesId: harpy
     templateId: digitigrade
   - type: HarpyVisuals
   - type: UltraVision
-
+  - type: Tag
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
+    - ShoesRequiredStepTriggerImmune
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - SolCommon
+    understands:
+    - GalacticCommon
+    - SolCommon
+
 - type: entity
   save: false
   name: Urist McHands
@@ -138,8 +150,9 @@
   components:
   - type: HumanoidAppearance
     species: Harpy
-  - type: Inventory 
+  - type: Inventory
     speciesId: harpy
+    templateId: digitigrade
   - type: Sprite
     scale: 0.9, 0.9
     layers:
@@ -160,7 +173,6 @@
       - map: ["enum.HumanoidVisualLayers.RHand"]
       - map: [ "id" ]
       - map: [ "gloves" ]
-      - map: [ "shoes" ]
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]

Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml

@@ -1,13 +1,6 @@
 - 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

Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Peacock by stillxicarus (Discord)",
+    "size": {
+        "x": 48,
+        "y": 48
+    },
+    "states": [
+        {
+            "name": "peacock_tail_feathers",
+            "directions": 4
+        },
+        {
+            "name": "peacock_tail_eyes",
+            "directions": 4
+        }
+    ]
+}