From f43c530c4625c5caaaf3dfbfdacce45fb2752b33 Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 7 Jul 2022 20:27:27 -0400 Subject: [PATCH 1/2] Merge pull request #13287 from ZodiacShadow/Zodiac Nehi fluff items --- .../loadout/loadout_fluffitems_vr.dm | 8 +++++++- .../vore/fluffstuff/custom_items_vr.dm | 15 +++++++++++---- icons/vore/custom_items_vr.dmi | Bin 66592 -> 66596 bytes 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 079b05c4e6..c3af5a25c0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -1286,7 +1286,13 @@ /datum/gear/fluff/nehi_radio path = /obj/item/device/radio/headset/fluff/zodiacshadow - display_name = "Nehi's Radio" + display_name = "Nehi's 'phones" + ckeywhitelist = list("zodiacshadow") + character_name = list("Nehi Maximus") + +/datum/gear/fluff/nehi_health_medal + path = /obj/item/clothing/accessory/medal/silver/fluff/zodiacshadow + display_name = "Health Service Achievement medal" ckeywhitelist = list("zodiacshadow") character_name = list("Nehi Maximus") diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 9379d654ca..cdbf8dc582 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -345,17 +345,24 @@ icon = 'icons/vore/custom_items_vr.dmi' icon_override = 'icons/vore/custom_items_vr.dmi' -//zodiacshadow: ? +//zodiacshadow: Nehi Maximus /obj/item/device/radio/headset/fluff/zodiacshadow name = "Nehi's 'phones" desc = "A pair of old-fashioned purple headphones for listening to music that also double as an NT-approved headset; they connect nicely to any standard PDA. One side is engraved with the letters NEHI, the other having an elaborate inscription of the words \"My voice is my weapon of choice\" in a fancy font. A modern polymer allows switching between modes to either allow one to hear one's surroundings or to completely block them out." icon = 'icons/vore/custom_items_vr.dmi' - icon_state = "headphones" + icon_state = "nehiphones" - icon_override = 'icons/vore/custom_items_vr.dmi' - item_state = "headphones_mob" + icon_override = 'icons/vore/custom_onmob_vr.dmi' + item_state = "nehiphones" +//zodiacshadow: Nehi Maximus +/obj/item/clothing/accessory/medal/silver/fluff/zodiacshadow + name = "Health Service Achievement medal" + desc = "A small silver medal with the inscription \"For going above and beyond in the field.\" on it, along with the name Nehi Maximus." + + icon = 'icons/inventory/accessory/item.dmi' + icon_state = "silver" // OrbisA: Richard D'angelo /obj/item/weapon/melee/fluff/holochain diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index 1f3fb6cea72b0ddd0700b7c0edc4f3837227c63a..76707a55fbe5f3aca0ee7b608e8a952bef220f4c 100644 GIT binary patch delta 1318 zcmV+>1=;$bhyv6DtaWv~bew8ckKqA30--?Kk|{QdGX zd;aHTen96Hnd~Xs+%4y`UWp*Hr)<5N&m^i=hT|VTK)~!N`}U)Mvth{o4G{3#d?u9h z*;7``XN`jnkH4STR|4~{Y$`|QI=Pw81Zo(vr>w|}yvQ#^!6}H@m`MuWQpldNqR5NK zsjLLokr}#I(%L9@UB$y_e6`Gr@pHb03Pj60#0prv5=8cS0fG_3b#OIV(>A{l^I)x1 zChCzhSnumpviejrV?1jU<|2;ykI?5G;?O*EAM$nUS+f{vQk5sGwziJEDt96A6WU1dlSmI*$>5ua)n~@p{2gDF;hw@eAUB zhQAw)hPHgGsbk5V)T+T{B3C4GD?Uf%t4pDEqVkds=rj!M865G7-dM!}JBvQZJ%3)6 zqu$hD_{4r9({A7y&R;=|Z^}9tI^e^>qA4Y5KE~8xkfcdP+%PG+A9ZiLoX;Hg%7}{u z0oLy|@1uZ!olT1VPq4(!hDZtgdY~!EU_=+tRczp{^Ys^54?<`>GZs0uOM!Efn*@_} zN7$ij(bT*fcF?7i@?*2YyGl4{$(4fmkPA-Lte6Fb_)ubU{vTCWk4_F6v zz%p%r^!ij?4yZNt>3pU4H)wAiCd?-%oE(^27H{{?CIsM#cc4r~J>Sb+N<_N4s}cz* z?NUA8|6NLK_^#cmrWsml`5|sZ_x$TbaAbDKmqCdjDlmd?a6sdm@_l@m{++})DoyJ_ z&v`!gIVF^7%i0m|vI)zN8xxq1(?*l!&$l&yAz_uR@seEN)k)GmpeudY8y_H{uAayx zzyFbqY=4sLmv^gtdAGVET-;!&_zgn=y)09b`6pQNDWoUew908O6>7flobdBuJ3?DD zTD3Ch!6dx5P2fesgV7GnyTYVtW<(R`naV+pu6zR{(3L(&@RINAThaoJ4^EkcGg8=p z#S`UuZ@K*{mXI{zeea+qt%08kD(Wh99&3JX{v=DX(=r>wwKBp>5DD*kUV@-rgAHUC zziQOCS8{Vi&G{nF3{S>~ZN9u4f5zNC{qOQ_atyTw2aN{5E4F-Zb%NJ?h8W@PE%5y< z@Z&9Tk&r(}nne%j6qc3SdwHFGJRhrn@*-c}JxosF;o?2hX$lEngq+BV-X3qFA8w-W zZ=w@|XF~H0*p%iQyeZ9>iYd)^2~#?yE<$G)of49qi;cq5VgVLi8I_9FBe3YK27@?LUmv7&Mq@hY;M cf6spWe9oT#d71wQ&mn+(&;wm|vn~bl{&e@7UH||9 delta 1314 zcmV+-1>O3jhyb{;`{F>_JzQ{X_v~8y-aQwHxdo>*<)7ZMPB3+QSch(Y}_b{!BNZ}v!ck0 zhq0^z-;(Xy7c$0be_6%-V0^vGi{W#=h7x4MJH$y?z7Wjpa{_{u{bg`HTGK9{hy`#? zX*=tYGuRxeRI~$sUwW{Tg+JUX_Byg`OELxf%RnQ3f~DvoAn(4~KqG3D=ppL4uo^EJ zK{`bi1B-f)njBPnUMU%>6zFTrio0e6 z`k88)vv`fB&_Ud8mL)W-ZwGW)8X~EYkKjS(SLZR{l@1+$d0sDg5~_EU7QY~mX!*NQ z8)(F9MJ-G2mC-e>61gIgTk|<8Ur&WLiOK~X(HrR5GkC{KdSw+yY#oNE4*YqQo;q8B z6)YH{PS(^gIr1h{Z8 zypJNbE-CtdKS6=5i!&wg>w%^ug8^MaTe5+>$v0nQ14wD`%-GDSO$E+PZWByaEn$nk zL0j=|*h8CA%HNw6-c`~=LtaSYLoRwr=IV=+PMJ()rRHuF&3iOqfqjIC-$wEZ!ZwO9;Rd??Ky=I=+{iO3ZY17bOx>+EhK? z|4k*feAn)DUH1(&{17*w2mW;;da`@u%b-G#C0NNfIAHKqhi-nD{++})C{61@&v`!g zc`dbVMCFNh*@)%GjSG{y=iAtru*$}N21P#d>J*s}(TfldHbh9Mt0!{B?|)!t zwm-`CtJ`(Hx?NuoF0L?C{Dz^3L5Y-P{s{^`g>+=D3H_{aFN{dSB?7a zLT;W>bH2zk!=v$Gm#=PzpCPx8|GT;!9YbZnLv0}Jiyhxvo!||hAqIGN4SaVE{BR9i zB;?P5X3-;hjiU62pf0ly=VMh~0Fs4)LBD8MVYN^QkxlwprEWn``vr=>Q2poE6z~a@Sm4Pnd zn+ZHt2KtsfACMz9ty`Q3@N3@d7O4wLvuiQfl67YGPL7rK2StYBTv3_4imVnC-?JY- YpR%Wao)`ZC{VITJpxltSvoZzp{`oJFtpET3