From db238c571c6834988572543334d6f02265ad7ee9 Mon Sep 17 00:00:00 2001
From: FoLoKe <36813380+FoLoKe@users.noreply.github.com>
Date: Tue, 30 Nov 2021 13:12:18 +0300
Subject: [PATCH] Carp crit\dead (#5503)

---
 .../Prototypes/Entities/Mobs/NPCs/carp.yml    |   2 +-
 .../Mobs/Aliens/Carps/holo.rsi/crit.png       | Bin 0 -> 1298 bytes
 .../Mobs/Aliens/Carps/holo.rsi/dead.png       | Bin 98 -> 1461 bytes
 .../Mobs/Aliens/Carps/holo.rsi/meta.json      |  47 +++++++++++++++---
 .../Mobs/Aliens/Carps/magic.rsi/crit.png      | Bin 0 -> 473 bytes
 .../Mobs/Aliens/Carps/magic.rsi/dead.png      | Bin 478 -> 491 bytes
 .../Mobs/Aliens/Carps/magic.rsi/meta.json     |  19 +++----
 .../Mobs/Aliens/Carps/space.rsi/crit.png      | Bin 0 -> 293 bytes
 .../Mobs/Aliens/Carps/space.rsi/dead.png      | Bin 279 -> 294 bytes
 .../Mobs/Aliens/Carps/space.rsi/meta.json     |  19 +++----
 10 files changed, 52 insertions(+), 35 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Aliens/Carps/holo.rsi/crit.png
 create mode 100644 Resources/Textures/Mobs/Aliens/Carps/magic.rsi/crit.png
 create mode 100644 Resources/Textures/Mobs/Aliens/Carps/space.rsi/crit.png

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 0fc44e8cfd..318653bf36 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -39,7 +39,7 @@
     visuals:
     - type: DamageStateVisualizer
       normal: alive
-      crit: dead
+      crit: crit
       dead: dead
 
 - type: entity
diff --git a/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/crit.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a00379bafa4035f02ed2926020ad19088132d35
GIT binary patch
literal 1298
zcmZ8gdo<f;82+U(OsnZybInkU_Kagqb=D!NmXRVXy{Jo2Wu1yKRnay?SdQLE>(W?B
zsfKjg&>4<O`KimQTDPR6j`Cxzghm^rBKIuXvp=@)ocDR2^PKOz-}}Aqc`t_H0!&S;
zO#lEe#RmG}^_;sN#)f+AK_7prC)jCxz<!`%2)O_N2G6j5zK63a-!d`DuL3O#DAQ98
z2IhFymMEHA>o=~*<9AD`G{>}%`WZyp>MdSv+Z%M=r%2XbV<W0rc==bs-x{~IJM=Xj
zNwfOefHd80<=<3$(JaV%Lh2n-iQ!2HtcQ1`=cGF6U;S{F@^A}oI78`k5u;;8b<9Xz
zro5c;(3KD`f1IS2&&RQqE(VkoEh(|@WbAZM@lXK2RQ==1!;q%x#Dkw-05idCz=_RZ
z$2avJ&$xA;#OkmQv?%e-*j-Uj@JW?{x<$2-{@3hU#3>K!Cpuls6SHy2&3a5{m|0!G
zOiw~f&HU@?=Z9&aEqKPTzvKqfmIU`9EAOeeQM3-nq{?Y@kSlgHuFZ1PJ-TbA5du*F
zk@t|9BYz)p-nV*UV?4GU<PyC5_hzXFmCyvM^)oYBk<-o?(q?#4xuZ%hKcZ5lu0pS%
zVsi_WC^GsU@{7fcC9afIQ$h1S&9wBE@Qh24B=}UY`HFbiZ#2%b@qqBun3+8m%520>
zR?+L0&(WYl-C$2b%~Be>q!fGiP@iV%tyFOH64y2~{=v@lapoP!r?By8p?vaP85*54
z7Rtql$sUCu9pYd*HZwN~^?eif@M(RDR50T@=;AhBnOMxn3#s#Gon)%Lpy6!lOVHuM
z-0g)ow1YLqhXV0L+kpJp0n?3G+2nOOQ||R3{ZHSal>UV6XA^Aw%;ijlS8;|+75h6k
z_z&;fBNiO2N#_q#h>5ug8z3gQ3HL~Fvm~**PgA`i7=`(F&L5d*(-_*+UW7gHWvN$E
z!wFu*9%2?6Y5`ZYfb-ba?=9+gJ2OR4Gr2RFGN*w(yEyEn5Q<FtSU&wCuFP}VZr`~g
zUm61vjh8nYDaZotewu56MM<$h$glO2ak{>1<*d6et-3OKgE+we+s4%eDj;_bR<Zhd
zqu?U8xSLJ)4>ZkX;Mxxp&^|Fwx9(cFXWi;k1s3VrY<eG!bl8t9M!uoDqju+EDX3kq
z8!%lzDVvK39AsOlLOmCr`P=2*9TG9af6ZPAZ|kJaDHW35@V{O1&*J0jOr)m>Ma~uB
zzUkJe#Vh$`4#C^k=P$-k>NY<Udcv^kRXIlkbBeeeh{vL*Ns$7(uB#Vzrbg*C*n!EV
zbt~Q@f4RG)m&xQI{g3%}0GN0(gj%KjZyNz1%u1|Tz0|y{$bvLwYesiCyM7%e;wgYY
zA#b-i)I1d{Q;5bQOKVH6F@_Ph$FgK7nhNeQ;~w4LDtwi_Hp$2}I5WpjX&Vx$W@4>?
z5D{OnY(svF2%|v+O0M~wG+TBavg;!0Yy>*}c0_?Kn0?z68S0-kGA&^HdOd{-o^_SJ
zHU(W%4?R}BV`G4vr$aY3U^KA*)mn|3N8C@+UYfX~1v*v931TIjSO&rt;nh@KEFE%t
zZ}egdg>dX7V7IcIBJ+F{sex^(sHCS>fJyU+kqwkO*7kYC%nQjm=W0yu2{2i2I)iXM
vnuCsdGz1T<Uju_a=+n_6e)bytV+kHTh;C2$(efC{wsiyRkMnETAD8zJvk;Ac

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/dead.png
index 9d4043029689331d8ee657e3e30e4fc57e1bf3c0..6dabffd0b5e5a36e58c7cc06ce359a7309ec6db1 100644
GIT binary patch
literal 1461
zcmYk63pmqz7{~u}zs)5c_hXeyiky_FXd5Ffp`_?$Lh5i_TcWV(h*U0}LYcLll9k7u
zCQX~;8nPjDO3ZC8XU!NkX5;+Nc}}PEJn!#)f4}E_-sk!Je((49W*qZ!hpHH=0000*
zA9nQtBmVEDqyYM6_=PSoK(6?>y8z`(<5>WZk3zdT`^FdYh=}mXL&j;CRrMejHN}`M
zYANQAJPM*!r<)#GQC~N;8tC@v>vidh3~nCD-Fi|0ZP869;K%kw*QW-mr8gI&$2v8m
zsrz^Re8*hQ{+823FQY2N!;r^ZYpkYP&l;d>_P7Yw_8^tEq-whS<4PO1zjZ^LYoQ|y
z^4RUcWQGr}D)T{~+yqIT^YJb7`tr8a_0JOTt~-i1i~xM^Cu<7?X(ZyAy(RjkLLY{P
zVMF@II8@uyK|k(GbND*;nA>Lbz&RR@iKoeX%Sd0XsfyYb2Al?sZcVZ<2&CP6zDX0w
z*mQpU;CyI7<nbQ<L&K7piuQ^hAcCSG%G!B72Nq^rERY$gR6II9bSVR}S*iVaHho$l
zZCxx4Kkc)y2{cE~xp?lX$9_pjnf3}jkwI^`tvhAxB<&WHR9?P8oy>F7%z9>`czB^)
z^`16Y`P1kOkirj+#%d-p>Qc0x5^@7B4gbb2WGgdG6Q-QBMtD9-CxtW{Cgr{ayBn<K
zIGN3zf&?zj9aL~voE6nPF07bwn7~ypPL=T)BiLlZHL2fl)|VNO6DL`Yvhz(G5;4{#
z+M%TNwzmAU)iLF?j1i&UKB8+TZh$w65WyPSY?9Yk90L-U4S><sYwUNTUYZC=(c>94
zGKCg14%68zlr-A*kD<mvUS{h|I-fYn!e3^hpQ?N8h-E^GjQxTGHx*AK#YQ5EoKLd7
z2m6I(rY7`w>o|9_F~!6m=s{46*tgjoxp$$lCa4l<hw0+xYBKu~8-o8mo6+)QH#*@E
zivOxaN8%<gosz`LS=QXA+G?!wbflru=QmCb^h6DMe^<r7yO4qS_+JOGM+<yi>hFdg
zupkbknX{$|LcahQvgl01sQ%TqqD4tp9?OAO(E!K4o=?!jl=@j(L^#9QwTuNZ(0E?0
z)3N@{<={Tu$wkjK)xBm00lwxM-4xj)!m>suYRPKihxIR7$ZNf=Ua(wmy~{Rq=xQPn
z^ZZ@^7)cERjPPz~1^qBezpEYsd-#sRx-zJo2z$b(Z0!VsY-daD`#B#ui}|e#_SK8K
zmL7A1l2uk7O!yw!HS4F1n)*|=usd?PO5>$$-F6a55|Uq!RuklrLae#zppwn*?X082
z@w1Bl#Vm#?zh!OACHHpD)0J9_XC31w$m*z@%Nc~Q)X)0ZIVVt!M2wu-EGX164FEZ$
zlzT+5K>hGW49J)lH-xRm4@t#hz))rS!<Ck@CZQN8uG&wE`pgmoOW|>YI!iTh;J**|
z{gHP}#Ngh_SSP_p;&7a0NSKw{g*{!qutqGLKG&oZA<93vA*t0hkFga9Rs(XfE^XU>
z4n~IH#?nf|z!FBX%CQ$#r1EAgoUMQ>k+maw<L+Ss!;|nkB;eI+ElE)|Y><k&M*7;2
zz$HjFmK}!(WOgCuER39ycmV7>nAM$}h!AnPvi>>Qb;EohZW=s-w9*3NUU_M$#{UMz
zH}0Iyz$E;|MZfp4{fd>t7*i`hSm1LBl*|X9l8x))?j|wdF<zm{Qwl`E>D}uV{vI~^
zm~Opsc~`}q0Z8nz4q5G0taB`}QN*FWFZoHZV82F4TZWt&Wj(Z$<I3s_2`0*ek;NzC
zY22*qm4FXwV434)9cG*wT<BFS7)_Zm>!zJp8E*DxdI}{&zqnJj;UZ~lyHbrF3kJj=
zM&6l>s)QqrBnlUj@VYCWAWp=*Q9Bks9EbSUgFdwl+0^mg%KijIJUE8|w40Y}xl7>9
FzW}j2+0Xz0

literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzO-~ockcif|7ac``60956U-fig
uS~aV2b^huN3=Huz)>+3MS7X>P?FnPhOXe)kM@E7`O$?r{elF{r5}E*>vK&SL

diff --git a/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/meta.json
index 36580a0a8c..52da404bc3 100644
--- a/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/meta.json
@@ -5,21 +5,52 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/b143783881fb7418213026857cb8c569636e259e#diff-8dd94e19fdb2ff341b57e31bce101298",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/b143783881fb7418213026857cb8c569636e259e#diff-8dd94e19fdb2ff341b57e31bce101298, edited 'alive' to create 'crit' and 'dead' states",
   "states": [
     {
-      "name": "icon",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "icon"
     },
     {
       "name": "dead",
       "delays": [
         [
-          1
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "crit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
         ]
       ]
     },
diff --git a/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/crit.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed5b23705a1e8f047575c2b30660d3dce67d19cf
GIT binary patch
literal 473
zcmV;~0Ve*5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$lSxEDR9J=Wm9b94Fc60Skjhe}Oof3gJVCnm30Qan)Rh(SET}7M#S?U4VME=M
zCt%4!x)7<7B`XZqldrCwHeHY^|BI7eegAjo*ao7aqW)RQIg_Re9Y2@)yc~l8q^YY?
zBl)?b_|5k)pwUp{Jf*QVG=AO!0J>#s|G)dqD;IDOt%PBdWedEuK%sz{qUWcqKhMj?
z`X23ol&p*^UTvu>l@8BaJF&+M-Fr(AM*(<kr70&}OlWM3?SKSvjaikZZk8H}7a(LB
zN_w4=`8=Z~2pIze3)tN=at)<vUj>Dt=h<$YXTbBuZ^nSDExqR{0EO<W`9<<NA#<M@
zw=+*EiL1qgVA-6(Ds6WQ14tlNZGfw_rmxcdh-9m3L+>&{rO8xQ&Rr>#-KLzYF$D53
zrWnWfw&7Hv<7yiNd~9u;W3nQ*TMXbUM9$+Kum|9p*XHn;l@Odz8vB+&cEWdTCn0k=
z!FLSjo-VlZ72yTAACti`+P?e1r&BJfg9=Z*-9j*D-Ht;mi;9Yhx+whtnU23j&Ya4<
P00000NkvXXu0mjfSeMqB

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/dead.png
index f42607ccdd6c2b0129d9893578e7f6888a6b3e3c..807ffb4c912b8b045874ca2c8785c6bdaa2d3dfd 100644
GIT binary patch
delta 466
zcmV;@0WJRC1M35jBYyw^b5ch_0Itp)=>Px$rAb6VR9J=Wm9c8WFc5}+)xi*Om!w0p
z^a<iU^a1=1A#2ytXDL~`hCD%+EZs_X`w6;usk77&5EyqjUv*YwC(cqR`XNYI(tZD(
zqzLfx^7><`OBTf;YVN1{vKWI6NT{t;Lw()R_|4}qL!+VKS${xnUQzpY3jnA$rJ3J+
zbILY2$gMQPkWC4^l)yX$79sT?qW(Bfd&50h0V$aoXZ(7gs${x*-G?={j8Jb&GI7!X
z@2!M#(Dj7cqB0ebMr<%E(^Sn=Lpcp}LA!!Z1A?z2+5&sdwgi?DwaJ*i@$DJeKnd;3
zU>;I`(X^`wcz@it=M~LCO~!5bEC3LqelNZ;dY;e;cEPxuvw*T>F`UJ4HkN5~TL55p
zAh_M$Pp_f)K*S+x8MvtEs->F7I3OEg*m`oDIgd*d(o8Hkt!v1jX+Q>c2Q%(6VFT^T
za3VH5)rNi51<$K?pj1Qgx1utEd7I|q24vdI$;A(VYD*5^Z(^zs&L`FNH|#2}E#AVu
zISK%hF#%-Ou7!Q?flKE+R7V+}`?__Rx#)EqnwgiEm)F125C6Hw!(hnc{Qv*}07*qo
IM6N<$f-1n^Z2$lO

delta 453
zcmV;$0XqKc1KtCWBYy#<Nkl<Zc%1E(KWf7;6vjW-K@jldbZC~IAR$vBC&(R2I(99c
zdXSQ}Ysd+@Wa(DAhWG?syfj&A2ndWjJiqEik(@Y7q38o6p?|;cJxLZ26cqHwiq4rd
zRH(SV*5|F!+JJ=GT5CjK*VKRc+0Ia>Ew~?3nU_?)T>${9d4FNX*KJPO23xt6W*9Or
zfR_RoC}6CpexEe2^SCwKqZyErk#WSYJIYF?{qsJozS{)Vq97AT4e;JdC@(rosoaz%
z1JZ~MW@VbPxz>oB27FN8qP>{l(}cFb2L{M2U~W&x21;mC1Or9&aa~Rm;9={AEqB0b
zwZhYQ1fV|13V+r6<{Qy-N^lp9)7g(HN?Ws(%rcyfW!l^pHUI#V?*9C|1R_2VLxqZ?
zV)uDTsTwL&ydWE4*epGaocsHhY0kvm&FHsn?;0|w7n6bI&h)!X*gzS848+ca<X-sT
zxtIu0Cb(@=nuU3r2I2-}+KkD?SA!3KL_Rp5RM&6VPCl<oyoF6;A^@0l2_U0(O>BA(
vTsq~UI*9Pp*Ue|<tk<z^WI;heLH|lWodCqP{*U8M00000NkvXXu0mjfj>Xy*

diff --git a/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/meta.json
index 7a30227273..c35dd71e41 100644
--- a/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/meta.json
@@ -5,23 +5,16 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/d3d351dea8d9420cee47514843a02158d0a7266f#diff-8dd94e19fdb2ff341b57e31bce101298",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/d3d351dea8d9420cee47514843a02158d0a7266f#diff-8dd94e19fdb2ff341b57e31bce101298, edited 'dead' to create 'crit' and 'dead' states",
   "states": [
     {
-      "name": "icon",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "icon"
     },
     {
-      "name": "dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "dead"
+    },
+    {
+      "name": "crit"
     },
     {
       "name": "alive",
diff --git a/Resources/Textures/Mobs/Aliens/Carps/space.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Carps/space.rsi/crit.png
new file mode 100644
index 0000000000000000000000000000000000000000..1492ef26f2406f9d8f4f8dd18e019f3ec4f956b4
GIT binary patch
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|<N|y`T>m#5
zFf)v4FFxoH)mxIj$tQMhL&N_iOa6cU{JDYQ|JUj#kANz<N`m}?8UDjSU8hJGP;|bh
zi(`mI@7swd`3@U!xY+g_fBC<@km0h*si2k5%lH%@ZIq1q?a27U$NB6V!O0Dg@Bew;
zJz~*jRrOLNVdC4+DU4imGpBb(DsJ31Q=NCc=Us!19ZlO(Pt>37J+bk^?Y&Wk@&;>F
zzke^_adQbitn=)gj^ShGzNKR9U6~QJo9eHuc)odA=avIElkQg)U0L??+C#N!1HP(V
j4_e#ae=Do6T`l^ont9TqH-6PXr!siD`njxgN@xNA2&{x!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Aliens/Carps/space.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Carps/space.rsi/dead.png
index 610087d8f2a5d50fa5441233b4d84d984f63414e..87cdf63757e6796fff7228b069acaf1b76bd738e 100644
GIT binary patch
delta 248
zcmbQvw2WzjgcJue0|SH0lCEPwim^Dz-HBn{IhmJ0j^adBrFv#&&L5#--asyQNswPK
z!+$uaEvvl>6rSVh;uvDl`*z}OzQYC_&W3$UHUIxV$m*s4>Xv8qy%<v$nRb_iZ_P{}
zW-dGPS8#H}Z;6dl@@yIxHeTE%VdL*EI@NKdwrtTxEs<;go=r`=w)CNgg=uHozWD(;
zwoM-Af`5G6l=ksJSDehz&&?+%9Z{PUn)KD!ba&x`h{js~RX?`$Za37qP<8a;*GDh>
siZ5rXwM(ko`hMt5dskLgU%Q%Bw~2Yn8pXitK!-ATy85}Sb4q9e0NMd>egFUf

delta 233
zcmV<F02cqI0+#}i7!3pi0001iRA<Kk00175G9rKVd*tE(0004WQchC<K<3zH0001|
zNkl<ZD3QgGy$-@K41^PSfrK^^tXA2HtYn7D?DXe$B%T2A{t^xaL3a?heYVa%+n9gK
z`Z;^=9nF|M$%=^H4mymri0q$*1qp{*j=;p!NI#6Va_6SDphp`3#DY!f^s)^@zVX_K
z(gsoJ+pgn$;b=|)(K5mos5oCWpiMhdB|t}TKI_bCaK>^9YVl=<P0?A6s)~;c%UEo_
j$bH_a{5s={PyDIwmIWSR3!SX-00000NkvXXu0mjfB5`SP

diff --git a/Resources/Textures/Mobs/Aliens/Carps/space.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Carps/space.rsi/meta.json
index 0e75d0f662..a45b246fc8 100644
--- a/Resources/Textures/Mobs/Aliens/Carps/space.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Carps/space.rsi/meta.json
@@ -5,23 +5,16 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/animal.dmi",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/animal.dmi, edited 'dead' to create 'crit' and 'dead' states",
   "states": [
     {
-      "name": "icon",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "icon"
     },
     {
-      "name": "dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "dead"
+    },
+    {
+      "name": "crit"
     },
     {
       "name": "alive",