From 3e36b02bc271f427cb2d5c7c086066911ee8400f Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 20 Mar 2022 15:43:38 -0400 Subject: [PATCH] Merge pull request #12483 from Screemonster/rainbowtrout improves fishing hars with VIBRANCY --- code/modules/clothing/head/fishing.dm | 38 +++++++++++++++++++++-- icons/inventory/head/item_vr_fishing.dmi | Bin 483 -> 2307 bytes icons/inventory/head/mob_vr_fishing.dmi | Bin 591 -> 2758 bytes 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/head/fishing.dm b/code/modules/clothing/head/fishing.dm index 4ca39f18ab..bcebd89b57 100644 --- a/code/modules/clothing/head/fishing.dm +++ b/code/modules/clothing/head/fishing.dm @@ -47,11 +47,38 @@ "worry about me", "gossip about me", "defame me", + "disbelieve my existence", "conspire against me", "draw me as the soyjack", "put me in their tummies", + "crunchatize me", "crunchatize me, cap'n!", + "wreck me", + "feed me", + "beg to get in my stomach", + "walk all over me", + "drink me like a milkshake", + "beg me to step on them", + "call me Mommy", + "call me Daddy", + "step on me", + "lay eggs down my throat", + "dream about me", + "choke me with their thighs", + "steal my lunch money", + "contact me about my spaceship's extended warranty", + "envy me", + "combo me", + "want to kidnap me", + "fold me in half", + "think my spacetruck is hot", + "hate my spacetruck", + "are more into my spacetruck than me", + "ask me for docking codes", "think of me while kneading dough", + "gun me down in the streets of miami", + "drop me off of inconveniently high places", + "drop me into inconveniently tight places", "leave threatening messages on my voicemail", "write fanfiction about me", "attempt to approach me" @@ -71,6 +98,10 @@ "pursue me to the ends of the earth, constantly thwarted by inconsequential setbacks, and when they catch up and I ask in an exasperated voice why they respond 'you owe me a dollar'", "call me just to 'chat' but actually mention they are moving and, obviously, since I'm the ONLY guy they know with a truck it would be great if I could help out, they said they'd buy me pizza but that doesn't really cover it", "shuffle uncomfortably as we continue to sit in near-total silence having exhausted all topics of conversation hours ago but neither of us having worked up the spirit to suggest that we part ways and go home", + "shove me into their large gaping maw, covering me in drool as I descend into their warm depths, becoming covered by hot bubbling acids that dissolve my body while I play Animal Crossing New Leaf on my Nintendo 3DS", + "promise me McDonalds but conveniently forget to pull into the drivethrough on the way home, leaving me burgerless", + "leave me in the car all alone with my favorite music and a bottle of water in the summer", + "create designs of particularly verbose hats describing extreme complexities and deep philosophical implications of their unusually specific feelings and often not particularly kind thoughts about me", "methodically place brick after agonising brick in the wall they are constructing to forever entomb me in the basement which they claimed contained a case of Amontillado wine" ) @@ -113,6 +144,9 @@ desc = "A peaked cap with text reading '[slogan]'." name = "\improper '[slogan]' hat" + //pick a hue + var/colourtype = pick("green", "red", "blue", "yellow", "purple", "orange", "grey") + //finally, take our hat size and pick the icon accordingly - icon_state = "greensoft[hatsize]" - item_state_slots = list(slot_r_hand_str = "greensoft", slot_l_hand_str = "greensoft", slot_head_str = "greensoft[hatsize]") \ No newline at end of file + icon_state = "[colourtype]soft[hatsize]" + item_state_slots = list(slot_r_hand_str = "[colourtype]soft", slot_l_hand_str = "[colourtype]soft", slot_head_str = "[colourtype]soft[hatsize]") \ No newline at end of file diff --git a/icons/inventory/head/item_vr_fishing.dmi b/icons/inventory/head/item_vr_fishing.dmi index 4f1a875c26fd3058475c1bd1d4270096a6aa1a5c..6092c09b2584c592fdb0bac0debec66a59d72988 100644 GIT binary patch literal 2307 zcmZ8h2~^VA8vi31mI>Gs$HK&Y$t=;zHNn!-hSXffG)oa&n*x-{04PK-WvhkBB_dWEKD=+=Lsb}=>g78_V_b@#9kh7^QZEYgmtYKUi6p^DQq zxorll7F|jxA{LJ*OhV$_Rnt*SvSx9m0k=q(<%6KOBVt34g;-TQlZYyI)8xh*ut>TT zJ4Eb$M4=NBZ>s9=?;j8l5FQ>L931TAMxAL@(GHc|)2%X{L^C+;fC;0){c?mpj-y3(F>BMjop zhe?HRgdzMZoo`3%;&`7=VYW^9`AE*i+jKXV?!gQRm*Z?(YAq9O|6Qw`NF}+Wcr%p; zlACH@r@+k%;_|!qU14rNv_DHH;|1dY;pI&<@wG-1amy$46=vb?l8BMw=4PFmJcJiF z^A54o+k&{$&mtdJbo3$4fKZdSFXdcW?!_}VMZsX7*Hw|*e9W5fhMZ`@)!m5dx2X5u z_{-}KEA=gLwh}MGYGl7flmFpgUcZdo=4Yl?7eZ{wWZuZ_w^+zhY;S3`pUe7x$N!?2 zUp(I%pPH~8vSAeS-y2 ztxiG!*hq7Aa`cWbnZ0@3_qjFvaIVjB-wme_6laEyqpzZ$>e~9ALASp4jEHtLE-Wue zEIjDSk4Pwr*eh#gI6fzQe|3(|kq{bAn%kV>!M_vPVT9GOWQ}fl2q(}c*BnfO-AUSQ zKw9Es3kY1f%9@SuGrrAHHy#7hx>fF_213%U*|GGk&<5v<2jE9w118;L0EoOgLLeW+8`|RQlpgJg^r32K5zRFRd{DJcA>YV@8Pk5 zW+^+w8&APzWyvc3>0VhfYWA*BH6&S0gQwy(Zsv#+MZSqzmC*UQt zrJ!?24RAof={(&Y;l{07$jN1k*B1Jb(Fbm{8z)715vl>E0w_jyx4iM~jzq%qXRMX$R8 zx#@6VaAN8=(SpQka(VZGvPY2b-OwiPtkp6ZvlLxZ=;4OJUECaeDiRj_l+(f1M&+y1 z(6JKRhDv){y!I?8auemy(1?Gj2(a7aji8N>+Qfm2KWGKjVI4r5i)Nmj9E4Pn-e4Gk zw81BKo*ln$R`J;Uq-(4!wnDIF77mk>eBn@}s zA6}L&QLRKs$xgw?PXXNwNK=F z@fDEW=&rW3ft;0mk%p$l@G2GBfSyKoGh^tOri6Ei2Da{WIH?*%n^iE-49dVpe1EJo zOOLNI{+_Tg==FG-nZk@i#e<(Pv{?R7j_Zh>h>$1FmKMHe#b6B2%a4YihzXwJANP9a zuC5$0Fkz-F!8t1sJv=kTeDUDZR{zp$AuLp`X{)K(;hMkv)`MQiH7ylIO4#Q|kR&#z9ZP94)q; z2M@FgcGe1l&?%!pqV~XruB82zqh;MAQ=6!Au;yUe5QvH9f6gg-7S?qwP9oG3_ecwu zm03m0K6wJUSyIMY;CIdqOVE?crc$av>qjbX|H$EwlqGZ6dTLtY63Uj>z7Ai~S68kh zpw`Y*>;$;$(XBW3cRQ@sgUf--U4nt9mG3lc+EQoo9V)@K4|1sfD#?h=4Ej2M`9V%AR%+`ya41IEp{O^fg`ltFAwKN5#}g zy#ec9&jJZ$qwmUn z`9GBK1~>6uPci9*!*RCFii!gFZT)67cLzj8;(|%e0=L%s9q2tI4_bj?`~Ywzx_thw zFas#5QMG5J$by2y)b$q=)wv_jqUNSt^jIl>4)x~B&sgPpS%NhcQH;D^9(&foe)T7C Tp?R}ea_s8t=5+sH(8d1(gR508 delta 464 zcmZn`dd#fa8Q|y6%O%Cdz`(%k>ERLtq#J-ZfrS}Js)wXk0V%nOs`B**4jg!0vOo{W zWh@Eu3ubV5b|VeQnN$@LQR0$XoLrPyP?DLS$G}iACpfI2sPy}n;DV1|pJ;jOYMncC zK6pc@!A0W-k95xaXr5#!>gnBKVH{+9+1N{A&Z9|3CWR;jYwp!BHC=CEzxIejXScEH z<`ohe87Gd;44X1zHdkV@R=uf8+)BZZUcH^+Sx$R`f*(ztCAj{|oQkDlN3^%9C~_6J zP2beCdOo*>CeXdvvr1-JabE^H@2aPZV@O2n+i8Yeha5y)>bVYvNm(SAwMx#=u-HsVwtLJ{75o`H*v-y!rw6*^e`PU>0(z0b)78&qol`;+ E06<2#sQ>@~ diff --git a/icons/inventory/head/mob_vr_fishing.dmi b/icons/inventory/head/mob_vr_fishing.dmi index d057a6fee0d8be9e6f288d62a0a1dc2566b5409d..61401b21eea1db3bd8af17c6c2f8c3b812882172 100644 GIT binary patch literal 2758 zcmbVN3sh5A7QHb8K_xQIC?Z-i)BlHs}dw2Q}C2YyH6R2*sT|w&d#!G)anYiqL z$3jp1f}qvuiR%jsan0VJ#um5&{%*hz0aZHz$sQymBoq`BT)K2AEG#TDGZT$QpL%`# z1T+#X*~iNl5Po_Jb%mu;`~s49geQd_j!H<5BE9HhuseEJ*-j_2ql>eRJQ5<_As_ni{gGRmgW0C694SPrr%vpNhw{vl|`p&tzD=ZAowE z1-BA$XSQ2o-E|9c%wXuq-|JgoL~<@v9= zoZg%HN9;Ad$6Ybq&2ubn|G{#lm^52fR0l&GoAuS^* zEg~W!O=qH0MUlzsg1Ls<$1FO!WpY>7Z!&MxG`MlNcihSqv{HLxJiT=(vkca|1|KXf zTCK}PJO$Y{%>E4cA|3K!KboMqqHQ*H?Ly+>9@!Mw5Q2?;`W{m@uNujNl@6g6;v5a< zye-=}T*D%L&)VXQKiKq9kqTv+3ik7KGxvR>sq<^U-bLMQeIwt(dm@JO+?jA?B2|iS zGPP3z<@hq@0EwvL!hW#mv!DU}GrbJa(f)BrdjVX#;OV^=-B#%lPxd^MOk#};wfs4Y zBG?v)(oQ`Z>+9>wkq|QU=c)DWkP!YH&th539Oc7IdJA1%IbqSQiZ;8RLRS@GLmp`Q z`GbRl{K@%GjV}fU2J##Wmk@&ah)CMxRCBYii5iHr3X-^DFxYYx!u056ShO`$pSATy zFhhp2A;K3?=oB^5TZUerCIKV48jYLw!x=w_E2Qay#X?)&sx$i@Aj;J)L9drGJJbzI z6cK)IR^wbeojOjPgbxpm&khX=#H2hy)gdY^<0Wo{@DohqcXuFibV%K%ZYYEgOZPk_ zk#E-3p$AnO%?JHwh1Kz`Sve{BF`qDB*zO6ap{5_EP$)iuc--dA8~CUI8Eg%nM%kh{ z{-OqJQyfR5_()65&1D$)lZ^zqazBr|RR`NdxPmArOMnRt&Q>GOQil!mmR)A}A=2MK zQ}`QmgH=mz8J5YElSM7{Mu~rh{%;z&|9XzzdRVF+{jU^e3|3hsxA)&sq`SCrzb%T{ zFG_BSpl_4NyJ>W!_bb?|J~V+ZX&TLdUqx|H2B5j49kgJU)_)YnV46nUl`)$jF2M{G zo!~CY_@gwEIHGRQXgZbRjFKa185uJg&qxC5*jt;oJg8mJ(UZS=T_E0-cl$PmX57+f zf@0QC6E|p%vum(ie$UiYOKOTS6J`@Zzi1lCJt!5S1LBN%SV$O(X<_^YzKBDjALC{A zXxEx|{5UF<1C6E@#%M#HpQWj)w2*)|qq9m^!eksvOoj%2=6P!$$oPNm<{)VAKp~W+dHX zl#Xhz!#Ci`jW6f!>SmGRNhDG~&x^!Ilvhgn|Aiamtji-MWF#e}`S#I>?`-QLOQcaE z_lb=wEvjMj+z5?Y)B7O%y^9#;!ToG@&GCg?i>JZsWbz3kauR1eA!4MmtDCmXJQq~)gwjX@!a_n zOK4pOEZa1Z#G@u%6DO6*>(V+cZtQ<3jQn0<^=}nMHp*lPMnei^K8_Hs9}H2y8zC60dkv^mi1EX38E3_Rsfpu;wC;AVN})5(Puq8=Tp$q0wW1OG zNl>UPDiW^77XJ7e$zYTQGb*$eANmhJT1$KRiv>Ye`u_F{4xt~6$YV?!Hc}=Pi^VbF zS+*z`^|6TNK=lZ;lWH`+iXj#;S?kgvn&?5y;PWp@K+w>EsuK=VE>SlA$t zjT^x#fqA?otli|Y;zkl(v0dGaBH+n*9ZZq*QAk4~j+VG7l-Fl*Xh1nOHdgy)PEmSZ nB}?)HNuAU?rc{1(`L0sqcM4*uzE%~J({s7+^x9Fijd<)o>v8tG delta 570 zcmV-A0>%Bt70(1EiBL{Q4GJ0x0000DNk~Le0003X0002+1Oos708-?nC;$KeA(15_ zf55=N^NdxC00001bW%=J06^y0W&i*HlzLQHbVOxyV{&P5bZKvH004NLQ&w zUU7a}iGdOqXG&&KF-V?^Gp#5wHxUa1N3N==DZYDTP0DuL!sOxzTUar@jfBC9u z9uCc`_Ty&OgPYyg-TwU8w(tA%Q`^3D_EYKxDt+)iy><6f>h7mB5a_l0!DhQ1cd+n& zwc33i{D$96^W6N6&F?(tesx{nR#Qap0{{R30KgbS-AeI;Q_Gt0_NQM(gttFgpwb6V zFHm$p*542B$Fe6hmVOKX0001Be@VucHN_83Eo;KtpZ=Tw@b)JU6kN6lbOwQr{QI-; zeyq1YOg{zy0000S)6}x2_`#`VO?dm$f3F?h{^Wszs|0}rI>SK0|IZlRk7fHA{TKiM z005M9dhJhNc>9wDiheIGkU#G>~9jeNfD{3;+NC07*qo IM6N<$f>{j#Qvd(}