From 399b537052e926289846a9f889605b0cda9ff7dd Mon Sep 17 00:00:00 2001 From: keslik Date: Mon, 3 Mar 2025 22:01:12 +0300 Subject: [PATCH 1/2] Uniform --- Resources/Prototypes/_White/Fluff/fluff.yml | 12 ++++++++ Resources/Prototypes/_White/Fluff/sponsor.yml | 6 ++++ .../sho_form.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1321 bytes .../Feda_Plevajecki/sho_form.rsi/icon.png | Bin 0 -> 530 bytes .../sho_form.rsi/inhand-left.png | Bin 0 -> 734 bytes .../sho_form.rsi/inhand-right.png | Bin 0 -> 730 bytes .../Feda_Plevajecki/sho_form.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 44 insertions(+) create mode 100644 Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/icon.png create mode 100644 Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/meta.json diff --git a/Resources/Prototypes/_White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml index 0edfa0e7f2..f202a5f4d1 100644 --- a/Resources/Prototypes/_White/Fluff/fluff.yml +++ b/Resources/Prototypes/_White/Fluff/fluff.yml @@ -1235,3 +1235,15 @@ sprites: - sprite: White/Fluff/Feda_Plevajecki/shark.rsi state: shark + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitAOI + name: Униформа АоИ + suffix: fluff + description: Форма соответствует стандартам современных военных подразделений, предназначенных для боевых действий в засушливых и пустынных условиях. + components: + - type: Sprite + sprite: White/Fluff/Feda_Plevajecki/sho_form.rsi + - type: Clothing + sprite: White/Fluff/Feda_Plevajecki/sho_form.rsi diff --git a/Resources/Prototypes/_White/Fluff/sponsor.yml b/Resources/Prototypes/_White/Fluff/sponsor.yml index 225c30822e..e10ae9c1ef 100644 --- a/Resources/Prototypes/_White/Fluff/sponsor.yml +++ b/Resources/Prototypes/_White/Fluff/sponsor.yml @@ -469,3 +469,9 @@ id: IMercuryITie entity: ClothingNeckTieIMercuryI sponsorOnly: true + +# Feda_Plevajecki +- type: sponsorLoadout + id: Feda_PlevajeckiJumpsuit + entity: ClothingUniformJumpsuitAOI + sponsorOnly: true diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..11b9231c3f246f19fbe5e67190d0a40a8a3ca23b GIT binary patch literal 1321 zcmV+^1=jkBP)VoXy`#NQapGtXnGTZ_Ta@PkV9B$sUpKB3^U{~pqMaRlH1qIB^BavX3bC&qGDGzen= z;d`$9oX7`|`VnTNa!a9h`o&mtgS8sq>SzUy{%|ot1MBT8t*W^QZ7-R8b^ABDtm2p znZ1n%eam;UR)g2xoCFXnOI6l4YpAmzjsEG^JwAHxG637PeS$DXUQa$=AQtC+p6mvR zd?|aowtwn-5XQ*s0cYpg!9WD0gANDrApmc@?s4mjFL}E4kZ*q60$|cT34Y3bgODH; zV*ps3_mdfy1i9bd9rqcc>vN(;v%>?_+18cc z_bU*D@u?Ym>+O%vye2QCpDm46jW?06QwSy4uI&Tx{dc!bZXXDF6Rb@@5XShP%gdKd zg7A1Oohi-}i}QZ+IchXJDnm63^ovXax)~*lkMh*`DFxEkpBE`gz)QwdJ#?VG8kB;f zMw1|n6J<;lFoiUJP?9q}KrS@Wkj4W}5XMPr>UDjdkY1-0SwecFiF~6Vm={cDFUv@i z=V`})ELSfo5atQ(7|^T4?6>qB6ul;(upkJ%kF|95Kvu?}@>a-FL3AvQ#B%xWa@0SQ%HmBQ7bW8j_E?1fO^zoZFQOT z&02C+FOSNKf|MsuhE?5kp&bNeON@%54@J7kRNHiPpzQ&YecyB2n~{F@4d)2i72DFnYJL;0;ch2v>#ww0oxdQ0*nhG)6z3<44Qs3dxeJq fL;ng4Jpum#Ky_~|j|;jv00000NkvXXu0mjf$a`Ns literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/icon.png b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9d7b9a17d595da42e976cc8b681b4074d87fb765 GIT binary patch literal 530 zcmV+t0`2{YP)0Wdz6)9F-<$EO$kR-1SUUca-Vo#LJA2d7se08tBW?wH;wU&;@bpX+Dt&`zG$7fbSlPS?OJ>XL@t2;)|#7iZO-`K#D2Aoe;=$3 zVgNIGjW8JBI{+3Why~#jE-(;IK53_*sZKl^3G4!Kuf8gJ{yz``ga9Ex2+(tYSJ>Is UfK1nUBme*a07*qoM6N<$f-~3RY5)KL literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/inhand-left.png b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0f1c206fda86195058bcbb16b8722fac07044598 GIT binary patch literal 734 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|V0p zPZ!6KiaBp*8FpVzkT_m1s;(JfquLT=Wl<3z({k-*|APk_?UV06+}BXl-TmM}#pWWu zrsg7!ytNMk_|6?v{IW#E=EcE>zpP9$FVEWMd0)L!@5^6b-%Eeq&#%9?=lx}yaKmF8 z&c<9eThPnxaJ#`wk0F=&)((a(ycv&~F5nP6dyT!|ZrFo^d*{AbocYVNfy==_#{awf zZzCgH{VS{n3-h%0%G;m6UU%H8LE!S2?27IAmp-hjvHvM+?rR{E&U^64dG?I$uXx<1 z&wi!r`b03}m+7swRa+$MPiNg)Yt=12*)iXbTg@@$YILg$gW4`@-u0(0ew6e%)e)P13-*w4Xz1HtgV!rEdga7@1MbD?5znuPi&Nsfw-|LS1y=CKFKlSH2 z*Q)dLOK!Y<^YPPz)~WZ5RNNe%{+%w&5GT8b?ZK9Ei|w*<{=d(7yzX3k(UxrDUH|XLv;E0tRm}nU2D?P&GB9dwTf6ai|GPsuwSFpb@=IJ? z-XFdmpZ$NrSB{Pzw^9ZlwGHjxXEXHti`nohX`15N?L4mq1=h19rqvvLv25yssc{ph zDscGuSiV%<^wqvChT#_5mO{o1=?lkL7vwrfpR`&~Aa>6xcge=D$_GFqvxCks-mRN3 z``c7`#!2?IlXrY#e1aBH5eXje_|vLRM|U}CFm5cX$x~K1&*ZjAcD^@5<+ODi+aDKK zvMl*s?&-1h@o5Xru5IT}OE7S3JAd?_^AZo0+aH(4vNb=f*mbGow|Fu8>^j}AMjF@T z^rcpQ+nG|mC*#_-^Ov_AU(2jvof^w}A48#W3CE!h(0 zBj~ZvLt(D?27!YjntZ(N3ksY(ti`r(UT3_!eDn50#*fdg-!(h+e&w^9<FeqH*d~&St+i$C6UI&k%@{gQ*57fe%_Wa09qitX%*#(44i&-}S7?i~tO=yYDQO{}4@I#T_> z0gkIOW|n&!7FABUr^MV+bIVfr$itJSvjUxSw>SFa8)rTE@I=bPRJ_O8xteuJ^z!Gi zHUEFg&whU^A}{~JNz&GL6%^eg6F z_ZElb|BI4rjFO73-_2pO?)zb@Et=dtU+VsTbl<%!wShX>UGX$}fcf-e=fYvCs9d;E9 zniyZz{Zi$Tlh`N9W+1Vnw|)NeL;g)Uj5&K4QHWJi0U`0is&D-aiqvNu-a2Wg;4#Su zQ77++1T)8I&y)_1lG8u5ZPL$TnM*##2Y}Lsp<#^Iy`H&AtYV+^Mzh)EO+DLOR8&C3Olw=J<>Yqr^lB6>^@Te433B$ bc*Zzwf${8e^@)nW#LD35>gTe~DWM4f7;-=a literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/meta.json b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/meta.json new file mode 100644 index 0000000000..605553daa2 --- /dev/null +++ b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Delikoo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 6afe9faed0d92bb9bf35615f7a7b6ba50a29be4b Mon Sep 17 00:00:00 2001 From: keslik Date: Mon, 3 Mar 2025 22:35:00 +0300 Subject: [PATCH 2/2] markings --- .../Locale/ru-RU/_white/fluff/korzinka_.ftl | 5 +++ Resources/Prototypes/_White/Fluff/fluff.yml | 19 +++++++++ .../Fluff/Korzinka_/dogears.rsi/dogears.png | Bin 0 -> 948 bytes .../Fluff/Korzinka_/dogears.rsi/meta.json | 40 ++++++++++++++++++ .../Fluff/Korzinka_/dogtail.rsi/dogtail.png | Bin 0 -> 828 bytes .../Fluff/Korzinka_/dogtail.rsi/meta.json | 40 ++++++++++++++++++ 6 files changed, 104 insertions(+) create mode 100644 Resources/Locale/ru-RU/_white/fluff/korzinka_.ftl create mode 100644 Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/dogears.png create mode 100644 Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/meta.json create mode 100644 Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/dogtail.png create mode 100644 Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_white/fluff/korzinka_.ftl b/Resources/Locale/ru-RU/_white/fluff/korzinka_.ftl new file mode 100644 index 0000000000..c311f22e15 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/fluff/korzinka_.ftl @@ -0,0 +1,5 @@ +marking-Korzinka__dogears = Собачьи уши +marking-Korzinka__dogears-dogears = Основной + +marking-Korzinka__dogtail = Собачий хвост +marking-Korzinka__dogtail-dogtail = Основной diff --git a/Resources/Prototypes/_White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml index f202a5f4d1..7886765ed9 100644 --- a/Resources/Prototypes/_White/Fluff/fluff.yml +++ b/Resources/Prototypes/_White/Fluff/fluff.yml @@ -1247,3 +1247,22 @@ sprite: White/Fluff/Feda_Plevajecki/sho_form.rsi - type: Clothing sprite: White/Fluff/Feda_Plevajecki/sho_form.rsi + +# Korzinka_ +- type: marking + id: Korzinka__dogears + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: White/Fluff/Korzinka_/dogears.rsi + state: dogears + +- type: marking + id: Korzinka__dogtail + bodyPart: Tail + markingCategory: Tail + sponsorOnly: true + sprites: + - sprite: White/Fluff/Korzinka_/dogtail.rsi + state: dogtail diff --git a/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/dogears.png b/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/dogears.png new file mode 100644 index 0000000000000000000000000000000000000000..874681cee30da33a92f879518d03aa5ec0a84088 GIT binary patch literal 948 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9GG!XV7ZFl&wk0|RrK zr;B4q#hkZy46|-0NVIFrD zcO&%orI|Bhx9Xc8z8tp6^5iPR{qufWvrpJ21Drvn64`NcWyr8zSR3`E#q$*#sB~K!zg~XZ+dk9?_an7>^iUbgSx94`w zjgPmhEwejb8^3!`{oLmQpMJgG_3cEVyo1zt#v_6a7EA)}439V*WEeY?846hx`WQ$M z+$ir*WA~f!$n(t*hSsd}bqwE_H^?{qWq8AWpuX)l*+#=$=EYu6d#`kHp8kzw*E8$W z>Q*wi-JSP(&arEm^CLRqnLe+c9k11pcISpof1HlGh03#V^Zg+VrMiwcLN~IdZauNK zwlM5=SYNJF-2V!Tf}`^Gv(N1bzchtwL4@0ct2_7~#M`we&)R!^(h4WTAKz15+eJRf z^ktd>y#x#(vVsKWZVrbz(gQu&X%Q~loCIDODm+b%m literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/meta.json b/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/meta.json new file mode 100644 index 0000000000..71b5cd7188 --- /dev/null +++ b/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "copyright": "Provided by SHO", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dogears", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/dogtail.png b/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/dogtail.png new file mode 100644 index 0000000000000000000000000000000000000000..ffa6cbb6ed7488013b3be42f14fb5181d26783a6 GIT binary patch literal 828 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9GG!XV7ZFl&wk0|V1L zPZ!6KiaBrZZp?}blxg_*Usuw~Wr>;hLTBcM(N;@l=RZ(-YyCx3<`)a!KBxJMyzd`a z=sZ1V(xW6!Mneyy6l>W~7be<@nc$(|a-RcNcdmtkruLjfB@ zI=zXl%o6{UFS-$ky(k~towF*Ed4F}&+oOgudkc>=c<9pezrrB409L{kWJjV$6(X^zy5uFIs?#QrPXt{ zrO7Y(BDHI;U(c_>UOHAzj<5$1duKZYkEug3@`g1v(!A!r^LE#U6RP&~<@9RFNZ)S7r{{HLi4WF|W zC~+@P@6}&lKhz#OeDK@(Em7;T=dXP|x1@O5MAO}zdnf00bp&O5tbV#{md|qQ_gB0a z?(5edJ^gs`j*5CQpy;>B8-P02Km79c^_rW!C+x28x1AMteBtkW)rQ_Fn;X?_td*2p zpX_be`I&$2-7p5tM;~u7Ssp)KeE!IDnbmrhyE}ijuUmMPzj3zs{u9w3(muP|Gf$aQ s|Ki_XJBB&&%nx}O&M`bdBkGu^&hk0`Mq#ltFgq}Ky85}Sb4q9e0K|_?`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/meta.json b/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/meta.json new file mode 100644 index 0000000000..055d0cd223 --- /dev/null +++ b/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "copyright": "Provided by SHO", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dogtail", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +}