Merge branch 'master' into The-Great-Massening-Guns

Simple-Station · Jun 20, 2024 · 5bc2f59 · 5bc2f59
2 parents 69ec1a8 + 896627d
commit 5bc2f59
Show file tree

Hide file tree

Showing 38 changed files with 77 additions and 32 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4192,3 +4192,9 @@ Entries:
         start of every shift
   id: 6123
   time: '2024-06-17T21:42:13.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: Peacock Tails have been added for Harpies
+  id: 6124
+  time: '2024-06-20T22:07:29.0000000+00:00'
diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/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

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/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
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/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" ]
@@ -127,6 +126,12 @@
     templateId: digitigrade
   - type: HarpyVisuals
   - type: UltraVision
+  - type: Tag
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
+    - ShoesRequiredStepTriggerImmune
   - type: LanguageSpeaker
     speaks:
     - GalacticCommon
@@ -147,6 +152,7 @@
     species: Harpy
   - type: Inventory
     speciesId: harpy
+    templateId: digitigrade
   - type: Sprite
     scale: 0.9, 0.9
     layers:
@@ -167,7 +173,6 @@
       - map: ["enum.HumanoidVisualLayers.RHand"]
       - map: [ "id" ]
       - map: [ "gloves" ]
-      - map: [ "shoes" ]
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]

diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml b/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

diff --git a/...omization/Harpy/harpy_chest.rsi/lower.png → ...omization/Harpy/harpy_chest.rsi/lower.png b/...omization/Harpy/harpy_chest.rsi/lower.png → ...omization/Harpy/harpy_chest.rsi/lower.png
diff --git a/...omization/Harpy/harpy_chest.rsi/meta.json → ...omization/Harpy/harpy_chest.rsi/meta.json b/...omization/Harpy/harpy_chest.rsi/meta.json → ...omization/Harpy/harpy_chest.rsi/meta.json
diff --git a/...omization/Harpy/harpy_chest.rsi/upper.png → ...omization/Harpy/harpy_chest.rsi/upper.png b/...omization/Harpy/harpy_chest.rsi/upper.png → ...omization/Harpy/harpy_chest.rsi/upper.png
diff --git a/...rpy/harpy_ears.rsi/harpy_ears_default.png → ...rpy/harpy_ears.rsi/harpy_ears_default.png b/...rpy/harpy_ears.rsi/harpy_ears_default.png → ...rpy/harpy_ears.rsi/harpy_ears_default.png
diff --git a/...tomization/Harpy/harpy_ears.rsi/meta.json → ...tomization/Harpy/harpy_ears.rsi/meta.json b/...tomization/Harpy/harpy_ears.rsi/meta.json → ...tomization/Harpy/harpy_ears.rsi/meta.json
diff --git a/...stomization/Harpy/harpy_legs.rsi/feet.png → ...stomization/Harpy/harpy_legs.rsi/feet.png b/...stomization/Harpy/harpy_legs.rsi/feet.png → ...stomization/Harpy/harpy_legs.rsi/feet.png
diff --git a/...tomization/Harpy/harpy_legs.rsi/meta.json → ...tomization/Harpy/harpy_legs.rsi/meta.json b/...tomization/Harpy/harpy_legs.rsi/meta.json → ...tomization/Harpy/harpy_legs.rsi/meta.json
diff --git a/...omization/Harpy/harpy_legs.rsi/talons.png → ...omization/Harpy/harpy_legs.rsi/talons.png b/...omization/Harpy/harpy_legs.rsi/talons.png → ...omization/Harpy/harpy_legs.rsi/talons.png
diff --git a/...omization/Harpy/harpy_legs.rsi/thighs.png → ...omization/Harpy/harpy_legs.rsi/thighs.png b/...omization/Harpy/harpy_legs.rsi/thighs.png → ...omization/Harpy/harpy_legs.rsi/thighs.png
diff --git a/...omization/Harpy/harpy_tails.rsi/meta.json → ...omization/Harpy/harpy_tails.rsi/meta.json b/...omization/Harpy/harpy_tails.rsi/meta.json → ...omization/Harpy/harpy_tails.rsi/meta.json
diff --git a/...on/Harpy/harpy_tails.rsi/phoenix_tail.png → ...on/Harpy/harpy_tails.rsi/phoenix_tail.png b/...on/Harpy/harpy_tails.rsi/phoenix_tail.png → ...on/Harpy/harpy_tails.rsi/phoenix_tail.png
diff --git a/...on/Harpy/harpy_tails.rsi/rooster_tail.png → ...on/Harpy/harpy_tails.rsi/rooster_tail.png b/...on/Harpy/harpy_tails.rsi/rooster_tail.png → ...on/Harpy/harpy_tails.rsi/rooster_tail.png
diff --git a/...n/Harpy/harpy_tailsx72.rsi/finch_tail.png → ...Harpy/harpy_tails36x36.rsi/finch_tail.png b/...n/Harpy/harpy_tailsx72.rsi/finch_tail.png → ...Harpy/harpy_tails36x36.rsi/finch_tail.png
diff --git a/...zation/Harpy/harpy_tailsx72.rsi/meta.json → ...tion/Harpy/harpy_tails36x36.rsi/meta.json b/...zation/Harpy/harpy_tailsx72.rsi/meta.json → ...tion/Harpy/harpy_tails36x36.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json b/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
+        }
+    ]
+}
diff --git a/...es/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png b/...es/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png
diff --git a/...extures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png b/...extures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png
diff --git a/...s/Customization/Harpy/harpy_wingcover.png → ...s/Customization/Harpy/harpy_wingcover.png b/...s/Customization/Harpy/harpy_wingcover.png → ...s/Customization/Harpy/harpy_wingcover.png
diff --git a/...on/Harpy/harpy_wings.rsi/classicharpy.png → ...on/Harpy/harpy_wings.rsi/classicharpy.png b/...on/Harpy/harpy_wings.rsi/classicharpy.png → ...on/Harpy/harpy_wings.rsi/classicharpy.png
diff --git a/...omization/Harpy/harpy_wings.rsi/harpy.png → ...omization/Harpy/harpy_wings.rsi/harpy.png b/...omization/Harpy/harpy_wings.rsi/harpy.png → ...omization/Harpy/harpy_wings.rsi/harpy.png
diff --git a/...ion/Harpy/harpy_wings.rsi/harpy2tone1.png → ...ion/Harpy/harpy_wings.rsi/harpy2tone1.png b/...ion/Harpy/harpy_wings.rsi/harpy2tone1.png → ...ion/Harpy/harpy_wings.rsi/harpy2tone1.png
diff --git a/...ion/Harpy/harpy_wings.rsi/harpy2tone2.png → ...ion/Harpy/harpy_wings.rsi/harpy2tone2.png b/...ion/Harpy/harpy_wings.rsi/harpy2tone2.png → ...ion/Harpy/harpy_wings.rsi/harpy2tone2.png
diff --git a/...ion/Harpy/harpy_wings.rsi/harpy3tone1.png → ...ion/Harpy/harpy_wings.rsi/harpy3tone1.png b/...ion/Harpy/harpy_wings.rsi/harpy3tone1.png → ...ion/Harpy/harpy_wings.rsi/harpy3tone1.png
diff --git a/...ion/Harpy/harpy_wings.rsi/harpy3tone2.png → ...ion/Harpy/harpy_wings.rsi/harpy3tone2.png b/...ion/Harpy/harpy_wings.rsi/harpy3tone2.png → ...ion/Harpy/harpy_wings.rsi/harpy3tone2.png
diff --git a/...ion/Harpy/harpy_wings.rsi/harpy3tone3.png → ...ion/Harpy/harpy_wings.rsi/harpy3tone3.png b/...ion/Harpy/harpy_wings.rsi/harpy3tone3.png → ...ion/Harpy/harpy_wings.rsi/harpy3tone3.png
diff --git a/...ion/Harpy/harpy_wings.rsi/harpyfolded.png → ...ion/Harpy/harpy_wings.rsi/harpyfolded.png b/...ion/Harpy/harpy_wings.rsi/harpyfolded.png → ...ion/Harpy/harpy_wings.rsi/harpyfolded.png
diff --git a/.../Harpy/harpy_wings.rsi/harpyspeckled1.png → .../Harpy/harpy_wings.rsi/harpyspeckled1.png b/.../Harpy/harpy_wings.rsi/harpyspeckled1.png → .../Harpy/harpy_wings.rsi/harpyspeckled1.png
diff --git a/.../Harpy/harpy_wings.rsi/harpyspeckled2.png → .../Harpy/harpy_wings.rsi/harpyspeckled2.png b/.../Harpy/harpy_wings.rsi/harpyspeckled2.png → .../Harpy/harpy_wings.rsi/harpyspeckled2.png
diff --git a/...Harpy/harpy_wings.rsi/harpyundertone1.png → ...Harpy/harpy_wings.rsi/harpyundertone1.png b/...Harpy/harpy_wings.rsi/harpyundertone1.png → ...Harpy/harpy_wings.rsi/harpyundertone1.png
diff --git a/...Harpy/harpy_wings.rsi/harpyundertone2.png → ...Harpy/harpy_wings.rsi/harpyundertone2.png b/...Harpy/harpy_wings.rsi/harpyundertone2.png → ...Harpy/harpy_wings.rsi/harpyundertone2.png
diff --git a/...n/Harpy/harpy_wings.rsi/harpywingtip1.png → ...n/Harpy/harpy_wings.rsi/harpywingtip1.png b/...n/Harpy/harpy_wings.rsi/harpywingtip1.png → ...n/Harpy/harpy_wings.rsi/harpywingtip1.png
diff --git a/...n/Harpy/harpy_wings.rsi/harpywingtip2.png → ...n/Harpy/harpy_wings.rsi/harpywingtip2.png b/...n/Harpy/harpy_wings.rsi/harpywingtip2.png → ...n/Harpy/harpy_wings.rsi/harpywingtip2.png
diff --git a/...omization/Harpy/harpy_wings.rsi/meta.json → ...omization/Harpy/harpy_wings.rsi/meta.json b/...omization/Harpy/harpy_wings.rsi/meta.json → ...omization/Harpy/harpy_wings.rsi/meta.json