From 287224e62b790fbb8954e0142e4a28db0c153fa3 Mon Sep 17 00:00:00 2001
From: evilexecutive <evilexecutive@gmail.com>
Date: Sat, 14 Oct 2023 18:21:26 -0400
Subject: [PATCH 01/12] Harpy Customization ExPac 1

---
 .../Locale/en-US/deltav/markings/harpy.ftl    |  10 ++-
 .../Mobs/Customization/Markings/harpy.yml     |  68 +++++++++++++++---
 .../harpy_tails.rsi/harpy_tail_swallow.png    | Bin 317 -> 0 bytes
 .../Harpy/harpy_tails.rsi/meta.json           |   4 --
 .../Harpy/harpy_wings.rsi/harpy.png           | Bin 0 -> 1365 bytes
 .../Harpy/harpy_wings.rsi/harpy2tone1.png     | Bin 0 -> 813 bytes
 .../Harpy/harpy_wings.rsi/harpy2tone2.png     | Bin 0 -> 1015 bytes
 .../Harpy/harpy_wings.rsi/harpy3tone1.png     | Bin 0 -> 820 bytes
 .../Harpy/harpy_wings.rsi/harpy3tone2.png     | Bin 0 -> 493 bytes
 .../Harpy/harpy_wings.rsi/harpy3tone3.png     | Bin 0 -> 791 bytes
 .../Harpy/harpy_wings.rsi/harpyspeckled1.png  | Bin 0 -> 1321 bytes
 .../Harpy/harpy_wings.rsi/harpyspeckled2.png  | Bin 0 -> 749 bytes
 .../Harpy/harpy_wings.rsi/harpyundertone1.png | Bin 0 -> 1298 bytes
 .../Harpy/harpy_wings.rsi/harpyundertone2.png | Bin 0 -> 356 bytes
 .../Harpy/harpy_wings.rsi/harpywingtip1.png   | Bin 0 -> 1132 bytes
 .../Harpy/harpy_wings.rsi/harpywingtip2.png   | Bin 0 -> 791 bytes
 .../Harpy/harpy_wings.rsi/meta.json           |  59 +++++++++++++++
 .../Harpy/harpy_wings_default.rsi/harpy.png   | Bin 3165 -> 0 bytes
 .../Harpy/harpy_wings_default.rsi/meta.json   |  15 ----
 19 files changed, 125 insertions(+), 31 deletions(-)
 delete 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_wings.rsi/harpy.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
 delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi/harpy.png
 delete 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
index 302a24e06fb..d6ce32032b1 100644
--- a/Resources/Locale/en-US/deltav/markings/harpy.ftl
+++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl
@@ -1,5 +1,11 @@
 marking-HarpyWingDefault = Basic Wings
+marking-HarpyWing2Tone = Two Tone Wings
+marking-HarpyWing3Tone = Three Tone Wings
+marking-HarpyWingSpeckled = Speckled Wings
+marking-HarpyWingUndertone = Wings with Undertone
+marking-HarpyWingTips = Wings with Feather Tips
+
 marking-HarpyEarsDefault = Feather Tufts
-marking-HarpyTailSwallow = Swallow Tail
+
 marking-HarpyTailPhoenix = Phoenix Tail
-marking-HarpyTailRooster = Rooster Tail
\ No newline at end of file
+marking-HarpyTailRooster = Rooster Tail
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
index e0f37587754..354a969190d 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
@@ -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
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
deleted file mode 100644
index 655f973255e559557253e1854a8819e277c48efd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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|<QEJS|IhGy8(%O`fV03O
zvY3H^?+6GpPSxg<1`00oba4!caDO}PG+(O%kIU}||M&k4Vr+DCy%Ljbl%CjK=y#)6
zB#()ag^fi(V!p7z?*sE$kG$dS=e9VX`;JTJJ&^ThXLCddTa$B$iAJ`a>NA#Uv2s&2
z4~hvmBsefMGBUEbDKB`Om7no?<GPJizc1Z#z1<dPzWUwgrYw!qF8j=%cplpL`?8(d
zKa~wrQlzBr&pmfrbjg;Qot^9dGJbs>S}=7xtKuJqear05H*ObP0CX{fr>mdKI;Vst
E00xD5+W-In

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
index 2b469d9ee1a..3738f7e0c63 100644
--- a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
@@ -7,10 +7,6 @@
         "y": 32
     },
     "states": [
-        {
-            "name": "harpy_tail_swallow",
-            "directions": 4
-        },
         {
             "name": "phoenix_tail",
             "directions": 4
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce932f0df5f3627c5a80937ab9f05092f9ed96e3
GIT binary patch
literal 1365
zcmV-b1*-aqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T<mc!T}X1N`L?W1nNmdK~#8N?V7Pp
z8$l3;O(LZOg-Ad}gF6Z;3Ob;qq~Z;D0Scahf*0TosE}xAp`)Oppo4}Ah=c?MO6A<Y
z+5a*(H@mlIpKYS-Cpo^`+nxRY*}3%*yO+siGMP*!lgTu5d3ia&%b!+=UF(9B_`_(J
z@$Zc=@ayZVJKx>iEytdnow;lC^YiX}YilbxZVIuv$*>x}`1dIH_xFS4<z;^s2mR3B
zpN@<+Z&8>p&9Yx=B{XJ<W*#3OlUIPr>i7Fet6+h7F(<*?*Vos*qobo>%)`UO!N$f$
zSp@)EVmg8q00GiGvCIS6&i*n+8(>7vNnj4h6_@b31aT10pVlxFAO}zgSD!1bVLSUt
z12F*_^xfIn@n=<-<l^0o7g`*|3u&k&03G-D_uVl}zz|Kbv~&_=`2&t&5)dyX2{bSF
z8##X}dJN))l2Azi1%TVzTNebT_)0<c$9Tj6u~i_rzb`H>YE`Gvw^isi<9NhFTx<WR
zBtQy)fwi?Ye`Po@9&us<G^iG=7+x4Ffl=)4+|;-i;2iBb5g5-{h-*<36v`${$Q6<I
zo4h4BsYPrzmLFRjuPXtuW1sJcA^QRy3&<GdfhB-wA=YN2_kmCh5Ho=V;BA8nl8I+U
zT8ZSsaV!@?#<Iqlf#e_{MTB-*Ad|oZGzlQm0OtjA?zR;m7eU6AI?6o&0%#r`rFjxF
z59D=@V=Tnw9PWYu!qFdn@USCEH4ktd{Q$=i#6^6}Bdgs7WCI4FquelL0-6MX(5-ZG
za^fCTDA0<flLNt|Dftq)CvhQ(uENTR7SPr_2_*qow}BK4D4GdqW1cXkjzt*L{WDDg
zx*r*3ZW4=KCSY0ufR4=y>|$=BH6+~vlN3P4F*k{6C=aG30LZz!oL2)KrUnSWi$cc*
z;&U$FRM{{mNjdM-1!OXrOeT}bWHOn|6lndY=jrKb`A5v&-rm^$bZx^Znp$<%f5AOH
zJxx6cFu%04<j?-l=Kn9vZ-+yyuCDqc8;Ie{H+4p8>?Vzx<V<1p-`?JOb8~aP<!`1T
zO0Pnf)zK7RRwgy3RzY$FAh7%a0t5g{96(#sYNe18pIQJkLTf6)1Td?3KR-WrKRvm-
zyK~nF+AVRD0&_!yKXpJOw4z;la2E}tWx|2DuND>-dRJFh?u(9_n;SPdzx0q_ph((m
zMlnJL<ou|D_4Rdkyt%pAdwF>&7c8cuRsqk?&u+!#q%aRyT9~NGy#7XL6hg5$H?Bhy
zphjv2@B&Zp=9@~)%;=5`_VDoF-Ys+@x>|jrt00!(m6a9ujw+BWE-uzInR@^_;)O3t
zVIIaq=3!i$mzz>o=$O{LgnFSJ9_Ytkt`Pkc`1ts6@62cl5IT;BBgAZzSZbz+5M~1K
z@q*X(_O?6c>Nh2#>$10Knu8jt86N1zH7IJq<oz!<5}<DbS%Q-=FOhqK-VgLb$-O||
z3PI6>0)JRD4y5^Um3<7XsC)*oHbt3;nF4=U!E8)5Kj~Eu!D<*L36(tnKV;;Sm1P`!
zHuHd5VxI~C-t><(OB2W<pZDM2-+gO6=w~u+5qn;kot<?bi}H^p{KE2k@u>T=IR1(T
zaD061e$^?1eRks-tsN_WaB$#T9E0Lf`NvGL>;EcFzUkeO0sb}Pnvf6cu{iVp(d+#N
Xk>Dg~@AHrF00000NkvXXu0mjfH-m8O

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2030ff8cf2dc36c1f600ec256d459b11b938e46a
GIT binary patch
literal 813
zcmV+|1JeA7P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940>Vi|K~#8N?V2&J
z;y?_Bd3%CKMMcFWC^-QV6=$SE;slgjf{Kc6#Rb^>*)cMHnT$O%N!XP?DGKA6*uOna
z&<k(oIF92uj^j9visSM4#1V!qUA7_Ui<7J2S2%w>eaSU*U*Ti#x-LuwAm_W??iCQw
zIA;eeTrQU%u|Z>d!j5?><__o*0Alu<tk>)I%y*na^A^+vpxuq_a%#Q?RAlUUYY^mY
zLh=Hh5CYJc2je!mK77o^>d(49+5vEc15W4&Q@!x@<ReU(iCufWUf=9;OlV?93t&k)
zMyU^ZEfPJS&(GCr)!Lf`+cU<n%R*>kXMGFADB0~8Jc--wHrs4AuW>W?iU&L932ouc
z-vU57*9I$Pxm-ru9d^uHF@Fohk|p~PT|i)msr@Ce^A6Br>VVWv577x!(D{7+*8W{!
z9_xU1BUA;z1BM)@z&flC!y<SRspJX1PE&+r0Vo-(fLcWW*3PQdiKw8ql_VwCg3{|j
zk&h__)QC-F`I=Hd&Dey==ad3!$CV`gPcFc59LI4S$8j9T83*&Lqr>6w`ipMA-`9Ed
zR7i;?(_;Ca?|#2eUIZk+SS-TmFWUE)!1P)?<rre<2&QUieOr<T=H266K*1nN?n2G(
zNcr#5q{Y+$90&ki;s9)^-O`}(Pg-&?6+k`%PN!3+xUoQNXb8g=>+ccf4nT{c;t0Oo
zZom3kuEs6U=L4~!0a~ER+Wx>)fXCy}o*{~Y#VVfjOKpspFNzH<R4CG@rFe%3S%{q7
z=wm4V*$+Vi!lby8hf)mbvny^6#RZT+XpMVc0-r+^wrT-tw|y72V-z{#EjUK<oLaH7
zJAexqqBT?Sm^GdSCJ=D+pgoML=hKoWa&;x|9qDxJd)<mvFaE>wyIJ%*jNjnSK0R@X
rMmus3AAbS|+{wSn|B{C@471rESxqjPYMgxi00000NkvXXu0mjf!`^oZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8825513a346a4a108875f652fbb26a6d581951e
GIT binary patch
literal 1015
zcmV<T0|@+yP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1B^*TK~#8N?V7!A
zA~6(&hb^`vQi`ObN&3`ukTOM(cnMyCXUHq$4N^r41uf}P(<e<jC?Y|DR$48~vF4yV
z#xu70n<2TMG}vS8d(XZ80Y)T>q9}@@D2n1|G#V{&rMDT1-rENu_7AF|OaU==V>SFr
z%R=7Y-<OR>BfTpI{m?(X-5CbcZntZu!2|n+Cc&Ek2J`v(=@o(Z(GTpJ1dNZFNf#LJ
z(~+A143xpgAd}z|;G*B}FJpb?0Xwjl-frMbfE+*}u}e?}P$a+xeedq>(!2ctd%+se
zkuzs6LEn;e^{1^60qDaqD1H8X&<5?fG-PHK9gr;?WY^c%&cmc=CFJ#m0IZ1NaF{$i
zJmiiC)Br+PT@loj=X;|;3P2+4y%>`KIX)zKfMlgrGj^9GK#%<N;-pG88l(V8s2JO+
z#3g{p<Z(Qcw@ngg&$b1my>-PUfW!!~9g{o(Hkg3%cx>u7H#fnFx8X!cTfr+p4g#?v
z=p6V25UxD*r(dvZ0*JILb*w8z0zhm6P=*Kq?Em%kmAt*ZCB0tHw1c9g`H<WB@$oTf
zHk--$`MJ4gJm#fHz`kZ6Pk=-U2D=1Ld^R&TcIRz_Cw3BmE2!t^=ZxRHm9h<TWlOr<
zuCZ-i$`nA~a@&D@_$KzmLd!Y<WeETjLD+AfzDba6bh5?n3!m*n`X+@w$`o)6-^A&w
zOac4^IyP&+r3+9LMNt$*Q4~c{lxj1XOe+5qHdbTMKSTh2zvGd4)q%#CXAQv#n9XM9
zxqj7wMrhp`W)bDf%ggc<mOp`3XqGXUH)6p+TrddGCZFdW^I4(`+du2j3eD7S-ppa+
z894@GADx|@r7cO)YPC#RTVV%$h-dgQxb$$cUSD5L8{ihcyu8flb&9u_`^CkDDL+0w
zOzGm-iLe8gTwPt6ayp%wlGwq6Lebbq_xJae3f#t*h{0fxbUK|}jfI~Ai^al}%;+gW
z&5R)rX9Av{o|d?7Z*R>#SHLMGf*PqAF)$v}V6m|@<o@U0C-zn-d-)T48`u*i&w`*s
z5bz`gt}~!2!4ub6AQOR4u(X=N*?4NflWmfaIRo$?L7e=ky8;JQ4IboaV=Rcx{<r9Q
z0KPHt%ffs<Pg|=Ua0qf$)a!NgV+mjKGJpM99ejUr`0=u{^c_G<GRD>Q5AC&8<<F}8
l?fRDVok0@Ps`7(LlK&7AU4H??MVtTt002ovPDHLkV1gRY*5UvF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bd0018656735b601fb615bae53d07e90745c191
GIT binary patch
literal 820
zcmV-41Izr0P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940?A24K~#8N?U_4{
z0x=AR*}VZ36&07D<OE1moRJEN6HsyqDk>@@F2K$|J4PYoVJDs$cI8h(Y#w9(cAShh
zObo*?48t%C!(g%B?;rSd&6ZGKAEf-0YWVKHKb}-@&DdA>XL4Q$Q3A;LX0v%Z1k^5B
z0S?FGv9)_To!)$drtg7%j02j_L0kbL0U*||!D_W?Z7-M0w(YLC3ysr!4(y5U>V|^N
zjn{w`z1?msyU;P6PT5IdRR9GC!)}|%jn@EM2wno_b2YFMfXq{HIWSMF0%Ad&&*ztZ
zzfEwGz&-=GB_-K^Is8N-P;7_AV$t?D0k+?0qu);iXCc@LpnaGE<B}7YgB!%<a(PK`
zGxqd_evA{`Dr6<V56U<0x3!Z%%;)oHxuYNBQdkK<c4_rvnWcWr)7%CwSYaxEAN0Ew
zz(rI6xw4{h%?hA{jPq*4xb#hwO#lTWc?$rIB)CCvtIC~M{T6V8C=sAl3AxJik<3pf
z0Q<RQPh&nkTMDh7G<brZ<8FmF@L=)79i=ujd=o{s#uT9Gn-JL?Q-HQ#pRE1S1sH~5
z7=~dOhG7`PAiizc?RL-q=(gK!(QS=3HJU_|{X4$v^*VYI5d3U5>sr4^uJBmb;zZ6c
z#L%bfQiE$-dVeWiz0gfDMER?rSsgk1CAZgvr~+Id0EEN=^yOBI1IIpTDM6F~{|q=B
z4nc840pHNjHCv>=MTjc^C5DW{`Fg$nN|l_(7D(BEZ)kuPXp)vc5GCM#zqj8IMb2Uw
zFZrc5M$8uZh89W`Y2;G9LWG})lGRAz+SjyQZ75U$?g_0$>@ciNM)6x9Mjycg*sMA2
zW2h!TyX-?~`=~P3*S_SS<-527TmgNQW)9b9=p5=5I2_z*f<g6sTJS`vuI%3NjSjun
yrAYNA2VG;I9=K1nb{O!p`4{;waTxtDnfw5m(JF)#zg%(v0000<MNUMnLSTY%r*WkK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e431a95b43e99130a237bd7a17bacb4c00e0cc7
GIT binary patch
literal 493
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0(2Ka=y9yoB|?%liV*ROx|>eZ%AoBsd*50qKH_jw4AVlN5u3kHgS1f{&0
z-GD-z1s;*b3=DjSL74G){)!Z!C4QbRjv*25Z>JudbVPx}B{^-<|Nl<}T{8rFw{C8~
ztMyyS>2p(<mgPJBt&GwRzd{cLn(rx@w8zjvM%rb9Yjc|>r-Evq!?%qLk41kuH_i6i
z&gJk*kYNJDZn1=V7lYJ0MHBiqv#q%-7-O$;t7;dg&idEar-Xc%@a=%gj)z(^H;7K!
zS+QH$a!H=$2U*#Jy$iyZ2rpP%Etn(8Yjp5Lz!iB<qpkT#3SU#tnmR-VsF|)5KOiaf
zC6wdTB%OwtirPBcO&FK4aaDW`Vqk5wu-Cfo#de0*U#t8>uUP`KhxCW*4Ek~Mt!^xP
zDr-fg7(c|#XW(FncxN8Qx<~I98{fVQN~@Ot4r*dr$J6mI(eLQwy}ku4-B}@W+W(8Y
zx5zWH?lWPWB@nPmhWDv1+k*!S_Z*jRJlr{ln<4w}z2yy8>z<1osM`P4C}Ho;m8B0<
g|9SkEE4VLjb~?(LcaLE$Ft`~!UHx3vIVCg!0Dt4gM*si-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
new file mode 100644
index 0000000000000000000000000000000000000000..477e6873e8f1938ecbfcd2f248554d9d124b849e
GIT binary patch
literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0<1|yK~#8N?V7QU
z;xG_~!xq<pmI68&=&328q@?0ecm^JY3W<giN@{v&=%7G?0-ba^How;s4NgKFl8|I~
zJ_%ww_V}NPZA=nJ5ClOG1VIo4K`0Qr-R`cFiHNfEp^rY$FsX=FZA>PU`{8iVxn#f&
z?CGqJzyMH#PN!2*1usJFp9wHQ-QjSkbLjwk)*4VT>6JHuJsSb2vtF+==^u6@HE;p*
z`8*X7uwyO2#iq_HgxU2Caa5!s*lM*BO#?Vib9uR3I@9Si(iUC)q|=Y{%%-n^DuXmc
z*xJJg(Mc6}kY@jUQSJBpo?S0t3P}43gb6S~-R*X((xcHRu?CvT-EP-@1iVuKL01ZW
zN7aoB`2@Rw+x8N92>>+u&gZkU*=(%Vinw5H>-Bn0y<S&&8indBPXQbRD$T%~1lfPc
z&?v}4#53FGPi`7h&m^o5^~FzS(K!*+4__ld)*}E%Oh+#Oc?ken2D@}naIz+}pF9P;
zt8c>BU!DT^2JD@9{pKz}5ClOG1VIo4K@fz(Ql|g!a<3r`D2g~P7K_qF6q>mYsxU5S
z_;TX{V58r6U;cPJ-tl;>R;%ff=TCEs40rx=xj1+<*K9T)d<k?6LC{G>qtS3GE;?HZ
z?k=a(N$0*XosR_b2;esMyKkK*f%Jl?^(*u>IdHq()Un-et7Fjv!S#`5@*#}CAu*fH
zl##(;poaf`zgOijTJ))atIqXe8mv|;l^>7CKJC5&KL6o7r!4CLf}oQMz7|-o1294q
zdDw>m%^Y29hi;=Nqw_@UAmB9?zVZWos<d!l;G6lvq&FY1X`s!*^?J?pMTtB>5USOx
zdIt)dJa2R7I{xV{eE+cc(Z`I^PXIn~AKlM?_+D`nf8FzcV(*el4uYVQ!Y{^gz5tUq
Vd6(tcu%-Y2002ovPDHLkV1ld-V<`Xt

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f48d8e6538d3a9787bb79075318982b7701fd919
GIT binary patch
literal 1321
zcmV+^1=jkBP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz1inc`K~#8N?V7Dl
zBtaB~n_UeF0#GO%0*&MqP&^9Hz@wl@FjyoSfdhjA1PQ23HkqBTGKW3fuKt_pVU}!t
zN#)kht$R;ZR~HOSRVWk+g+ifFD0FjueLbPfnxAMJ8-qUam#RU5FD@>!3Dmy~0lu(4
z`G;uuF|)1Q-``JmcXw0p<KyGCD1tWqjN^y@Y-lu&j*e=1#k7BIW+(Wi&YpBSvzWcT
zy|lR3*Voj?VpGMCxXsPYBv$j%;2d~f+T^~uxv9?1&KhH$o}Nw)4-b<DSV#vGDbx`m
zAziqy#~6yok<}*aiAOZ<^Hd)MJBdZS2O)uyM0`whw0Onqi|6#**e+aytm-*xcK~8J
zW{7`$d`!oP<40hQR@)uGICcD)$9&=tug@mngIK-C)b-j8g?U;y@u>HD5I7>*cT$Bm
z{kaWj^VdnD-G?|o=F`a%v7OVC1~Sx6z}3}N#iha1RA7H1*mw!5t#SD?pE$%LZeRFG
zqNhe%r%oHGOKsYhtS(E&@pC=IA>JUgaJLfUyDPj;La0aEhT{8t>Xcm0CgiKR^tpc7
zEOC;G`r3r}82&zAeTvhD{E6jttjCM^nEQJj8%amS!SVL?HXS?aI$pYr;_-KsjAPHy
z(|r054i3^$O^z9wd_A|~rbdP)-`tv#lfwWu?pWU^=lGnaxQ=}B(M^qCoZA=Ar5MCj
ze{DTcfF@EjR-4p-`+J;L0fx_^J#_IRZi3=<B1c)o_FcU2IWb-iiN(5bZx2OtmDgj{
zV#WcVgq@eBcrh+*eB_5+G`CP}>dN7<KYpv@;&He%pzYG@VrXm$ZM!VzrB`e@jkWti
z@f5#_mFD;4%Mj2dg8s4dMu^|I39Aw?^nx9WkGv}vP$(1%g+ifFC=?1SVDKLv_z?5-
z^i=Ka?6m%c_AB`^P0!EI=@Xnj$(^5{*FMqZ`o^LypEOD1(oiC-3!?2CGv-EkJkJC4
ztL^=L>3v)X{`U4(ZES3$Hb?H{<Rr~!Oh->5#y*NMuIFSEIQ}4w3+GotxV*faP}JvR
z-lwAW7^fgU;g|yp-Y30jV2b+<Mw2H~u=<l0!j#05%TmVNfLsnN8k9%cq*XqHi3`hJ
ze$+{*q_n-zHzv9G%1>LHps}dgPedzmB33A&ipC{EZLG$}z;nrZPU>Dn)Rg-Pk-aF~
zacgU<TAM;({;7baKi08I<QL>v@Pu{I>4Iz0BCTw~%gYPhiS6y}nx<BfBxNB4@=ah&
zbuC&fWAVZ_L9iJ)UDB*IB<Fb`5SGAz^}<*@YRe?%ih87xG3waC@CvYVSOo;e6kIk6
zVjgxGD0XfW+`4983uBSm(ZG>+1*`X;Kv;ruyp)Kq!HI=`@fe5}5Bd_6wD~K5<sQ(Q
z;yqCNmKY99^2I+qJbc<^66iaG^zq(*HOh$wwD^O;q8aV1fwfT2U4k|A^O6ZbFb|An
z_x%a18rS1mDT2Pv-vxZ}anV>M`j-|jTw6|i(<Y=NF?~0F-`(B)<T&x3yuZJH9H~{l
z=kwwZi2FfnSzljIuQ=oT`}@2SKUn-P99g)EzNw`^9`L&mwX-H)BYm=eE5>(RbQ8I?
f<knpH|EQ`zEC2l!_h)~v00000NkvXXu0mjfL<^Am

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b687a2bf9f089155be7a56bf576ac56046fcef93
GIT binary patch
literal 749
zcmV<J0uud+P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T<mc!T}X1N`L?W0)k0IK~#8N?U-9`
z0x=9l*)?n83yBr55jMaMDpjRq#I4N5k7SY*M)LVdnApC4M1W?OBuSDaNs=T<$oYJ}
zmGyW$E-S!ioX>)Fndp27mdGq|tLYZ78#;{3<<b<a)!w4Fh#^go#Y9t(=RHl>@ArSc
zBW{3<R}B}?ngD2RgjRg(BsIULCU{e~8sXWsHeqe^0ozyWbC)<!GzmUu|C%XC8|h!$
z1k0!C25=!!Vf;Dr_rSEgTNokjwRkS<(2|HJEaO<nMrrm@BeioG$Mx?O2VF@#kd1_W
z?Ja<v)T#A-0!}rP(|})#xYR29wc3DVgz;d&YoT=l1uq^WC#LDv+?;}TV`Mxtjwetn
z4%Wuv2BC=B<^#*m8^8h#u(lS?z@Ou4SQ8t8jAu5Jy9OuIA;5~m@%VF9vXw}GZfbAr
zsg&eKCD<IRck&G4@C2CAx=d9bQIfq_@n`EYFM4lJAW4!WNs=T<k|aq!8@%W1eP1||
zf6M85y@o=E!(mzyUToxq9H(IwU!Kdek&TeCSVv+#9|}Y`smFF<Mk1aDav7>CgPl&N
zCjoiJ&*a%?JS~2PoD0&f893kWlvR75rwMe461DM>8**Kp15ez7n*saP!VXsK=mjh6
z<&9`Yn?CPn6m3zoyj;qPoV(%T%PRL}Wk&u204t`KS9cR2>ILGfIiq;M-}c_EL(W6<
zK~V0rm&h!jIeh8``ELpVu|nt*;U-`$tony214!OEd4_KSW7XiIIYD3xH$cm=x)JjC
z5>B67v;}gOg@^wIq=8oSCtUdmEk{|4+JyTT#P?(S!WN3Q@N&P`{DaNcvQgM_@gQiz
f=IcxP*zJA+@U9j^72-mB00000NkvXXu0mjflmAwf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a792111c50484da1fc227cfc6f2635405275079
GIT binary patch
literal 1298
zcmV+t1?~EYP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ941gA+vK~#8N?V7Pp
z<S-D1vv<;UpyMQ<qJfTrih>R(DXDk^UVwsUpx^~~11cmMTIeXKDCnS}0!~7L0$sJ2
z-{(I!nb?lK$u4_3e^QiW?2P9hkG)xzB9qBvGMP*!lWFJj@^Xm7-qr}UO)~>~ZiV7r
zUti7r?(S~&?Ah6wX`7pyGxu9tThV?~;5c$@5^4+a#h!!Q-`@|HmX_>Y81zGbd)pfn
z=%Q?EOhzoN380wA$4BSv1Ky(@{lGYqaD9F4oZ-?ogdOdvcoP5tQao`50Hj?eq0dBY
zY;2gboN)=;Q*b8W@bIt-nqoNnz7nII{bbUlzb-Jzm~mrJ_$DVr;{gP_zrSy;A%cPc
zHaXWapm^C1aL>Kt<m99{Iyy=YP$oP^U~2zb1wj1H&W^dhy}dPJAc98>vOk`O9{|6p
zmEfy3y{vr8%=f&cmH^Dq#l?l0c?eirTeB^rf#=}|{@^#Y0`v?*C_au?R#uF?6ll)4
zhg~NkrUDureA(2?!L<Yc1p7WR8F(u658t783?#v|L_<^+fQNC&&5LN8cCPPzJ~)Oo
zB@=qbfIaqIMN%aInZ*GoShrleq%E_w%PIl%1-~4_HYI~3`l<+aSK`~KoH4TqR<3<I
zg|L{iLb;+;ft(TPH)ScrmOn{d2Brd7`UukZHbqfw`1-*w{BtQ-a}c?=#8!^%C!hCG
zbE?;uEUA>zl>+s;9A)-nW>ORTtZCGlVyR-rK$iftFVg0-i+B>_W1s^iUBr`7efJ@r
zwE3zT<wgkl3?Oy`>{C36@(J-c(3ubP1$}Z1Yi`i@xEim2Dc+jKLQE1SPM0^cE_~Lw
znM@{=$z(E_OeO=8zjL3So>pIC_V)IA`_A5lE-@u_*5BZso}NBE2@t=yxM=VGkn;D-
z+D~I`tgf!wD>n#+hc)#^tnaoMHPM;E?7zLe6|=Lm*77&g2ujaFpViUkUsfh#jIDy`
z3V>tz4+sbVxPk+)war!xG5#3~K#Yhr7H<NWRh-Yy&xde)cXwyn2<)!lCI!Yu4EEN5
z7!fP%QiEx95G)fuh;=nTKVMv3U6~&`Zf<VO;QZ0U_nTbGW)#9FK#q?pSYKZ^*PEN0
z#mmb}HDRGR8Wr&T{A^}i4hr#rrG<go#Oq&#y5RH0vC)p00Apm#09v34+N`O<nHk-Y
z&K@2f%-MxbL|?N{bQOdWyu7?@&Zq*(!oor$Cg&c2jyUjxCd5OyPdtQc@p4n@3+>Z2
zE@8Zg9U7>|HrEJ#3VeKgm@_jP0|Fh#%MpC0B$hE#gAZo{@bQ9Udwbj5bN1U3(RbOq
zXd8nuGG=I?9%E26oXPbsHxi(ifh@sEh?mGcLGK58qU2tnmx4FwVTrwL2nSO9xXL~R
zW>mg|xHd(Zh(U?Htl>1qil6kX`(QPUl7!kGfPZA<o0UsAm^Sf%v4lPq0JQ0U)~rMz
zi+taIe}A{urqgK>?jrQQFf%h_J{IMdCH#lw_wrTuXL<b<25@|QZ2qfLI-7Rk8XY@k
z{@~!iS`5STRr$xD-1UEzH{bN`NC*F#aE(ug>$N!Z|4|gb0o$9Ax?qATnE(I)07*qo
IM6N<$f*f#aN&o-=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a753996b721c068ba7c405e784e1de89b24afc3
GIT binary patch
literal 356
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`212l#}z9yoB|?%liP<>l+wuLp{)IjX-0NU@d#`33(60*2q)_=14~oCO|{
z#S9F5he4R}c>anMpx{|g7srqY_qY9yLPr!hSRDWUpFN#(hty<+=#{sGYdb`&WEXs!
zB(j9zPq4$^x7!&C4~op@O+5H>`{Xm{czwDXc1$n(CE}^Wq!sq+VeymjMoFb6r%jDl
zWp6t2UgTUO^~cCD`PpffOP3%0*mYu;l7;;hv8s)nS+Q;kTeev3(>wEZ6SLU_J*`{|
zfvcCq<vf;$yb+ke(0~0;#yi%~9ik7E6dZo3tygwoIh4C^J9AU}p4d06{gr!fas6Qz
ui9D#zs>z_~!RX=0<-irh5XTkun_=T$I~KqGqhdghF?hQAxvX<aXaWFoPltT~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
new file mode 100644
index 0000000000000000000000000000000000000000..49f7e0c13539e0dc9a6cde67780511a6479d188d
GIT binary patch
literal 1132
zcmV-y1e5!TP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ941OZ7zK~#8N?U_GL
zD=`qp^Ekny04f?Nk*FvrxdIhO;S5}X8&Dx}0!nInXsCb!i3@~$#$Pm<j6LJcCh(s8
zlcJ5i>zQx<tQWGAPN&o9bUK|*$LIe3eu_^XE>Jr+1`+#1H2ld&7aIQf_(<dP^Yi)I
z+uPf8ZhLz>jnB@`!geFne3PLXw(`*>YH;k}0c<jOi&^k<pSZ3?LpTAbLa72A<9uri
zMxf1yhX=Fzv$-keaUQg22qi!ov;+V-KV}l7t<%%fbd(jB@H~iWFbzp)NVcGr1m1&S
zti3=60sp1sOQ3`Pfv2I`0T2Mk44#H%uz+Kp=bC60EM(&8KZ;!AX(%QDLBR-u;wOT<
z9_w|oqSQ9Nr>Ca{n|e&JesBjMfaBxiJQ@bpM-!((P<k!qP|?G~!xYpkx#@^8=5->l
zzLXqN&5m6B^769Kit>JxRfg03{rx=p7MH(<p<nm}^b6ayiXsW}T0ku&9p<FYnif*q
z1hr!_G!ZiK>`2QNH9tN+rZEfQ`896=EYb^W!2{0oI%3(1po;*IjFK(PvrrPtj-<E;
zaG^BnJ%;3YuJZ&~$ThO1y$ucL*@3bUuy=WRY3f)?04}sd)3AqiT}^-mtIT!=UhqU-
z$Mvvxb#-N~FB*ktS^cO0AfLUF`%r?tg!eiF@H)?edy=$e*;(oUEMy0ujqqs+9^iVe
z1+XWd6g9>O9&jD)(5`05ID=nR0MJ#4b^_O};+qVzg+<Ydd9>OZ(>H0d`I7?1_N#I2
z|G0oor_<?lI-O3Z)9Gx6<{unxZf@rP(Oq0zto(z;7_6eH>0<q!?e+Eb$CH5I_xASk
z=$n?G@QOc+TX=>chMzn&8d2M=zh5?2Pj&&FL6ok-nBC#ow=_j*>HrA@081ReoL8*~
z5&P6Kgr)@OJ>c%{&J?#P;2Rq9FrhVigcC5Gfg@gYAmea;bab@z5>ztAEl{%o-_QUp
z&_pfN8ljp1WD_46{QUe(^Cu@Kb7$5INl;5nD<xa>jq}h1s1cf}KTQ;HEA;mEHr?6T
zN#CEJpVQGoC!%#T^3Z|Q5`1uQkdE)~?~~o#-Kq}v7Jvaz3Lb&$;8)p{N@$ywUjnVr
z>;(@7KLtua=sNy5g3Wa#)=dEJCB83YYn2$g?JYbX)CkQW4JuTPX#@H;kS(~0;3aZT
z(EEWd6mEz7b%|;RU?D)@wcyv$njX@p-V3NV%dZy3ts2{3LWi5KdI@%e^<?l~$rn4I
zbPxTu-~qMhP5_9(Dk3q1kPEcY-xRn-?e7Jv8@6T({^suq{NZzbeVs0r!6WeB9z4)G
y5d&gDOo%N{Cv@x!Ad@<q|04fO9G&$rnS22i{4AA2=%PLV0000<MNUMnLSTZlRuxMC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
new file mode 100644
index 0000000000000000000000000000000000000000..bde6c006920aa1e983bb119eb280e74c37a7abb8
GIT binary patch
literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0<1|yK~#8N?V3G~
z!Y~kp!>+U?5)B;<bQIK-P*PHH6wbg=sF1h-l++Y-RCF{*G-#!j*gVS<c^%ut`N5E#
zPYRhh_V|s*4k09B7=~dOhG7_nv2i>e@7Uy_6Q8<S*lxFXZ1OM@K5ZIuZ-s*C^?DEM
z5_#I_z{lxy682~`^7cam(CKuXIzHq+g_=p<K&Zaz!-x5NUMP4#?cfLgM4<uW0H_V}
zW>IbD5}<>+lgUKbd4ngYJ^W?XfQorDXM%iX5r8_Fx@GlEz#sfR)DT=i3~9h7iwZ%$
zvh*z=0rIdEd<0;ysz`v%XKIb974xotm8|~MK`*-YP1yV=MkoO~7_j|*FYM`bT3E+w
zwG#af1_NUPQU%WzK+sG<-;e70LNUQFP<<yxC;@<G$K`T~cDr4)SS(8GTLsBzwOYca
zStveK0cB*}hDm@5B>|M30BNTD{y7LC0MIf4RVP52Nk8HvqyQ?jEsrvxL|{240}x68
z&<C5&SD_)3Z&ad+W%I~)m3<S=K0*q3M&E?7uaE-N8>DBF^c!3N!!QiPFbu;m48y!O
z=kxjHf5Q4|w7wspgWvCXX8-CyqtCO3%mZ+}UZde~D34wjXoS|n&?sWRUa#-(F#QQ=
zg=RGdal(M}@iR5-_xn-1-LC9$c@<y~4u^xVU4O==PM{&yQM1{s<X_?tAd$3$^+Xy2
zRHys9WnQOHELcb2S&z)i1eyV2kVQtE-vYPWP3*hfuGqg5q?ux{VVn}n<x-5=cs#Df
z64-1u!k*1$saR44bz1*~D<*4zSU=K?8Zpv*E3(93EUZKDgjXzhmyfRevZyv7Cd8({
zub7O8>t>-Y;98*H<cW{?#815Ygk9I*3FU%#k7NC4#0B5+!B^b_*HOP2nEy)@{Q`_Z
Vb=@)j<=g-O002ovPDHLkV1ki}YWDyD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
new file mode 100644
index 00000000000..0785ff1aaa6
--- /dev/null
+++ b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
@@ -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
+        }
+    ]
+}
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
deleted file mode 100644
index c95611d4daef0dd33a42ed092255aa537ddd33ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3165
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

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi/meta.json
deleted file mode 100644
index 896237c4b3d..00000000000
--- a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings_default.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 64,
-        "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",
-    "states": [
-        {
-            "name": "harpy",
-            "directions": 4
-        }
-    ]
-}

From 0811158125b5d65627c26f27df7ae2694fa72e57 Mon Sep 17 00:00:00 2001
From: evilexecutive <evilexecutive@gmail.com>
Date: Sat, 14 Oct 2023 18:39:44 -0400
Subject: [PATCH 02/12] Update meta.json

---
 .../DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 3738f7e0c63..b795894cae1 100644
--- a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "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

From 8fb539e843fbad99afaadcc0aae25bc5381f12de Mon Sep 17 00:00:00 2001
From: evilexecutive <evilexecutive@gmail.com>
Date: Sun, 15 Oct 2023 03:09:12 -0400
Subject: [PATCH 03/12] Holy fuck I found out swappable instrument works on
 them.

---
 .../Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index d9fdeca5afb..d2dfc9fbb04 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -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

From 2ca558df4bd66ef8836cb6ba434783d3657264c9 Mon Sep 17 00:00:00 2001
From: evilexecutive <evilexecutive@gmail.com>
Date: Sun, 15 Oct 2023 12:18:53 -0400
Subject: [PATCH 04/12] Fixing a bug where dead harpies can sing

---
 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 d2dfc9fbb04..1a88f172059 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -161,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

From ec129d4a48142d0f54a270f357867be3bb4de934 Mon Sep 17 00:00:00 2001
From: evilexecutive <evilexecutive@gmail.com>
Date: Sun, 15 Oct 2023 13:07:03 -0400
Subject: [PATCH 05/12] Review Changes

Also I remembered to add Vulpakin mimicry
---
 .../Locale/en-US/deltav/markings/harpy.ftl    | 23 ++++++++++++++++++-
 .../DeltaV/Voice/speech_emote_sounds.yml      |  6 +++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl
index d6ce32032b1..b0247193af9 100644
--- a/Resources/Locale/en-US/deltav/markings/harpy.ftl
+++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl
@@ -1,11 +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 Colors
+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 Colors
+marking-HarpyWingTips-harpywingtip2 = Feathertips
 
 marking-HarpyEarsDefault = Feather Tufts
+marking-HarpyEarsDefault-harpy_ears_default = Tufts
+
+marking-HarpyTailPhoenix = Basic Tail
+marking-HarpyTailPhoenix-phoenix_tail = Tail
 
-marking-HarpyTailPhoenix = Phoenix Tail
 marking-HarpyTailRooster = Rooster Tail
+marking-HarpyTailRooster-rooster_tail = Tail
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index d1b5d824a75..9a842d5e834 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -52,6 +52,12 @@
       collection: HarpyCaws
     Chirp:
       collection: HarpyChirps
+    Snarl:
+      collection: VulpakinSnarls
+    Bark:
+      collection: VulpakinBarks
+    Whine:
+      collection: VulpakinWhines
 
 - type: emoteSounds
   id: MaleVulpakin

From 6a8e1cc67162f47e7d338f4d1a7fca41d7f76ec3 Mon Sep 17 00:00:00 2001
From: evilexecutive <evilexecutive@gmail.com>
Date: Sun, 15 Oct 2023 13:08:34 -0400
Subject: [PATCH 06/12] Color color

---
 Resources/Locale/en-US/deltav/markings/harpy.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl
index b0247193af9..c2e9beb5c87 100644
--- a/Resources/Locale/en-US/deltav/markings/harpy.ftl
+++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl
@@ -11,7 +11,7 @@ marking-HarpyWing3Tone-harpy3tone2 = Middle Third
 marking-HarpyWing3tone-harpy3tone3 = Bottom Third
 
 marking-HarpyWingSpeckled = Speckled Wings
-marking-HarpyWingSpeckled-harpyspeckled1 = Main Colors
+marking-HarpyWingSpeckled-harpyspeckled1 = Main
 marking-HarpyWingSpeckled-harpyspeckled2 = Speckles
 
 marking-HarpyWingUndertone = Wings with Undertone
@@ -19,7 +19,7 @@ marking-HarpyWingUndertone-harpyundertone1 = Front
 marking-HarpyWingUndertone-harpyundertone2 = Back
 
 marking-HarpyWingTips = Wings with Feather Tips
-marking-HarpyWingTips-harpywingtip1 = Main Colors
+marking-HarpyWingTips-harpywingtip1 = Main
 marking-HarpyWingTips-harpywingtip2 = Feathertips
 
 marking-HarpyEarsDefault = Feather Tufts

From dbb7ceaa526e1b854d968fd31e595ecb29c17bf7 Mon Sep 17 00:00:00 2001
From: evilexecutive <evilexecutive@gmail.com>
Date: Sun, 15 Oct 2023 22:22:30 -0400
Subject: [PATCH 07/12] Harpies can no longer sing while dead

---
 .../DeltaV/Harpy/HarpySingerSystem.cs         | 41 +++++++++++++++++++
 .../DeltaV/Harpy/HarpySingerSystem.cs         |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 Content.Server/DeltaV/Harpy/HarpySingerSystem.cs

diff --git a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
new file mode 100644
index 00000000000..74994925b35
--- /dev/null
+++ b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
@@ -0,0 +1,41 @@
+using Content.Server.Mobs;
+using Content.Server.Instruments;
+using Content.Shared.Instruments;
+using Content.Shared.Actions;
+using Content.Shared.Mobs;
+using Content.Shared.DeltaV.Harpy;
+
+namespace Content.Server.DeltaV.Harpy
+{
+    public class HarpySingerSystem : EntitySystem
+    {
+        [Dependency] private readonly InstrumentSystem _instrument = default!;
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<InstrumentComponent, MobStateChangedEvent>(OnRemoveInstrumentAbility);
+            SubscribeLocalEvent<HarpySingerComponent, MobStateChangedEvent>(OnAddInstrumentAbility);
+        }
+        //Immediately stops a harpy from singing if they're critted or killed, and prevents them from starting a new song
+        private void OnRemoveInstrumentAbility(EntityUid uid, InstrumentComponent component, MobStateChangedEvent args)
+        {
+            if (args.NewMobState != MobState.Dead || args.NewMobState != MobState.Critical)
+            {
+                RemComp<InstrumentComponent>(uid);
+                return;
+            }
+        }
+        //Allows a harpy to sing again after being revived.
+        private void OnAddInstrumentAbility(EntityUid uid, HarpySingerComponent component, MobStateChangedEvent args)
+        {
+            if (args.NewMobState != MobState.Alive)
+                return;
+
+            var instrument = EnsureComp<InstrumentComponent>(uid);
+            EnsureComp<InstrumentComponent>(uid);
+           _instrument.SetInstrumentProgram(instrument, 52, 0);
+        }
+    }
+}
+
diff --git a/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs
index bdc378d4e94..50e8b6302c0 100644
--- a/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs
+++ b/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs
@@ -25,3 +25,4 @@ private void OnShutdown(EntityUid uid, HarpySingerComponent component, Component
         }
     }
 }
+

From f39e35e69cfced50de2f1976b1837ba8020553ab Mon Sep 17 00:00:00 2001
From: evilexecutive <evilexecutive@gmail.com>
Date: Mon, 16 Oct 2023 19:00:39 -0400
Subject: [PATCH 08/12] Simpler fix

---
 .../DeltaV/Harpy/HarpySingerSystem.cs         | 33 ++++++-------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
index 74994925b35..3cdb977e98c 100644
--- a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
+++ b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
@@ -1,41 +1,28 @@
-using Content.Server.Mobs;
 using Content.Server.Instruments;
-using Content.Shared.Instruments;
-using Content.Shared.Actions;
 using Content.Shared.Mobs;
-using Content.Shared.DeltaV.Harpy;
+using Content.Shared.Mobs.Systems;
+using Robust.Server.GameObjects;
 
 namespace Content.Server.DeltaV.Harpy
 {
-    public class HarpySingerSystem : EntitySystem
+    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>(OnRemoveInstrumentAbility);
-            SubscribeLocalEvent<HarpySingerComponent, MobStateChangedEvent>(OnAddInstrumentAbility);
+            SubscribeLocalEvent<InstrumentComponent, MobStateChangedEvent>(HarpyStopSinging);
         }
-        //Immediately stops a harpy from singing if they're critted or killed, and prevents them from starting a new song
-        private void OnRemoveInstrumentAbility(EntityUid uid, InstrumentComponent component, MobStateChangedEvent args)
+        //Immediately closes the Midi UI window if a Singer is incapacitated
+        private void HarpyStopSinging(EntityUid uid, InstrumentComponent component, MobStateChangedEvent args)
+
         {
-            if (args.NewMobState != MobState.Dead || args.NewMobState != MobState.Critical)
+            if (HasComp<ActiveInstrumentComponent>(uid) && TryComp<ActorComponent>(uid, out var actor) && _mobState.IsIncapacitated(uid))
             {
-                RemComp<InstrumentComponent>(uid);
-                return;
+                _instrument.ToggleInstrumentUi(uid, actor.PlayerSession);
             }
         }
-        //Allows a harpy to sing again after being revived.
-        private void OnAddInstrumentAbility(EntityUid uid, HarpySingerComponent component, MobStateChangedEvent args)
-        {
-            if (args.NewMobState != MobState.Alive)
-                return;
-
-            var instrument = EnsureComp<InstrumentComponent>(uid);
-            EnsureComp<InstrumentComponent>(uid);
-           _instrument.SetInstrumentProgram(instrument, 52, 0);
-        }
     }
 }
-

From 1e774aa879fe4af38e022a6f5a6f9bb4884331ba Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Mon, 16 Oct 2023 19:27:11 -0400
Subject: [PATCH 09/12] Update Content.Server/DeltaV/Harpy/HarpySingerSystem.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
---
 Content.Server/DeltaV/Harpy/HarpySingerSystem.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
index 3cdb977e98c..c23ad8456b9 100644
--- a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
+++ b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
@@ -9,6 +9,8 @@ public sealed class HarpySingerSystem : EntitySystem
     {
         [Dependency] private readonly InstrumentSystem _instrument = default!;
         [Dependency] private readonly MobStateSystem _mobState = default!;
+
+
         public override void Initialize()
         {
             base.Initialize();

From 8569e28120f43afd94ff9b8b1b3ee4bc0a4e5ecb Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Mon, 16 Oct 2023 19:27:22 -0400
Subject: [PATCH 10/12] Update Content.Server/DeltaV/Harpy/HarpySingerSystem.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
---
 Content.Server/DeltaV/Harpy/HarpySingerSystem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
index c23ad8456b9..60eb189a51b 100644
--- a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
+++ b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
@@ -17,9 +17,10 @@ public override void 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))
             {

From af7624c30514b27b0dc85db2ab99946e84f45bfe Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 17 Oct 2023 12:22:41 -0400
Subject: [PATCH 11/12] Update speech_emote_sounds.yml

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
---
 Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index b2ecf01bf21..982a9951c42 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -53,11 +53,11 @@
     Chirp:
       collection: HarpyChirps
     Snarl:
-      collection: VulpakinSnarls
+      collection: VulpkaninSnarls
     Bark:
-      collection: VulpakinBarks
+      collection: VulpkaninBarks
     Whine:
-      collection: VulpakinWhines
+      collection: VulpkaninWhines
 
 - type: emoteSounds
   id: MaleVulpkanin

From 06ff537fa4379a6cfc438bc4d9355b219908c02e Mon Sep 17 00:00:00 2001
From: evilexecutive <evilexecutive@gmail.com>
Date: Tue, 17 Oct 2023 12:32:50 -0400
Subject: [PATCH 12/12] Fixing a 6 month old speech bug because it annoys birds

---
 .../Prototypes/DeltaV/Voice/speech_emotes.yml | 73 +++++++------------
 .../Nyanotrasen/Voice/speech_emotes.yml       | 43 +++++------
 2 files changed, 46 insertions(+), 70 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
index 370257778df..fd995f49730 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
@@ -4,45 +4,41 @@
   category: Vocal
   chatMessages: [booms.]
   chatTriggers:
-    - boom
-    - booms
+    - boom.
     - booms.
     - booms!
-    - booming
-    - boomed
+    - booming.
+    - boomed.
 
 - type: emote
   id: HonkHarpy
   category: Vocal
   chatMessages: [honks.]
   chatTriggers:
-    - honk
-    - honks
+    - honk.
     - honks.
     - honks!
-    - honking
-    - honked
+    - honking.
+    - honked.
 
 - type: emote
   id: Ring
   category: Vocal
   chatMessages: [rings.]
   chatTriggers:
-    - ring
-    - rings
+    - ring.
     - rings.
     - rings!
-    - ringing
-    - ringed
+    - ringing.
+    - ringed.
 
 - type: emote
   id: Pew
   category: Vocal
   chatMessages: [pews.]
   chatTriggers:
-    - pew
-    - pews
     - pew.
+    - pews.
     - pew!
 
 - type: emote
@@ -50,32 +46,29 @@
   category: Vocal
   chatMessages: [bangs.]
   chatTriggers:
-    - bang
-    - bangs
+    - bangs.
     - bang.
     - bang!
-    - banging
-    - banged
+    - banging.
+    - banged.
 
 - type: emote
   id: Beep
   category: Vocal
   chatMessages: [beeps.]
   chatTriggers:
-    - beep
-    - beeps
+    - beeps.
     - beep.
     - beep!
-    - beeping
-    - beeped
+    - beeping.
+    - beeped.
 
 - type: emote
   id: Rev
   category: Vocal
   chatMessages: [revs.]
   chatTriggers:
-    - rev
-    - revs
+    - revs.
     - rev.
     - rev!
     - revving
@@ -86,20 +79,18 @@
   category: Vocal
   chatMessages: [clicks.]
   chatTriggers:
-    - click
-    - clicks
+    - clicks.
     - click.
     - click!
-    - clicking
-    - clicked
+    - clicking.
+    - clicked.
 
 - type: emote
   id: Caw
   category: Vocal
   chatMessages: [caws.]
   chatTriggers:
-    - caw
-    - caws
+    - caws.
     - caw.
     - caw!
     - cawing
@@ -110,12 +101,11 @@
   category: Vocal
   chatMessages: [chirps.]
   chatTriggers:
-    - chirp
-    - chirps
+    - chirps.
     - chirp.
     - chirp!
-    - chirping
-    - chirped
+    - chirping.
+    - chirped.
 
 #Vulpkanin
 - type: emote
@@ -123,45 +113,36 @@
   category: Vocal
   chatMessages: [barks.]
   chatTriggers:
-    - bark
     - bark.
     - bark!
-    - barks
     - barks.
     - barks!
-    - barked
     - barked.
     - barked!
-    - barking
+    - barking.
 
 - type: emote
   id: Snarl
   category: Vocal
   chatMessages: [snarls.]
   chatTriggers:
-    - snarl
     - snarl.
     - snarl!
-    - snarls
     - snarls.
     - snarls!
-    - snarled
     - snarled.
     - snarled!
-    - snarling
+    - snarling.
 
 - type: emote
   id: Whine
   category: Vocal
   chatMessages: [whines.]
   chatTriggers:
-    - whine
     - whine.
     - whine!
-    - whines
     - whines.
     - whines!
-    - whined
     - whined.
     - whined!
-    - whining
+    - whining.
diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml
index 21bb428029d..46f1e4a5c7c 100644
--- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml
@@ -4,30 +4,27 @@
   category: Vocal
   chatMessages: [hisses.]
   chatTriggers:
-    - hiss
-    - hisses
+    - hiss.
     - hisses.
     - hisses!
-    - hissing
-    - hissed
+    - hissing.
+    - hissed.
 
 - type: emote
   id: Meow
   category: Vocal
   chatMessages: [meows.]
   chatTriggers:
-    - meow
-    - meows
+    - meow.
+    - meow!
     - meows.
     - meows!
-    - meowing
-    - meowed
-    - miau
-    - miaus
+    - meowing.
+    - meowed.
+    - miau.
     - miaus.
     - miaus!
-    - nya
-    - nyas
+    - nya.
     - nyas.
     - nyas!
 
@@ -36,33 +33,31 @@
   category: Vocal
   chatMessages: [mews.]
   chatTriggers:
-    - mew
-    - mews
+    - mew.
+    - mew!
     - mews.
     - mews!
-    - mewing
-    - mewed
+    - mewing.
+    - mewed.
 
 - type: emote
   id: Growl
   category: Vocal
   chatMessages: [growls.]
   chatTriggers:
-    - growl
-    - growls
+    - growl.
     - growls.
     - growls!
-    - growling
-    - growled
+    - growling.
+    - growled.
 
 - type: emote
   id: Purr
   category: Vocal
   chatMessages: [purrs.]
   chatTriggers:
-    - purr
-    - purrs
+    - purr.
     - purrs.
     - purrs!
-    - purring
-    - purred
+    - purring.
+    - purred.