Merge branch 'harpy-height' of https://github.com/Malfaltto/Delta-v into harpy-height

This commit is contained in:
Malfaltto 2026-06-30 21:55:35 -05:00
commit 038e4354f3
1 changed files with 0 additions and 4 deletions

View File

@ -6,9 +6,6 @@
dollPrototype: AppearanceHarpy
skinColoration: HumanToned
baseScale: "0.9, 0.9"
<<<<<<< HEAD
minHeight: 0.90
=======
# Delta V Start - Due to the actual real world variance in avian size, I changed the range to be slightly wider, allowing for much larger, and smaller, Harpies, without going into territory deemed unfair.
minHeight: 0.85
maxHeight: 1.35
@ -150,4 +147,3 @@
baseSprite:
sprite: _DV/Mobs/Species/Harpy/parts.rsi
state: r_foot
>>>>>>> e7abb05184 (Update harpy.yml)