From 0db821f4f5b5cf3a974b37b475c1afc651a078e9 Mon Sep 17 00:00:00 2001 From: Xantholne Date: Tue, 29 Dec 2020 19:33:09 -0700 Subject: [PATCH] Fixes missing electus red from trying to be basic parrot and adds --- code/modules/cargo/packs/livestock.dm | 4 +++- .../mob/living/simple_animal/parrot.dm | 6 ++++++ icons/mob/animal.dmi | Bin 424151 -> 424151 bytes 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/livestock.dm b/code/modules/cargo/packs/livestock.dm index 83b831aa37..a0f11c2f3e 100644 --- a/code/modules/cargo/packs/livestock.dm +++ b/code/modules/cargo/packs/livestock.dm @@ -35,7 +35,7 @@ /datum/supply_pack/critter/parrot/generate() . = ..() for(var/i in 1 to 5) - switch(rand(1, 23)) + switch(rand(1, 24)) if(1) new /mob/living/simple_animal/parrot(.) if(2) @@ -82,6 +82,8 @@ new /mob/living/simple_animal/parrot/hooded_too(.) if(23) new /mob/living/simple_animal/parrot/pink_too(.) + if(24) + new /mob/living/simple_animal/parrot/eclectusr(.) /datum/supply_pack/critter/butterfly diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index deb18de42c..058d4d9973 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -1043,6 +1043,12 @@ icon_living = "kea-flap" icon_dead = "kea-dead" +/mob/living/simple_animal/parrot/eclectus + name = "Eclectus" + icon_state = "eclectusr-flap" + icon_living = "eclectusr-flap" + icon_dead = "eclectusr-dead" + /mob/living/simple_animal/parrot/eclectus name = "Eclectus" icon_state = "eclectus-flap" diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 4c0b19cddc4b9f570fbd4cc63e7d7754b6090a58..8db32b304bfdb0dafde42366237672153f7167ce 100644 GIT binary patch delta 1746 zcmV;@1}*v5@fp|g8IV1HIuLzMz5=zcWVInl+xw80t5#QiXnz42n1F@BTw{XLufGq0 zge2HLuw1QH+E!-{$0uXYc*tk(?;rpC{Ox`J^>ckDRdZQ-M{oc3zFxIF(V2JjcENg; z5l=IH{YR~tChzEdie>w0y-K*My`#5ZuTF{;RC`Bn`+x}(V#ytUxHSV)9vN`KdXcpn9e%i~M)1{4wbTOZi9T_Z-*~ zZs;YKkx3!V%h(>AA8SW_H#*~SPGuM=*_Q6?>(PS6IgD;It_kN>vMs?Z8OoU!(q>%K zgb+;r1VT$%e7S#rieGG>;&_S({)ef=srL%Q1b0}o;;lpRn9fMawv31=r_>t~Q+tP- z1;ZOf)fq1E9F`~TKdm$HS__CQc^qcthah8q;4*0Nw)I%%&kj52MIjgvO; zzR8+WlY8k`7)Dt(s&=2HWut2Fbkj_+Qa6IRt?ZE)@tIeDz}nBeLYH3fq~#~~;yWBj z+SHknvT*hV-PRfH3uIFhSV0F^P~ae-t_0IyM5@>YRFf)pnIa}t>@rCU)&LB!Q`B4o zFgd9lf=nA+GK~qSm{L-QCt-3LXtSTmYVKCpK_QJN#&ssBuAQtmBuFe(Dzzqe&fk#e z!BNMgm>w2?*dcVR&W%NfOzVd>bx5**A-PjXosrTRFVpd*4Ppa7@V9<27Q1;|tm*70 zrVM%e&6qrcs%gq++xj9jziWzTJ>VKQ?EnsAhF+`&5i^eMRVH;^N$nlIgTFoaqs&s6 z+B>i$^i0r-=t2<_0%#Q}+>W#TWjSdc34)Ij>^@3=u>TN2qcthxk!#KSJ{0WUh$XRN z5weGqSg~lrXrpdv_<0YZUkx@4>z=Bz@!*F+#?Cm%kgCeS!D!#&KM z;#^415=p%p7r zGQeGbYA3|nG$%5h@q9GO@nm$WSwu`j7s@*nqh_j*Duk#7PcxkouMM?vFu*zZ2mj#j z{r#{>I4NmpEw+y!Ou1r;LWuK*1Y118%6GR=!OE>0#T9{k9TMOa=q~Fy!7Q_!`eS2p z`0S@M7f?y*fjDih$TS#w1!A-|$`Ko!#ADWf2^r^M#@hU2x2Qo=w>|jVuaEx~1pYVw z>*!OF>sG-xsdTzk@J%W=kg<_qWxk1Iasi=OB`H~MyEzX|rNDoG+dcn|&jnd-xVe8B z{Zx#{yqRctojUX^qpy#QJLk12A6Jn|2~5vYDbeZKSr%M}wSKt74QU6LxNdEJ@N#8; zm4zt_O_lfhTq+G0%ojffcfXRAtgd(h4CjX6up%;ativ;ax7z#l5c?k{`naclu{Z#%BuhG-qZ<$AnyWyq|{J@m?z?-|NRFVGQcU%eHjOekPD-UGn_xvcBP@NVS=7S@8uJz(g-jJe-fbx>#! zTgj@rz!x-WbqDgH<1p@k8;PZX9(=ncIK1B*AAfg${d8

$E$Y(g12&y7pIEBM{ifN1!u(;WqRS%QuvF1yhA-DR?1B+9{%_;%4XilKmyTi) zXF9GK-t>`>J1yvr6^FUgF6d5wJKLRhiaTl4Bq=bYu)r{Ht_+JTyzkA<*{apVC o0}*w$hA*XJgWLv(+y()M+y(-N+y(=O+y(@P+y(`=+y(~waf6Iq(*OVf delta 1746 zcmV;@1}*v5@fp|g8IV1HI23(Oz5=zc%xFTAw)-$It5&N%w7(Et;07!VW{n9-zkVMA z2}v+MFsw!+O{;Sc#|Qgf`*xB!x)Q4J-o4%H+j`ZA*reXOw++^- zltq%7%ReeZhP`+1Q>2s2gt<-L2m_3Ef8=gNEcHg}jq%oN{$fEzn75upVatXDBh zI(zTl#vlAyucT7t11ITnSmE}@xAk}acD>Tvh$4QD2i21F|{|i zT`;^*hJ-Weqf`nI4vh{U*#9@Cs!$E2wgZBSYhzerHe8_?wNW`4<)pp9Fv_Gx7EV&b z>n5!W!|tJ9U>Idl>&l%=i&|G;b~B`@FtsGNl^qfzK8X^482d?-=+JW!H{$3Xe2W7~ z>nhbs<<5OUyL1Nk1*)zXte`zCD6kh$m68k?k!U)DY7$N7DPj^$=Sf08B9P)S}SunN}JQbHv5sR5^jYp6w-JkVN%Ie+8FNurhqTVAI2dhPaCd#D zDAS6fbQsyIh{5aL4_^1Z+$q6*wUR*YG9t=yDu#jgg?VPwDpx1YxiG^|26JqS)>I^H zfxFayPKX`T9IIr;^U)~BlhLkb9+H6$ls70wO*&Wl08vYkq$XieS!!difwTAb{@&mD zyZ$EOsFh`FvAG9f$~9>|K%7@3xW$uHyt#!+DmHGE&1BC-*Od zZ^fGC?L__K)V^aGygst7oaasXu!=+}pnH}mg?7(QDi`KZnY%+=pSE|1YscmXPe)dN zmD^^at@2);%Z25D`Q%6M>{n1hRViYiIoAgtN@mNBwVwk-Bb>CEXav|lrtl0=c0jZ( zorjVw9g*I=-ul;{r{IHTTlwFuAIks!IeOatmc6yO?Jw%U4{S3ZxVf83HPY2Xsm7Z4 zD91?G9;F!T)1w?Cjd|FO@m4%aGtzi}M=3^I?J$X}Ek2FN-q4=Lv%s`%??bDSB6l^3 zne|Jofa3S|SQxrcto|o*{?S`=LQ(_G@eT+!$W>LUPdwzkrP zqQ^k&5W{Y_tr*ObjA;=+GNu`3WK5V797&E$?Y;;a2V$Od9E%v!kjN&j~T8c%S zX}M;2(?vq=G@v`9ILw`9L3f&e+3qw`+)2VZPJqV52n_S)!mx-n7pfV~w1L>7!i*V% zflF#RW5T({gj0+Gr_3l0v}VCc6V9GB;go3;sXSLjC@IQ90esW4fj{8MW- z0DA|7q;z0#lT&L|G8I~d!u|2i9U4+|7Xju!CF986P#Z!*Qm$xBh89JCQgD>T>NGap zhXW>oF+E1G`=by$2wUDpuv}zq8^LnM!Zv~>xQBrJ7(s#ihs7LeW?ItVp2*rju8iU^ zUs{SqoN2jcc+*9K7i~4<&L|G7k{60)s^o=hPL-53NmMq}XYa@F@80)cKiB^O o!!K~|9gHm0gWLv(+y()M+y(-N+y(=O+y(@P+y(`=+y(~waeHK4X8-^I