From 0223b10345b7fbed0a4293300dd8d04c756b2e3f Mon Sep 17 00:00:00 2001 From: kawoppi <94711066+kawoppi@users.noreply.github.com> Date: Wed, 21 Jun 2023 21:06:09 +0200 Subject: [PATCH] adds (space) lizard inhands and onheads (#76198) ## About The Pull Request The axolotl sprites were based on the lizard sprites so now the axolotl inhands and onheads will fuel the lizard equivalents to complete the circle of life. **Lizard inhands and onheads:** ![lizarbs](https://github.com/tgstation/tgstation/assets/94711066/523c2e1f-b0c8-41ac-9596-7d315381f743) one of the sprites had a mistake and I didn't wanna redo the entire picture so here's the updated sprite: ![lizarbfromback](https://github.com/tgstation/tgstation/assets/94711066/a978ea92-6205-42d5-9ed5-b8ae98375c9e) **Space lizard inhands and onheads:** ![lizarbsfromspace](https://github.com/tgstation/tgstation/assets/94711066/6175a3a4-004f-4abe-b4f3-7f948cb0120f) The held weight of lizards has been changed to tiny because they look like they could fit into your pocket. This value wasn't specified before and it seems to default to normal weight, which seems a bit much for a creature that's about the same size as a mouse. ## Why It's Good For The Game More cute little animals to hold on your hands. And they can fit into your pockets now too! ## Changelog :cl: image: added lizard inhand- and onhead sprites image: added space lizard inhand- and onhead sprites fix: changed held weight class of lizards from normal to tiny /:cl: --- .../modules/mob/living/basic/vermin/lizard.dm | 5 +++++ icons/mob/clothing/head/pets_head.dmi | Bin 2417 -> 3093 bytes icons/mob/inhands/animal_item_lefthand.dmi | Bin 610 -> 820 bytes icons/mob/inhands/animal_item_righthand.dmi | Bin 601 -> 822 bytes 4 files changed, 5 insertions(+) diff --git a/code/modules/mob/living/basic/vermin/lizard.dm b/code/modules/mob/living/basic/vermin/lizard.dm index 4038e848692..ab73224c6ac 100644 --- a/code/modules/mob/living/basic/vermin/lizard.dm +++ b/code/modules/mob/living/basic/vermin/lizard.dm @@ -33,6 +33,11 @@ obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE can_be_held = TRUE + held_w_class = WEIGHT_CLASS_TINY + held_lh = 'icons/mob/inhands/animal_item_lefthand.dmi' + held_rh = 'icons/mob/inhands/animal_item_righthand.dmi' + worn_slot_flags = ITEM_SLOT_HEAD + head_icon = 'icons/mob/clothing/head/pets_head.dmi' ai_controller = /datum/ai_controller/basic_controller/lizard /// Typecache of things that we seek out to eat. Yummy. diff --git a/icons/mob/clothing/head/pets_head.dmi b/icons/mob/clothing/head/pets_head.dmi index 19ce9ec46751751b68554020426060af96f7b41a..0f1e089c164eb22b7da6654b1e2e2a03b01131f0 100644 GIT binary patch delta 2992 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 delta 2310 zcmZXUdpOf=AHaX2awvy{=!uF^PB|1xVIt=#c}nIq=kwud)*R+nmM5f^oLVZ&8_J=T zwPFq#dCMs@hgLGBuofCNGqyde=e@4p=Y7BbeDC|Zuj{@(_vicl-bLHkTOc{dVNRQ6 zHDmz**zDr$-~|8@;-v&2Eh$bhwLaeB^gSP<6)Wlu&vyp;QD&_4Jy)%F995Mr_cQ|l z{CM?|?>+F(oneuX9Vi1Cyg4Akn+t`#T01ny+Qay>57W$a$7_xt5QvG12^9mC*9_n= zS}(EK#n2bx8V%ee0|qJvN&q8751rsrd=lcj6Nt`#6a}spt?_=4AiZEG0lTTU;o=Q7 z)!PT@5Oy}?kEldsR6;xepl=nuX_3z~QEX%5Z5$<=*fGhbiXA(NcCfU8V|S-g*^{&D z-A$6Ng*3Tk2%a5PZt0g#xl0RqIOj}VIW@n8dh9*eq5kwk{h69qXFZF*z4W?42<>wGCtw818Ql35}cvIT&R!7dI^ zZ}hF%;tTLCZd*ImT&e3(G^qv7o!v|J-@vRO>8zdj!Wn&mNYvM4eobYr#e6V=#JjC! zxZ2ftwx5otJNB>U7q(C4C#TeUoZ)xTmXr}QG%}g|gh1SjIZ|-tGzrgnQa$l9fwz4- zQks%EXz3;VGr?4nlE=*N`D}hLBNFDR2tV#@i?LT>LASl=TH;WQoz-};{T6pX8MXX3 z%55`9M88F>?)mN;n)trDX?Ur6e5i4$0tsQ$(`y$G4-8Pe*cf~(pf?LjaC=HWXxOK4 zs)`lC@qXZEygg#4qa$RBPuhnPzDvpf627ybKa5#~8(ciNuS_P>eb=Tx5V~A`)CMzz zv9w&Z@%)#CWx2Ji#ob{CBq12^s&65oiVfYW}n8DlZ!dWTC zWofM{&yLEz&$8DY)6Lw`+5sczx4U2H4j~EB146md6PoMxmTAt9fuAwUdsy`qx`b_^ zmsf%YlZ;o03R>D7)MvSXLkmB2+NCF&QsS3ZHdhJ?7+ za{(3fWTl(0q~N7leMY*?PdI9HMC!c^Uf%GzWiA(`?jK_@H(Y*-Su6&tZU9c(YK>^t8d@cbFPo*#H4*R^RXP)_{P)IV7Y^W&;F zFiIrzR^}a{W!Ky;p9Nl-MhR~b9)yowG_|nB+HOYg=P~BC(4=^_r)+gI;uwbH9`Pjo zCp0r%D;5Zp2W^d_jO0N5`$N$OphWNJ)!*qLffA^^+iICOG6VT~09u6}uHI`$?heGp zfY$?CQXv}%>9qkTxb-4KXp!5*JBGWX&(06;kaE>=(Mslzg`!i@$VcV=f%=oFI%ABQ z=8U@W=14|3M8MqTKe&^Jxu9y<^T9Yw>ZE^}`nAY`l+1^!3tzLp{gT{DK<&A1LtusKQArf15hNa@LQ0`aTYtVDa9` zh)zfzQWc9zATuFfW6tr>|s^+xNLCGiUF zjXZRF$}WEn2F&gmltsj{YF7W7N#r#P2LIsKP&(4r}nMssz*^0?ch@=|GN!jkoIicJlM- z&6ltw5{a7lD(^RWC)s0K+~FWOP@nbkY2xgB%D<>D7jal6YZUU`yuvE`5X4%92IG~_ zci*?l5pK0pk(S_hAVh`g)`xds>gB#iArFP>w$+I`eail=);nI5V2m26Sf2Ha{;M*IPCuiU*Q3Un((%15p(ecAFGpSP7fe#+)Qr-kqA zd?c{2*?mOfMX7=smfNoK7*M~VQf*&BhS7{`OQEcHXT^|MwNlZ%ue+sb95p9hsf(+2 zx{bn4&=JpqY!H2<)htT*Np($G!f%ykgzRI4EG)+0+h45ogoqq~QQ>RJ2JWaR*SNyy z^bPPZ_zUkxuQ{ApvQ7=vNT^Pn1<$6XrD=c7zvq;XXtq$?(y&|xtFqs?fV(JV`Ofwx ztTB_h|BXz8{6j(4M9fl=W%iUrgSt0M*+cuQ60yLp{!w>)U4 zvN*G}!{}NSti>cHQ$aqNXIj^US`wj3jv8(}_aEZOJ3;mn*-iB4o-t=sF!QVb;Ia){kB#|`x&(5s15=p)_3Leo`T>5$7;s|qi IXdjgM7qiN1R{#J2 diff --git a/icons/mob/inhands/animal_item_lefthand.dmi b/icons/mob/inhands/animal_item_lefthand.dmi index 7dbb3ebb43c2092d202ab65e3bffe4d4d17796b5..912f53a02e9afa146c6d6854f440a31fc9181cb1 100644 GIT binary patch delta 725 zcmV;`0xJFD1hfW!iBL{Q4GJ0x0000DNk~Le0001h0001h2m=5B0QBII`2YX_QBX`& zMF0Q*-@kk4%Z#CNJong^$E9WE&6(7%Yumw!A|N4wS1KYP94;y*|C!AH%*+4)0Q}

uZVz<*2^BG)OG+60004WQchCAfi=#H|M2a{_(%H8Vk!LlZup3cDoY&HM@0Khv*lJqTogb;i+ z&7^N`x`a$0%9`i-I)R{SR!A<|4OyB{)FjP+e&2snZc8QrRb{#asGJFoQN_Bys662> zuCibQ6tc*c0K%0(ify?StFx+(IQw5lQ+A_;q${wfgv&~bvMiYZrOaIcs;gB={;Em& z)1S1CJ*Xtz0l6CY?ZCCAO-F}#8loJo0D_XP$7!Xs2IZS!5x@=Dd}rtzDQMyqC(KxrME zz#=4zMxXw;r&E8%Atr$R2$XUJJflgbnW|>0u`Cwem2izHlnTBCz7*a7oFL*7etH1k zCA0~i)*k=>00000@CWE#G`|ZpZcWR7%{IZgT3*?;rVGl@?HE;OOmG6TW6L{oFefih zf5R;{CV>42mJRS29rwvFRl`(cSuDIO;Tln>&^zQ$;SInEA}-;l2k<}UmZ#`h{Q&>~ z00000ucx=wZ3FkZffWYMCPrS`kCuUZ-84^(FyhT=1oNk8rxgP7Mm^Lft( z*w6ELIC;6JcZcEd*!KbZ5e)D7K48Cu_&)F%0q}hQ0C2-MDwP=3Yw-YF00000NkvXX Hu0mjfg~v<| delta 527 zcmV+q0`UE`2I2&NiBL{Q4GJ0x0000DNk~Le0001B0001B2m=5B0M$l^3IG5AGf+%a zMF0Q*p>jOv%Z%T@d*#iU_t=)(!HOavA%Rya$E9V|uWKS894;y*|C!AH%*+4)0Q}

!rA}GF)z1a&1OPhn zCwEU`Oz!{y0a-~zK~!jg?Uvhegdh+^85DGMMgIS5GwNn91q`m5R8rOF!L?Aj0r%k; z0{{Tv7(`TjW}C)7e-6^NZMnhOMi$UmcRb(t&X)^}qh$eUKK06^h5m8JgI2)Q`Hnc5 zzM$qmpIX+|!sLIw&lGrWwSt~rc96_|dz0lGaFSKq!E1rKQ+bn_DJ>wA4!*D8aXYF7 zg@mk diff --git a/icons/mob/inhands/animal_item_righthand.dmi b/icons/mob/inhands/animal_item_righthand.dmi index 13dea9791da9db791bd374f3a35e952ec81d0fb4..98ca1ddea2cb1811811d93f1f93613df012c401c 100644 GIT binary patch delta 675 zcmV;U0$lys1hxhxiBL{Q4GJ0x0000DNk~Le0001h0001h2m=5B0QBII`2YX_QIRD# zGY5o53a?%NLIBzB{Ex}SaJ08wbAV>ItgncGkk-qR>H&lR0004WQchCyCmj5QW831(5<35Pkm#-4QgxGHoY_A)7tl4^8HB=5)YKw!0kw006Ku(SEgkK4JvrQeNAU-nv6SJf0c4GXnr5ecIV8|n2n0($?Wxi z5hOeFGeqtI00000007`0kT35u%eyB^#yB#r__MDl3*mfIx}{8>mj$0Tg?D~Vvbo5C zDNEi#A1rf6mihv+zJo~&3HD!g~LI9}8KxR8>{B;L}w=zq$xlP+7}6=!2Hh z7q;(W1G2t@Neoo|09wJaM_?bz6B&3oy6sVg<$nzXrrkAKJV z{Ps#19BM7^Q-F-`xNJ002ov JPDHLkV1kdzDrNux delta 452 zcmV;#0XzP-2H6B9iBL{Q4GJ0x0000DNk~Le0001B0001B2m=5B0M$l^3IG5AGm#}X z72U-`jQ{`u0d!JMQvg8b*k%9#0CuJ23TO7>3Fad?(({ha1^(7kElzsst|Z>b2!_tj|k6?}E@%uLy|8G%}ecU4Kzl zdB4d=AY}mJl#)@9Xs85H9xHwtNQ;Ri-+=1Dw5{3`NPOIKqhmECvWWGc>aALaiQ6xS_qb}nz%8wNW5J}Lcw zUdm$3&n2tt-)eoV>hnCyvDswErG1wBiHDm