From 1551ddc9f0076f533059637745f84c8095de05ea Mon Sep 17 00:00:00 2001 From: Likkich Date: Sat, 20 Apr 2024 23:56:19 +0200 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BD=D1=87=D0=BE,=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BD=D1=87=D0=BE,=20=D0=BF=D0=BE=D0=BD=D1=87=D0=BE!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/clothing/outerclothing/misc.ftl | 2 ++ .../Clothing/OuterClothing/SindiPoncho.yml | 12 ++++++++ .../Inventories/syndiedrobe.yml | 1 + .../VendingMachines/Inventories/theater.yml | 1 + .../equipped-OUTERCLOTHING.png | Bin 0 -> 1013 bytes .../Misc/poncho_sindi.rsi/icon.png | Bin 0 -> 473 bytes .../Misc/poncho_sindi.rsi/inhand-left.png | Bin 0 -> 454 bytes .../Misc/poncho_sindi.rsi/inhand-right.png | Bin 0 -> 456 bytes .../Misc/poncho_sindi.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 836 -> 1113 bytes .../Misc/classicponcho.rsi/icon.png | Bin 477 -> 602 bytes 11 files changed, 42 insertions(+) create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SindiPoncho.yml create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl index 9b78a43e5d3..4c95affe4e2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl @@ -47,3 +47,5 @@ ent-ClothingOuterHospitalGown = больничный халат .desc = Изготовлена из шерсти забитых ягнят. За счет жестокости она приобрела мягкость. ent-ClothingOuterRedRacoon = костюм красного енота .desc = Пушистый костюм красного енота! +ent-ClothingOuterPonchoSindi = подозрительное пончо + .desc = Теплое и удобное пончо, пахнет железом. На внутренней стороне имеется ярлык: smf. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SindiPoncho.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SindiPoncho.yml new file mode 100644 index 00000000000..b3c79a1e625 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SindiPoncho.yml @@ -0,0 +1,12 @@ +- type: entity + parent: ClothingOuterBase + id: ClothingOuterPonchoSindi + name: Sindi poncho + description: Sindicat poncho. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi + - type: AddAccentClothing + accent: SpanishAccent \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml index d1927d9c777..d3b4cbc5a78 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml @@ -16,6 +16,7 @@ ClothingNeckScarfStripedSyndieRed: 2 ADTClothingNeckSyndicateCloak: 2 ClothingShoesBootsWinterSyndicate: 2 + ClothingOuterPonchoSindi: 3 emaggedInventory: ClothingOuterCoatSyndieCapArmored: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 44699a78541..2fce66e002b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -61,3 +61,4 @@ ClothingMaskSexyClown: 1 ClothingMaskSexyMime: 1 ClothingHeadHatCowboyBountyHunter: 1 + ClothingOuterPonchoSindi: 2 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..0f7fd16902ecca31a32a9a2cf6a436d75c137545 GIT binary patch literal 1013 zcmVPx&uSrBfRCt{2nxS*sFcikW?1n55;$F;5dsnzWAaKK`8z~8QVd=m?@7fz3DcNZ8 z0y{p~yHc^{BvN3}3`EKlCAKWfindn2yId_f_V@B6J*m#qP7obTOZjO~<#5Lj@IOZlAb-F*nH|F*9oGXU=?#hF&O z0x*+ZaRq?OPu};X4usOTb<_2w6klnEbn&1W@eO`KaatGN`mp>)YY+G#1B?&?Uxe7X zw=xV`0r;L}$g*rRUbR3ql+gOUhX4S4HUbf23@0Zi+j7%1fMMjAgwXE{f>les3O>5H z%kzCXhQ752Tu{0VFv}J})e?jdRGcFh0yEBW-@|~|`c6aOLLXDwwH}Qhw7Rhgq2Duddc6@XihmEd_@c%_%avAdmeu!QUuO3rw0@@phP0mk@25}eA4}g!z}zAFAMoA}cr?zau71Sk z7&U=X@hi`8zy5Y+`I2UGxZ&cQj~PCtr|a$0s=T;1g=_s jY+L;p#L!G6UO0aM$wFhDdx-b300000NkvXXu0mjfUs=*% literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c04970046b8268f29e8ecedb51592c191f9ba565 GIT binary patch literal 473 zcmV;~0Ve*5P)Px$lSxEDR9J=WRx5JDFc5v|6nR03JPGpwa*%T0pu{|dp#^14OG|o#@WLJ<2QZ6A zA^{S0K_tyui6td1i{Ff9v>)lcS*>IP6DCZUaO;@Gf``q1U_Y!DJ&Vm!ejAGlxX;sh zBoRUY0ElQnT2&Ra);=#3@n->!oQS-ys;WT_5kYGWA;d)@?otU)t403-pi$~1CZ!zM z#uzk8VQtst2*^HyIe^Eu#gh3t0Q0u>b7hCf-4ux?1kkT7dB=pruwx=VGdPk0T!R^7 z@M_E;*ad<*0PjVCq9{N_Xphy2a%3L?0K5c^D5XSMmfqG{1A)jCqD@$j_+9gH@=Mlp zBrEXTw!Xo>M+jXdhzPY(5XNAx6n_3gKq$t8&G~KEF<%a%N3b37=Waf>o+DX-H}=df z&pbxqP1v&MnpbHI$!qA|f4?bCyWiPTN`D2l)=)>mQI6zO>`3iqC*&d2nJQh48t7q% z{WSNf!Sn3;D3TR8Z1%Ip&Kqmj%pck=59#Ag3;4R=yY9e$K(1Lo;r8$gMw+@OIB+N9 P00000NkvXXu0mjf539~l literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f18c11a966f767a76036ba46c8fb9695eef37526 GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z8$4YcLn`LH zy=9-*Y#`D8&|LQI!tTILg;V|%r+BNH?k(K@;?y*bX*?TtF$*jW zR2ETKxMjb)Q(ueSANJcWpV*b);L=&Wn;X2%ES}d$w8?!)l&E?>C;wfn(Z2543*~=o zi>b)gWjH3maB9<&)SVx$ci3OgdGP$F=?2zk?&fw4-@jS?J~lu117pEC#)P%1r;VBv z7HDuWe6q=3y*dBSO}1DjL4oH#w;xN7Y}-1`;(Vu`%>APej1yc!mwj<%x+kB*-)ov(Oxe1b zvz(6aFo64{-gNll97+eMRi_11hr5_`cj_QQyhZq@ds%EO)Bt q&9WY4JCA7{2af;$P~X7wl>6YPt3|n8-$j8D!{F)a=d#Wzp$Pz|6Uur3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ce56ecd719f62861b7712a20d424137c1da2a489 GIT binary patch literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zn><|{Ln`LH zy=9ws$Ux%QM|;_~3%eI@s(h;}vHQ8e8=hFLQk|fyjD^kf7L>nm)k@XUh?6+ox zcQlX6W;8g)U@-rDrEJOL%E$AME&ORM{k)LJr*U_$^!x+I-`QDOTKvDpVDX$`!?mF6 zrmle(On4a-TViXAiVFU1RSjVJD{#%~dTH<0X>}Y^#4FoMG=FYSJ0RTs()jL0zVh!U zPhR|){F}}6*qU44%qRTr{;=cE(?|T({YIY|Jx=a7lLfl0|MYoRhCA!U9^{(5yu-IE zy}BVewz^Ib4kpUzzJ9a1$@$%HwsVSA?;lGnGJGcGl~%1PYUSNwD`xur_tUM3_gpXU z4RUsWZ|i&c!n2FuZ%AC}gVY1z^-Lc)I$ztaD0e0sy-i&AI>p literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/meta.json new file mode 100644 index 00000000000..e482264df5f --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/equipped-OUTERCLOTHING.png index 3d5710bf1a0c02a800af0396cd5634dc11f7eec0..e123bcf8234d2587a75c8b39a8eacfd767a8cc68 100644 GIT binary patch delta 1093 zcmV-L1iJgg2H6OZBYyw^b5ch_0Itp)=>Px(6G=otRCt{2non-qMijXI? z0Y$0<0DgG!G=El~IRbP;^SgTzzEi|i0RgDhzAmP=Whhb|-L{M$pX{xLB@5g1ry)+?a$G#Q*JIJA8UnyW7=|&%HfGMl@1wB|Yr3GVG8J+9VY2AgvKTY9 zUHm<=0Ic$WSQRk&&&yI(CZ@IvwJpOK+prv$NuMeLPR}nZGr@y3U0{@uV8|k5Tjotm zk@{2)*j(F_sRuxieaRS&x}KFH^{I0J>4hj7^?xenORtdLkJAs2e-?e}9ALg3K{qs5 z(*+c%{#61BUq@hF35M(1)CbmkJ*o^1)DZxz&&y&}fHhsfzR$W}oO!M{K-=_z)yzOT zBCCEX2M{AZPVN8zKlc;>z{km5;f*g!KeYph5yLwN*F&?=#>WkzzB;IUapt%ln#_?$ zy?-N=g*-M!SZtut&lCaQ65Ii08&Edf0c9IdHrxSa8&Edf0c9IdHrxSa8&Ecn-T|35 zMQKU8kqO_Z6mgtROQ8-(qRd8zN$r5mQ&(~?t{a-at4)!xR-8Swq{;zAEb8eD@~l9b z`mzw$_&A4bgW3U`jVJG~?vKgSh~|NAXn+2z?&@@U)21}`q}~)wGAK=5EF@_aIs~FP z=qT8iMC?l-VsZf4o-T_#4r4M+ zgPZ(we^kCp;xr4J29rFUbYxu=Nt$V*g6Dv;4JaGtg-}_EFfIY^d?7^G!F!PRa9IL&D@UUc@oU4qFrr<>{^S%`NsJleO-BNuDMRB00000 LNkvXXu0mjfaJKi+ delta 814 zcmV+}1JV512*d`EBYy)6NkliPC% z^OYExNb>ii?uz}1@N-Rp%5vSjec6nO`cZe)zHH)V5XI+JVUxe+*r+)+T8%@9@aO8$ zkGiXqqXYO}8Kw!8%dfiyRTqt_i<6@R=~1waKd8FG{6^N@ARDaa*zqynvEX`T42Bb2 zUmfH7w_lh(Jb%UK?;aij$jJx0_@nU*7w4f6zfjCxUmc5d7skbTC_F~4RiNhBnBFe{ z0KWIH%a^Ys1XUOFr)L0&+tfTe{uN|EC4XiFbb_9d9E=fe!`;K9wB=AWf37Le33|rd zT*m)VwK|KLDfaYDq(uRP%{5j^K(VO zW-^M#v;WSiym*!T+&N$q>veYq-?2o7A?4593a5c>Pb*6kzE_sI?ibDfrXX1LmNOX zfEwBWY5~;Xek7KB^UChWi+nb)$+b;SUT{SKBTK8!=mb4ORdGa8L)yh}Gb9V#6(Wp? zeV#TBl~sjg={ap2B25#I9`48Dy9Du!C4yaCN`I$78tS1Rm#Y*7##ax0;jx4bxEVw^ zYX!nWcyZPWa5IR6$JzU3P{@F^;)Nn17J*%y zN-IR(8?*sDjnhJlDiLl=fQ4^_7>e8r$mEh{K#?nfOfD$~bb_97JDkWEDi>~t6KORG sIwuLr8mP!Z37K5FK!RETHTK?szdsVG98eww?*IS*07*qoM6N<$f>=I*5dZ)H diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/icon.png index ce159e8eda015b35ffa6f865a9f2a79ff106da18..673695340095b777b572ebeff62820ba26388413 100644 GIT binary patch delta 578 zcmV-I0=@m+1KI?TBYyw^b5ch_0Itp)=>Px%6iGxuR9J=WmCbJ2KoG}&*!T-%QMoNe z2t{huUV7w^JBK_0FA<4TPZ3WLaq1}&FOg@d)K-mDRZR~qqE7N@wq+XTRV^;_Jdx7OXiR_OtJDFSx|c(m0-7? znj$B*=>AQpwDnI70P9QUuCLP+nIMetrHG^B)6~H;0f-w;G?{(JS5oAhzE&u^>KAi*brey+fKAqS6h=?dB+Wzu5^5|WLdBIkUATAAcPaE? zTow9A?gRx95!^`)RVvZ`*xI@%6RT~>Oj;>Qzg04mJKxEjJ9mtivj(e_xl;Evz#3o; zum%7uosa8LbtIoFVa-SzSCMiCq)Ab@Gv`l_cc);M3ILEFntzFzG^$6{(dqFnSJzQ8 zzjT0lR2`KzH}E|R(*(vfnCIa@2g3zPw59mMScc{`Vkhk+n(=ZM<_ z?fusRn1q1w{!c24Ib^7TNsZ5a2j8_buc2K7m9S>qw>{pzHJba@Tc*Fy1Rx;*jt&c2 uO=oEU65{+OTF4v}Zo}W!-{}MY7T^=jW0