From 4d4e2ef3196b9143e0341862df1ef11575fcb619 Mon Sep 17 00:00:00 2001 From: HitPanda <104197232+EnefFlow@users.noreply.github.com> Date: Sun, 1 Oct 2023 21:55:21 +0300 Subject: [PATCH] [Sponsor] M4ury fluff (#460) --- .../Movement/Systems/SharedMoverController.cs | 9 ++++ Resources/Prototypes/White/Fluff/fluff.yml | 48 +++++++++++++++--- Resources/Prototypes/White/Fluff/sponsor.yml | 19 ++++++- .../Fluff/Maury/choker.rsi/equipped-NECK.png | Bin 0 -> 290 bytes .../White/Fluff/Maury/choker.rsi/icon.png | Bin 0 -> 627 bytes .../Fluff/Maury/choker.rsi/inhand-left.png | Bin 0 -> 222 bytes .../Fluff/Maury/choker.rsi/inhand-right.png | Bin 0 -> 224 bytes .../White/Fluff/Maury/choker.rsi/meta.json | 26 ++++++++++ .../hoodie.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 903 bytes .../White/Fluff/Maury/hoodie.rsi/icon.png | Bin 0 -> 437 bytes .../Fluff/Maury/hoodie.rsi/inhand-left.png | Bin 0 -> 577 bytes .../Fluff/Maury/hoodie.rsi/inhand-right.png | Bin 0 -> 561 bytes .../White/Fluff/Maury/hoodie.rsi/meta.json | 26 ++++++++++ .../sneakers.rsi/equipped-FEET-body-slim.png | Bin 0 -> 432 bytes .../Maury/sneakers.rsi/equipped-FEET.png | Bin 0 -> 432 bytes .../White/Fluff/Maury/sneakers.rsi/icon.png | Bin 0 -> 284 bytes .../Fluff/Maury/sneakers.rsi/inhand-left.png | Bin 0 -> 288 bytes .../Fluff/Maury/sneakers.rsi/inhand-right.png | Bin 0 -> 291 bytes .../White/Fluff/Maury/sneakers.rsi/meta.json | 30 +++++++++++ 19 files changed, 150 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/White/Fluff/Maury/choker.rsi/equipped-NECK.png create mode 100644 Resources/Textures/White/Fluff/Maury/choker.rsi/icon.png create mode 100644 Resources/Textures/White/Fluff/Maury/choker.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Fluff/Maury/choker.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Fluff/Maury/choker.rsi/meta.json create mode 100644 Resources/Textures/White/Fluff/Maury/hoodie.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/White/Fluff/Maury/hoodie.rsi/icon.png create mode 100644 Resources/Textures/White/Fluff/Maury/hoodie.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Fluff/Maury/hoodie.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Fluff/Maury/hoodie.rsi/meta.json create mode 100644 Resources/Textures/White/Fluff/Maury/sneakers.rsi/equipped-FEET-body-slim.png create mode 100644 Resources/Textures/White/Fluff/Maury/sneakers.rsi/equipped-FEET.png create mode 100644 Resources/Textures/White/Fluff/Maury/sneakers.rsi/icon.png create mode 100644 Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Fluff/Maury/sneakers.rsi/meta.json diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 7d5e24a15b..9f854d674d 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -451,6 +451,15 @@ namespace Content.Shared.Movement.Systems return true; } + //WD start + if (_inventory.TryGetSlotEntity(uid, "neck", out var neck) + && TryComp(neck, out var modifierComponent)) + { + sound = modifierComponent.FootstepSoundCollection; + return true; + } + //WD end + return TryGetFootstepSound(uid, xform, shoes != null, out sound, tileDef: tileDef); } diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index c9f6ca588a..6039acf772 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -51,16 +51,52 @@ - type: GiftIgnore # Maury +#- type: entity +# parent: ClothingUniformJumpsuitChemistry +# id: ClothingUniformJumpsuitMauryZ #Should be ClothingUniformJumpsuitMaury but i`m retard and lazy idiot +# name: Rupi's chemist uniform +# description: Обычно NanoTrasen не позволяет сотрудникам изменять выданную им униформу, но по отношению к Руперту они проявили снисходительность. +# components: +# - type: Sprite +# sprite: White/Fluff/Maury/chemshit.rsi +# - type: Clothing +# sprite: White/Fluff/Maury/chemshit.rsi + - type: entity - parent: ClothingUniformJumpsuitChemistry - id: ClothingUniformJumpsuitMauryZ #Should be ClothingUniformJumpsuitMaury but i`m retard and lazy idiot - name: Rupi's chemist uniform - description: Обычно NanoTrasen не позволяет сотрудникам изменять выданную им униформу, но по отношению к Руперту они проявили снисходительность. + parent: ClothingUniformJumpsuitColorGrey + id: ClothingUniformJumpsuitColorMaury #Should be ClothingUniformJumpsuitMaury but i`m retard and lazy idiot + name: красное худи + description: Любимая худи Рупи с шортиками. Довольно странно, что NanoTrasen разрешила ему в очередной раз видоизменить свою форму, хотя и с условиями. components: - type: Sprite - sprite: White/Fluff/Maury/chemshit.rsi + sprite: White/Fluff/Maury/hoodie.rsi - type: Clothing - sprite: White/Fluff/Maury/chemshit.rsi + sprite: White/Fluff/Maury/hoodie.rsi + +- type: entity + parent: ClothingShoesColorBlack + id: ClothingShoesMaurySneakers + name: кеды + description: Крутые высокие кеды некой дочерней компании демократической страны, которая производила кеды с XX века. + components: + - type: Sprite + sprite: White/Fluff/Maury/sneakers.rsi + - type: Clothing + sprite: White/Fluff/Maury/sneakers.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckMauryChoker + name: кошачий ошейник + description: Кошачий ошейник с колокольчиком. Мило дзынькает и выглядит, но Рупи не даст вам его на себя надеть. + components: + - type: Sprite + sprite: White/Fluff/Maury/choker.rsi + - type: Clothing + sprite: White/Fluff/Maury/choker.rsi + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepJester # YouWellLeer diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index 49770204e1..c40ff7d523 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -12,9 +12,24 @@ whitelistJobs: [Captain, HeadOfPersonnel, ChiefEngineer, ChiefMedicalOfficer, ResearchDirector, HeadOfSecurity, Quartermaster] # Maury +#- type: loadout +# id: ClothingUniformJumpsuitMaury #Should be ClothingUniformMauryLoadout but like i said i`m retard +# entity: ClothingUniformJumpsuitMauryZ +# sponsorOnly: true + - type: loadout - id: ClothingUniformJumpsuitMaury #Should be ClothingUniformMauryLoadout but like i said i`m retard - entity: ClothingUniformJumpsuitMauryZ + id: MauryHoodieRed + entity: ClothingUniformJumpsuitColorMaury + sponsorOnly: true + +- type: loadout + id: MaurySneakersKedi + entity: ClothingShoesMaurySneakers + sponsorOnly: true + +- type: loadout + id: MauryKolokolchik + entity: ClothingNeckMauryChoker sponsorOnly: true # YouWellLeer diff --git a/Resources/Textures/White/Fluff/Maury/choker.rsi/equipped-NECK.png b/Resources/Textures/White/Fluff/Maury/choker.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..8801650895920afcf244af54c27b8bc9d6c7e58a GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|4tcsbhE&XX zdrOh8*+HQ7;mX#K9`zZe-FLMMbodzDAImuebg(tf(sIe1WwPbwq)+v2YaYE_Q=`np zz)%o0J)ZrBbEvP2N{d46bx(U9Bj4aXyVo$r%}v(Wv;ENT{{OqHvsPtYH<^0d=J?!y z6MMF9Ub=SC{(p%kiW@hUJ(mSq4+RbX!z%JuWxX~(zv%^Q=DbvX$$cBOKWy8iGha+4 zDfFp#^vwwC+j^-v#;)S4wdAwYeLYq@VFc@KsC_r@t4H{4z8H`X`BEc1(|mmyw18|5 TsM(i-Cxcj?u6{1-oD!MPx%6G=otR9J=WmQQOFK^Vq=iG|M2q()^~O{5YLBsV=2@(o0K=*?dJ0`(%OM?Ztd zd;t*;egY4AEO_t|NDoqIAz&P+jk}v|qZtp$Y?HXV*=jsB54_BucW0hw-}l{_g(a3) z;-aIF_dy|qsnzNLwA-I^uUm)!A%t076#$%^L;%=vrBVYx>(03CE==5%0Bb%x8 zC>BDPV(}7EDjY}A?+5sPkGGp^G#aB6c{?9DZ8f>M*_;afJaU**gm4xK-|xlbTh~@- z9|Y{~j*9fO)dZmRYz?hD1i^7Ga+p(ulOo1#d`7(A8v>)SH+T)elUHBS+CSH2^jA06 z&K+sG{UYCg{N%1zO5T>Ln`LH zy}6M0u!9Kmg$J7+FQ2gH!dEK?qbReJ9IoL}5lgR4_p9QUig*?$2GqdNFgq&y@$@yj zR$uvkqMluSx7XUe{ae4Ec#sl4GyDFr-!-mo>bp_c}sBqQW52%JOHNrE^*Ox&H$mRfP0)k7ylR=cHtDnm{r-UW| DY;jOu literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Maury/choker.rsi/inhand-right.png b/Resources/Textures/White/Fluff/Maury/choker.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6a70cc715dba1b46dbad1703cb32fcbc271780b2 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|8a!PbLn`LH zy}6M0umcZkz~c>%mrqzT;j5K{Rh0Qj4o7j3l^YH`h}p}o8~MxZuOLtd1B2kjDCzxY z(k9LOSzY<Px&CrLy>RCt{2nz3@?Fc5}+3yF(|GL0u zs~0$^>yV+03P+B9TMESJzk3mhr&^<^ zDx|v3nq5_3tyBLBz<*v;)o4z*rvI(_<*(W5MYMje6iBtkt}3pEA8}9#c2(hx9E&#n ztzP)QA^M#T2p63k7C`Oguzjt61v7X(=+bWztKTaEc2$9AoRhsh;h+)}RfVtka`8&} z`HXY2tBO9;_NGlgWQcxetmLrxj^Av9W5;pkxfTgr{Z0pj_xg|wrC<1f`WISa{_Z#~ zvGZ`o_1*^nulW`G`B0|Nk6x~S+H>sCPX*fndwaUrgaGvhgf=5n)22`TF|Zww!{W&v zqr}EwY<=z`@(6 z`pXW|XE`98oZh$fO~ps+3xXgBf*=TjAP9o+ZxB@=5w>qp6w$>{d)NgMbOasXVuXi6 zU!2YkftMNq%PW%T?SMzj96gTC@cQVPgv{J7fMXY0~FRe^}0=4xUf=y1j7`d;)PqY)@gkz{L;R+F3JhL ze=-WGM*ainKB=9GHchf^vcu7k70iXVZ|Q_kYi~~%3n3SF?1qI()TY9uTalpz6-~ju zF3L+a2ls%O?SLnH^da_$*(4=#9Kt(KZmr`k#OxFZ^NY$>J_;&{3GLy|G0J_5Lh@Fu zU`9(hc7;f|^`sP7syQ;0lUIn44H-&*{}0n}1LL?hutTOR@2B1cPGLi=!Ees#2h0`A zC^kfG;hJ>Px$RY^oaR9J=Wl(BBZAQVLp1l(BZ(qHhDDQlIfYks>^<)KTaO!!rF zqPv}1(MU1+FBTD-e1oQuf}=kJaKiI~3?o1#3!Z()9?J(dO8enYL-JB7jB}Jq0Z==` zt180?gmvRwbP-WkP%1_3OtASDjTF?*gd$_OTflI7=q-o-l$Y~c@z|z}a-epG1Fbmv zGmR7&=Xm33G!Ff7pcS<)*lw~k110O07)RI(VwDp`aFDwSjhPIx~3_pD@7L^sPHo!0%kV66?o zt5}j|k^@?6mdj&v z&h!=1+xve1$2*@FAGPv#fq`XbS4ri5TK^$`^BT9=Vs3Tasisv$+6jkkp6Dr-FPBo$ z+2v@lTEV;}+ACvn4CAz`FHZ6TUA_irokB@y%CYdp>f2clY?HFxDS9D2uy@`QhKR6! z^_{FbtB+4!yJ=OGj*{3vCMIS7-Je^Yw*h0GFEzq5&DWPf3&`dGVi33#JQ+lJy85}S Ib4q9e03ed_uBR;D8T@Oc}i@Cj)@(c^Uc1eTb=oLZw|LHU%&UGb@kVeOC!tAZxO%m zSDj|3FL16#VLd1BIfIaOPw&OO4|{(vu6$~Cq^We?*{44*%|EzyXUf$aHskY$F0(v1 zy-H_hN$Xjlq*&UiJ1Gny>z0<7ww`5-FqM|8{QWuj!Dl9RWB#YSdcIGixMqKTvJGhF z!pQGx@jJg=SNkGs=bu>Y75@3cnw2r9C*Kab@h9P)zUhOB+qq?AeP$-knB6nec<;&S z>*S8UbGCnfCuR5DZ#(;+@`^eBzaTEd@K0Fc>J!`f<#~2ynfBi|?m2vwvFzx%@EaRt z|DLb0n{U1>f?Yh}2fy8C+3DcwE1fgJ}$dYS@eS&|&EmXGl6|QOSomjiFv?tm1ZA6yr<6xKh z4Ogs=ZCsS)0OpAw1oPH6OpiMLW5x?skG07%+P}C!CX`;<8_FK$@^5ze$<03L2Lkr| j1I9F8YJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkKMalO1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Maury/hoodie.rsi/meta.json b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/meta.json new file mode 100644 index 0000000000..3812b62b67 --- /dev/null +++ b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@.m4ury", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Fluff/Maury/sneakers.rsi/equipped-FEET-body-slim.png b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/equipped-FEET-body-slim.png new file mode 100644 index 0000000000000000000000000000000000000000..7140f3cf10941771fb0c20fffa050e561d78767e GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z13XlF$>UT>T&L?r}ah-MWI=eDm8wp$i0F9J&yu={V8Pe6GpV zNC`vDt?!u`O&`}xE{yrRp9N?#1pMKiYt`Jo_`Ok-S*nYWre{LJ&{<-`xw=u*tOn#NV&ggbj?7hbu!W|}+-Ci`;bVpG| zbSlF$>UT>T&L?r}ah-MWI=eDm8wp$i0F9J&yu={V8Pe6GpV zNC`vDt?!u`O&`}xE{yrRp9N?#1pMKiYt`Jo_`Ok-S*nYWre{LJ&{<-`xw=u*tOn#NV&ggbj?7hbu!W|}+-Ci`;bVpG| zbSnBLFzZo8s>YA&mYTHFi(%3J9C!Bg%uLcCP#|17B>qD&D?YU z%ClR$U$ZN;2sr(*&Oh@=!|!I_?sr|k*M0_CCaP^({`%bVw2*rTdonG%g3XqtD!rYh zc@5}(pDBdMw44&%RIFsXtJ5)jtJihChl}4c*3>o4e80Q)__GhD{}-^m>3sEz ziQ&X1)>T>ki*8gg1WdC&_xWtJ48x=p%d_zUP8^DLFF6;cgkM^6%~lWS55Ck0&op0O Z1}z|)1BgN3Qt)ID<>~6@vd$@?2>|7IaAp7i literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-left.png b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9c9db1d8793b633f9e5e373933ac16edf22587af GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|4tTmahE&XX zdvhb#Ap?=thrya&g1Jj&=d}3MezNQKzQ1ttg9{6;ZIw_LeHqa1t@xupc*kMS9g_Vl zK)oPPud<2DYxAM~=eB2ydtNG<`a>nM{_L}JvwDm7`fomDeSN?DeUs%EbKb4dRGWQA zv|8V@KXHP|zpbt^-jnq1R(`TOy(WG}i^cWd+xB`-I#smT=Dypckn8U8q3suI*6Bd3 z0Fn=sZ&YcXV7oafv{~lKG#%+D3gQmUJPZs84>$w%_MS?5CVUF0iZ3<7GtJkRK?}&{ Ufa<*zJQ>9DboFyt=akR{0L_hTAOHXW literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-right.png b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..27f343e931246bd7c0d9fe7170c4ea7e8a99e759 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|4tu&dhE&XX zd()7+$${bM$8-I;d++Z12Q@Q3tjL+VZl%JyhZ>yg|LuQS(QNbX&O8>N zRuHIHsS;flnfLzr=as!GnO5F8lg`ZFWGK01v*BFd&3B|O+uB84uU40yTyAZ>ebXuP zuu1D`^-u0S>nYq%H>%|@=y*a(w;I%db!vX$XjL$Cjo=S`OkOox9mm1-j=IhI# X1!QwTwO