From 2ba2612c4e9022d27b147eed48af91511ef77aef Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Sun, 24 Mar 2024 12:04:31 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A0=D0=B5=D1=81=D0=BF=D1=80=D0=B0=D0=B9?= =?UTF-8?q?=D1=82=D1=8B=20(#235)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add: experimental stunbaton resprite. * add: galoshes resprite * add: sofa resprite * fix: outer grey sofa * fix: experimental stunbaton sprite --- .../galoshes.rsi/equipped-FEET-body-slim.png | Bin 1296 -> 699 bytes .../Specific/galoshes.rsi/equipped-FEET.png | Bin 349 -> 779 bytes .../Shoes/Specific/galoshes.rsi/icon.png | Bin 363 -> 455 bytes .../Specific/galoshes.rsi/inhand-left.png | Bin 322 -> 361 bytes .../Specific/galoshes.rsi/inhand-right.png | Bin 318 -> 372 bytes .../equipped-BELT.png | Bin 296 -> 258 bytes .../experimental_stunbaton.rsi/meta.json | 200 +++++++++--------- .../off-inhand-left.png | Bin 384 -> 368 bytes .../off-inhand-right.png | Bin 342 -> 376 bytes .../on-inhand-left.png | Bin 1045 -> 1570 bytes .../on-inhand-right.png | Bin 888 -> 1515 bytes .../stunbaton_nocell.png | Bin 414 -> 498 bytes .../stunbaton_off.png | Bin 374 -> 472 bytes .../stunbaton_on.png | Bin 1750 -> 1771 bytes .../Furniture/Benches/sofa.rsi/arm_left.png | Bin 483 -> 311 bytes .../Furniture/Benches/sofa.rsi/arm_right.png | Bin 477 -> 313 bytes .../Furniture/Benches/sofa.rsi/corner.png | Bin 1319 -> 1275 bytes .../Furniture/Benches/sofa.rsi/corner_out.png | Bin 1386 -> 1159 bytes .../Furniture/Benches/sofa.rsi/left.png | Bin 1250 -> 1136 bytes .../Furniture/Benches/sofa.rsi/middle.png | Bin 1249 -> 887 bytes .../Furniture/Benches/sofa.rsi/right.png | Bin 1270 -> 1136 bytes .../Benches/sofa_corp.rsi/corner_out.png | Bin 1274 -> 1446 bytes 22 files changed, 100 insertions(+), 100 deletions(-) diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-body-slim.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-body-slim.png index 26d62be00e91e25d8b09ba876c61e3faf6d6220f..cab114ddf02a2f01bb74b3839ed6328d8837ed3d 100644 GIT binary patch delta 675 zcmV;U0$lx&3cCf6B!2;OQb$4nuFf3k0007YNkl1!XcpgwnDW#NBN-3q3Qc5YM)J>5}a)0xO7q>z`2r+Ug{2&}$ zkIs!;iu=zF6Rr8b^D{|qcI^yK&Ex3j0|544Hz+@;0ASwPW^=WaWVytm{I8pk22Qq$ zq#rg3fU1KiKk?hzST2S}E`@7nu-)F^=m#N>>dle8{dj(BHjC}{2G?9WgSFQcD6Y%YX zLOajSu0^4pr@YWjzPl^1-QHRLA%%ASpZw15A%&MS+;w`FFQ$}IN-3q3Qc5YMlu}Bm z8%fm7-B>P$Fx;0PS9dtdznBe(@)OMm#6@!fFrL|fxYlfzYHUsc`m+iWq5>GX6rVrs z1O1lOet%G8vF?rK?E@@6^-}$>;5)9}--4Z!#f#eG(OiI2^Ts|K5SOi3I5lrDs~{mN zfFZ2*C`q45Q~=k`3|i74@6Aia=LDj5`P);`R%8VLhUNmKy?KfFoB*89DoBZb1mC?6 zs2rW1_vPDpwpJ|`?v1`TZ@WESJ+~;dkIrTl`W&+Yzf4&X{sKaxHpTWB0r7@jm*w4^GEl@>9_Db-dpJJ+2X+1BjNuG!Fy%VwebBI((gGua`TOJ`=? zO%xh5SWB@FRr{uu76prj3MxpfZSr7fAF6_;r4L21QP3DEmP%?-&+KMnAC?Zxx%~5g z|Ns5BIhY@OcH@RE8wi5fnC;gJcz-5(?^%!6lh(c~c-tJNOW}}fhBfFTqR(*42xM(I zf(i&4SYDYskIT{{LNomk!WFq$BGchx1if_?8?aFbLERp60=1qX8+KKEj>I$x8Y7Bm#-zU76M>ww52 zEW6b(L1MDaC~Pm6TQlqgtGU8iqwCP4*%(9Hb`)AeI|vKte;RGIgW|Y{=mHAds;}dc zm|I(5oW46diWD&$^*P_db%A4=t5?;x947GE_-2c^>MJl4K52&=h1!F_B1_ zkd;}8OdblbWv4Bk&!ic)FO|&j9LuIPnddkq6X%nf5|0ZC+rnm@AcT&NTE4BwcN3eu zBUVlM2!^g-bltI5BjhV?=mr(n1F00QI;()~do0IrYr&4FOwFh@`EB8dIdB*14^fS|Z$^(Q$1y@MUefkb_6c$Fnm#)$0zree&<4(Q%KMaKZ6$8&sh6p{#5T*{Njwx1Mg|@8i?7DVoyLhPW z+A&7*Y~4Y>uS?q`eLl(eN!r8n1tEkGLI@#*5JCtcgb+gfFMl+*2X3v5J9XPZ4{FqH z2Y~r>McY^&bAaA}c;XXtf)`KG_%!#ea&o@ zd?wEHVukh9sB@_^x*$LCxB@_Z_c!#Vl(r85l=58_V1Ioz>LgP|pmVWx+riwm0Wf!M z>bBD>N-|Zv@*;He^O-pQUx$T{F3Jd-&_}=3bNMPfWtK lqrd$MAsUfm_6@Zn`~iMFRe+Q|kvsqZ002ovPDHLkV1n0Ha9{uc literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(! zr;B4q#hkaZ4)QiR2)NGgWUc(LjyIr}Rf2nil+=aY?AC{JcsQk0x!>rt|G(e5VM0yC zOj*9eVud;kgpnF&#hn*z&wne=j?ZQhoM^w3sjU6`$4dG5?nNd0wlh3R;r6IrtG~5= z$?KQ>=Rx`tW*SzPSefmZ5>8AwEzZ~f)4|9`Rjvt*H#4YP#2_SGb9 gYuGwFe&rwWYUY5mi(9om1H+5K)78&qol`;+06)Ha=Z8B!2;OQb$4nuFf3k0004jNkla zU{D7)6Bc~}MxVeqnz$Jz;}bX-o`T8AO$P@P|HJ{Kjf)|10kxNc8tiqz){u0nuc_{7cJ|53;^hQ(iIpa?r?NbXQ%w>J8OXrz|U|A%l3U^C$3LV4?Ih0 z2rCB}naz%U?|*D+;*A1v>g^75vl@$q82ObbH?a-)=T_x0;f z08Sn(oVe)raL_% zR*gG2CdL!3zZ+=OyVS1Qhw#()HGiFDUnkJ0+t}`7;lO&*a8zCVfA*0C` Xm&T>6G;(1v00000NkvXXu0mjfphd)n delta 336 zcmV-W0k8hY1M32iB!3BTNLh0L01m_e01m_fl`9S#0003UNklf!C zJ9qbgyE7BRm!$zTfCkV2zX#Cn7*5cBF#}vK!Qa#xhlmmYGJkKG!0F85M3k+o4Pe_q zrF{E-G7TKv{qfLnL=Z2Pz{s+dets`9rsT5GiDFh(%dee*f^-gDO?EGEN^VS3~ zs|or~F0004VQb$4nuFf3k0003aNkl0L6YDk$Ta|Fx1LNJ|RV{Tx(3KA@|a#9Sj2lh0RR910001J;^Vc5In8y-Var)3o<~RJ$eZ)%Xn)IDM;?MKfNI){gYii< z?pK5H$*O5j8iFJMzv#wdaxgQqVc#rxCp~2FE)M%?T}%$<7hTzWNdQmJpAV}lt+#u# zy1pvL-qiKgw)?bRRcSxz1}f#;;@i8$%g&T227=Hu<00013M{Ml?000kAOjJbx005ST0@%L*@7V(Q;Q+!2REq!r z00DGTPE!Ct=GbNc003=zR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5; z&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+J%2GLzc?ecSc!`>C9|j) zq>qa;ttc@!6~s2=QdV&Fa{-$S0Gq`dWXU8|^Z)<=Xh}ptR7iF6XV4#2iRwe>4 zDj?X3*c1pmAlS}Wj9^r8M6g}386k|M0GkO6j3#hV5kqWlKp27D0H8QrSP-lHC>RB! zfO3F6_aOnSWh@9Xz>$IB0DBpNtbmXSILZ*>4H#Ty2mtU41-Xo#x4ZxV002ovPDHLk FV1iqRb9Dd! diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png index 65a7aba6c3d1cbddf0f622253e91b86deae850fe..d135a13acc7a3b599678a311cc85b7ea99783c88 100644 GIT binary patch delta 357 zcmV-r0h<240`vlq7=H)`00020X>r~F0004VQb$4nuFf3k0003lNkl000000KT(*N%f<5u;IFAV*B7_aFoTU9e;EPi&0x&21lnE>i|SV zdihzZA`3Evs>pONKReG^1yHI)_q*nt4r@`9PEaAJNk^x{T0}(pU9+$4tW^N}{kv=q z=De&#rt?#)!JcfFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5; z&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+J%2GLzc?ecSc!`>C9|j) zq>qa;ttc@!6~s2=QdV&Fa{-$S0Gq`dWXU8|^Z)<=WJyFpR7iF6XU;uysAwfkf z@{9^d91|=?h!`L#HpVo9QP~iQgVh8i1;UQl+~5q?h1CEQBLuO@GcaP+HVQ_;C?Eka z5>g;U$N*YG<6KzoFttUIAdPNlJZA!#1`s%K-R9}N|Fs?dYeOA1zfb!VCmPKt8ANcmdKI;Vst08tHGW&i*H delta 255 zcmZo-TER5Iu%0E|(btiIVPik{pF~y$1_sUokH}&M2EM}}%y>M1MG8=GucwP+NJZS+ zTN`-~83?pK6lR@x>Egx)^@7QqK^Hc-N?qqUz_#V(%LS=C{tx;lF=p_3m^UUXMSidE zD$!5%TYs7pXa*2)@ftmO;B@VJT24urVDObIeXF=DKAg+WV&}aO+4_;~jcc6yS+>|+ z?&m($uK88_C$oC{Zidgi5WPUM-uTpv=J>k)fUnPA+zRrUb;@)v!}GbzicB2RC-;~q zsK0;ixY_afzhkzCuEf68OL&$3PLP42yQ79-x`Sy?aLBx?Ad@^@{an^LB{Ts5YvgE% diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json index 718f27265e..fc15bfadef 100644 --- a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json @@ -1,103 +1,103 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation and repainted by Kotovskiy (Discord User ID: 462526160773840908)", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stunbaton_off" }, - "states": [ - { - "name": "stunbaton_off" - }, - { - "name": "stunbaton_nocell" - }, - { - "name": "stunbaton_on", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 - }, - { - "name": "on-inhand-left", - "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 - ] - ] - }, - { - "name": "on-inhand-right", - "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 - ] - ] - } - ] + { + "name": "stunbaton_nocell" + }, + { + "name": "stunbaton_on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "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 + ] + ] + }, + { + "name": "on-inhand-right", + "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 + ] + ] + } + ] } diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-left.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-left.png index 1bdbde76535bb26b614826d707544bbbe0538d17..5745950b7db0f30b9800fe0c20794b37a3a90c60 100644 GIT binary patch delta 329 zcmV-P0k-~t1MmWnFn<9mNklM zg9@mC3P=&?Y_KNS)!GIl@XYA{LL?sd!dxLZo(BK`0029<#j%!bcS|jWQKD-Q{3`Yu z1PY@>UM+Wv}ctST9V9N2=*ll2~9IRW~Ef;VpG z6-h)vRCr$P+ObN+Koo`HBWj`82-$WYCXFv=ZzY0nU}a_8%F-<)m5YMdi7()yM+cKa z2pD!U*(Cg56J|m#bMH)=+z0>w005BKm!5nwzj8JFBR{a$JAZGD_a?zw`BqDR>ZLKs zwccIm!9HA0uLvReh3*}$)l?(v(Tlx1dwxBwBHXC_H~E_POBcrzDnO>ojgrZ9KK>%i zbQYCF7Ww>E#U@|tDh~RRYR5)#5>hXc*8uXUY!z4}9OF}5Of zg$tDqMX07W5>k>c^xV43JP2+73uvqBc*%vG?|QKzUN{NWaJbU9$u5RlgxT(CFN+&w ruduJ=Ycx#pi<9t!A^-pYv?hH6K%9z(s$o4Q00000NkvXXu0mjftvr-} diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-right.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-right.png index 78ededb1f0ad860b93a4440cf01c15f3a0c9ee4c..f2588a2eb3f2b20323176e505aed49c9547bed68 100644 GIT binary patch delta 337 zcmV-X0j~bm0{8-uFn<9uNklfI?Dw%;D z*n6^H-DuSG1etpF z>q$gGRCr$P+A$7-Fcik|YMdnwYP=GwV=v+Eg-pCeupfG;R6+ z!U8GHdml_Z3;+NC01Vo8wG%PzQ81Zaq^^$Nd(`He<-XVuw0|#W&Y~f7mp;80NpT^_ z=pk-$`>iisbSNx<##}|l_y2mbvrQ2pc=ciDHtP_A)Sqhzxj(%0+`hUpXG#Fi*`DR^(;QrK2e1(I=c{FGx)&8>VCR!cbcxg|0PKJ zUxirnIJ;P<7brsPVPuja4AP*-(9GZg004?$%oA9pko%^3KgR$7002ovPDHLkV1kxl Bh3NnQ diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-left.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-left.png index 176639dc2ef66234c7a2bd9f096b92b59648fa02..493ec5508dc281b91199e81ee3bf292a62271677 100644 GIT binary patch delta 1540 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 delta 853 zcmaFO{ex|SK|KRYx}&cn1H;CC?mvmF3=9mM1s;*b3=DjSL74G){)!X^24-GQ7srr_ zxVLu<^F$0qjumPz@@cVP6~CdzTkGP>r8hxYVd)9pjNm2bcwf8_ShVN~lcq+7pmw0u zXPxs|LTAq~9lBrq?QgyBqMK9ge&2kY`^=XKXcG{m)Yt8`uMhrT`fzUls^zU5+cl4I zem5$7=hdsMUGneSrzbz29R2?G=iA+n&-VAfdK6u^Z>Po9KYw0c{ah8PR#ms@!}jxa z&*l`}+xM?vsT|ACeLq*e*`xT!`<9(V%PW-^ru*ye%*n3%$tiKj>qUvc;RUb4XMH+n zp8d1S_l4E}!luiPHTAyxi}&rZ(~cKVyl=i=qj|&Q437ItcE{+Sp74Ik{*p7fm!3as zj<8M={h58}>3Q8_3&j)f=huAk)!3SE_@HBQ!(@dT!5b_P&p^owvhUmdD}P+=bblE6 zCQGMfmx9iLU5kHh*NkSVe&4Xw_GUH58u_@r2D`Vdp50v^e0u%#RHx_DKiv8e@#{gm zcH47pXVUC@u(W3Ci=QWd z-N_Y5RbO?O{fYH6{jZxe-_>ls=Dl3P`9<8Jods79&0ZexXWG{f^XjKhkv3Sfyx{rP zE&BVvs+G*O@0Pcg2RgVO;dH5wbqrJ31LjtU%saa7n9~aGLri~m|NmCU5Z!X`9^-?# z@%pECJeyvSZRc~a>cQ#_Kg*{39=>Y(;@(fSD!ca#99IA5E|n{}n*SkapVyZ^Tdp*( zyT!1FxuKllOi+(viT#6^9a#^3-yhA7<$nLO+;b=6;a7jpW$V^|nS1`x@pJ45XD~1{ z?0@h#K%IYT*&?JAajHyikNg3y+}fwt?&s&aU3At@8kT(3^Fnsr-yN3k|9sH5jyN5jvjH^UPzM%fJ!|G4WTud&?_(_z!(FL>axw4e98U)Ph6BK& zSGaA}ehmkJ6*B;PxgWgx_ zczHU-^T$1oSJ$yyxdj4s{$C7?ic${vv!i$gs1GUjm?2FzjQaQvm6HBaq8 zG*9+{FD&QUPCl0{V3?O*6e+~Mra+M6I9EK&B0>90pVlxPH`&IN^Y7EFUWS^IZ=BbJ fc26^L`ogL|A@0EbkHsZG=QDV^`njxgN@xNARA;65 diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_off.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_off.png index 9c520eb1aa20769412270955fdbf51cb983cd615..8e1e88b790869e44e934715a9095010ae4b2a181 100644 GIT binary patch delta 457 zcmV;)0XF{j0@wqP8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00ELoL_t(oh3%HTPQp+W z$NzpzjbjII!X-4uba2tKb*Og4PEMU`6JEe4aM5Sr8T1`wlDHrXlLMFzO*9M;!$2U% z0dB*W3Dj~J^ep!dxA*ryA3gT~|MnNm0q9=WX)ACc4f6be0Dn-!G@kdOu+ywV+z=LbmywgR8dJquiUJiW5Q z=X1^mw``Y+&C$%t0(XFMan)!mo@3HpNl1f=&5^2fwr)q3?b2gDpNL2U-%CRl(xCIw z6^>6%@zCqxvVZddbUyJ8?5um&+8+pMkY!)sFjv59t%~~dQ>uGX3CJ1_0J~}7an$}b z902xLJV!znGWC2V0imW*N!M|gJA#nedcKO$IP5MpOmk!1?WYKkWxG&ezphnr)_6gE z1D-DkZ~%If2Bvc!M{OMR`&qM>3n=M2zUJU@)I!XZcR~Pw$~kv$pRrKWmJX1fAE+0P z%@Ww;PgvNqh?pNLvl=qjehbt-j#_+0xk>v5zR3jZKV*)5S5w!hh?;w|s{bcwE)b^sfrOxbOdFuFXtKw;TR`sG4YQ*?zI5v;N8aLtB2= zT$5EfvO#K|z#|!F&Axyid-Qp^+fT_ptoT)=bKz%^C?9K7Uir#^_!D!MJd05L+74eJe%FnUuauZ9LK-e8idl#Ev;a}N>|p}v0<&he)S0$B{<*8+z zb6x9Aem=D4dU|t{+^jk0-rRe>P@3hTpWpfYPR^2>?>7OIlz+S|pJ>2fN(->tSDI@U zMf2?BGZxP&#jg=v&>hWJUwgRi_Mx3Sfs|G+vI&DJEnr-{EIwnc-`4Lh#or>L7`~u8 zCtkk2^6Cj($ocT*Xx{?ABSi4n-OhWHjFzm;IFB3mE{v_|T`9F?RYS+6P`i z|H57D=xwif6My&yupuyhxc8V)KF>ZE(h>u8xr9Cl34GInBD2}nV9yXCPIR4Cs3mrW zCYDyIC3c3onp&vR4T#KUTSGIs&RANb&`hqA@sEsO63XY<6HBWUn#pytIuIw}{JdgV zLH=-*j*MT@p%Y816g@jm!JZ+C%w}6fHXxGBlAZj}OnRG$ttlGx~3ti|4uQw~$>|fR8wB;3H0iu0Bi6-_+}X z+QV(Px9!=F$@#6g`qBG1b@4+?fBqT%N?b+wa{Q@K4K0X#<;(bwzx}b!pPb){KW1(r zwks^Km)`%CiIk7o8$td7lGjH5`;i+JPyU7YymA-3(=kH7y+O4<3P_!-R?2-eV|;5v$~ zpIsLMfMRt#(g1>u&D3%5IXt;*H>Pjhz`k?}bIZ$k@YC;7nqP{4NAuN-ti#IstzLyK zdw&2t{ATTPJiC%g6_*eHMJd7V#d54&!fZfm2CgWUvxWPrWI zFZ2kYj)UD`54+L$HMCFviYa*yd(ZIm27hn}pxMS|@Mm5oJ%_pn4=T+zmDl)r1L$pN zz@Z4*+0iUa+xQ_PMM0Ok=gRbjSqWe|&`ckB&<--`ceD*IXxyPZj=WWEwrd?h8NawPgKNvm>79fc(19Ak#nPz^2c_kYXI z2N>&+#V<5;Dfs~2EzItdnGXQ|e^-pvA&bvy;NK4him$(-_H=&H%%&|nAHdtwGny~( z@a$MZ2A{8i+0(78zhVP0`sBa6zvVzMM+q7Jc(Z^6Yku?jFQxeN`5M06`)^{PE|;*f zejx#k8~3(=-g+s~@Wa8WGmk276_>#`)*v&VkOw!js9&cQVc`U`fP_rG zSuJeyNy!Ho8(_4kv&jo_2OIdYv_>-X31)Rj<(nAX~7vdZ90ai``*X0AA_$F~cLN=fvpU($axd`aG zd;m~95Fwh+=L4+N;JSQ(=zkhiKEP#sl@G9)ukryl^Hn~;!F*5n^X=xVe1Oe-l@G9) zukry7;{&kYAMbTO0Q>#%Ugz_&+aK?B{#p@k_2=8oSNVV{;wvdBl_jTp^PM1J=a^YW zz>e<^aJqzie}FL~Ak&}kc^U1B!JZ-As_|p@3t~PwTxm^4yJE0sNPo8{vLU>-_h~f* zPQt!HV{(2g!oA0A@#lM1MwhTGf4&k5TeO9Le!fz1e>_W!sOAe&F@HS&DdK7X0%X-6 zubMAFcIN{;FT3*ro>wVGm;C0#U&-a9!nh)@d9G4I9njDu8P=Z7J@m`mc{PA9wBmD7R lm)-t+*Q%=W0ZK|0*MBtaBo8Mw$Fl$c002ovPDHLkV1icpL zYe_^wRCr$PoLy)XR}{xj3av#{q*>a4X(SR7A4;@|ND85tHb!fken5-p5|u~|R8i=w zkG}XM=tCRrgY_j=rBCTYX(^O~Af=FM8)-Jd6_f6!CI(H~G=HfNw{tf4E_XMxJ2N}? z+`GGTe=y9~?)>lhpF1-VWq_C&Zz!zt0o`pretc`NkCrf}Mx|T1-rl%o> z3w3oc>&P$v4F&h$r~{#Hl-J6tCN#rf2b{&iDFYiyA1>pa2IlhB6Sc;m>B^m}A| zTz4j&`ugKvC4attm@!}s=W-+X%a!9(zlXnEIkG-Wzx?JlJr{|f_HyJDzyS<{6#%p`i@!ous&a{cJLbzMJ=!p4Ww_!`QOf&I<>Y;*T!_}S5)OzeRRf9utcZ;7+! zu4cG7l7{KT+n)ML6EM&`z*@Rm;NG2kaR2dr_~PowYcToB#=4G?1d3CC{ucUEx2It0 z@f4i@>VM{n{*JqAAU63uwf^D8!)#~AP8hp824hQO@a47NJ>yrF01jOSg}DW|n7F7_Uzk5JIstPFb8sbjC9Chudz`uJ!_XNFPlG+nt#Ld zBfdp1ruBvSn0S@=%Ag#)iQZ>gUp8N5??*fjV$G*BA1QhuYd)>{i03`PRPX}R`jqA) zo__~C7(2*t{&X#a8xO8(H^8)hZ>)Dke+`3g|NKU~ehwcs9LO}r6sGm}ZhA+#exT=o z7oOjcxi0fn?U>eo>ABj>eSxp)MFeij0Mq)yc-09AbOu<|6F32LOY?lm45sz}`p?Xh zcm{hDR(}(=SS(~gJ{3HkaY2w@bGtAue*T_4YNbIo_xC%X*! z)K?$B2+B=dR0-ocZYOB~rwsJ{j1QnIPcI~%trA|TkEiT`e)K65U^ISSAOD%VIDb)z zx*X7ozW(}r(FWAtR%>{Cz#BUXj1O?Bk5_>RUg+;```B}Qf_RTgg#P>6PO(#Y;}giu z7sOlQ?DX-|th@bK=9-r;PTc^k&p&hY4BOo{z*^Vo*FV&Fh@I;@$3AHNlx_E+uk<+p zzbeMxaFchEF#cp5E)V@C*T*+ee}DcJzu{tieqt#Bm#^jMXFw&JkC!99STaHNi+^bbHV)0N zruzJ#sMZg328f<-(tPZBCe2r^?>hm)e5}UP9>khY zt6%g$)_i(>&wD_%*XMgdt?zljsMqJ)@c|O1O9LZ6KEP;wzC)zP2Z+E;89=39(sw}? zbp%d8r0eq?B0WB!8gIfDOMkS{@?e400en%*U&mJxWC?Ig7X?U0{=Yxcp!s}SDOA;2 zA0KsAna`_)aZWuxz~bO$zNiw$b=+>|DPXq@DkHnJLqn{t`hC2lIi_U z0^WM{lU4uUZ_U?4Ut=FTd*m$JxBY~X`us{m>2m;nRg1r&Vtst_-+v?w-uT7y|MR1c zvIGe8+>UxFy1CWErH9^Eoupz0MqsPk;dMHEma1<|ARh3Yk&}t Q6#xJL07*qoM6N<$f}-$t{r~^~ diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_left.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_left.png index 0c5ea7ab8f463ce98701430e8b5107c259fb043a..d403f66045459b14d0b51ad7f438b07dec0fd3ad 100644 GIT binary patch delta 284 zcmaFNyq#%+NGZx^prw85kHodb&7G5ETWeumUC?ilSGH9^BqFucsQvdz@@7s3QzMK(% z`MM~}smY--o(pWm|5_~PO<3b*6zD9udSZ8d-JHv8AKr5;c*!>F+D`_yWz73>d#!Ts zS@kk^JP+=4+8^}R@Z^&MD{1qmlL{FEUz|=dTN!iz8$$$h32SEDp4fiRu*#yzx0XrF zXU+NZMM*;A{4aBhv)ntMnXlfsE`zyZE^E$K+lF)cO>_Ade9}u;d@dr~i+M-NdGQsW eW%obJSS`wK>18Q}tUak{yiopt?H?~e+s zAA@GTJ$9^V_vWgbDbHdj`R;D4oT;)oTH-isf{b`WVGP5uLPknBQmipDn>yydU!F5T za;;>6UCZ6vivMfm#CLiIkZH`^H=e-wGeR?5c089O0&@)t>g z2_@542Sh3UGW($>$Ng7i-Ff?ZzV+-f{mYN+=U%w%evroeXx1FLc%w=^iT<$U!m9Q< z4l}-}Z~OP0-?Cu+3ZsOY+QU!YZTtM>Q(WYzopr01Ah{O#lD@ diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_right.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_right.png index 8989852c209d31c4ba021a803fc0a9bfb57f9fd5..4b3c581085604a1d15f4b208d62d5c1106aeea9c 100644 GIT binary patch delta 286 zcmcc1ypw5yNGZx^prw85kHod%8G=RLpsM-I4#GfyA+o(=BG+5>P9C@alKH zM7X$+P?~f)-y?^JXtmsJ|KD#)sl2|Yc2n704xmmHa3$b$DRXGFUfT8R)vLcgdu((2 zf9~;K4^|`pq|T59YuBbSEPQn`pj0))Hn%=kmwAID!#e4LwI3NvV$1`c-Bn+k700fi zG|9(Ji2s+{*4-x4-~LN5-S?gGNb^3QIYm^ zi}6ANZ}BuxaxDPiw9-%6$IK gQu6vnig=HIUfF%KhHoX8xIupKboFyt=akR{05n>E)Bpeg literal 477 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5f zr;B4q#hka(9KDzgMcV3JT_i-7%zou1Q1XzK<)gy9!^IVR)8&*zPQBS3AQH1RuWJFv zqh-I!d3v4IePdhyyuZEVyqe$_w`(^Tna0NHi=!R zI~P=0$6RHdxiOMkq2`j`x9hiyzeh}9`1IjckBH$<2EJ8CU+mxf#PWH**XQ^3YdDo| zazB{uSFy;aueg5uVe507p5HmXeA3>A>GLPQ3$GV`?R9DWZ(Eu0iF+G1%n5!O{&FKw z{awE5>iyU19!;y&U&Q3JOJzw}?dcP74r^w1np(SVIW+tDbP3y?KSeo&zwWK8)=ja< z{FeM?(f^5C8H(ykdmp|%yZ_tO(!EA{*^K8b%?vmH^kn*;onxE&Y5(uVHOxD+3O6r$ S>v0$uUkskEelF{r5}E+!R?7JR diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner.png index d18237d23ab435e6541ca7244dc62a5172ca56d2..96e01ae8b2661572009ce0cad800e5738b411189 100644 GIT binary patch delta 1255 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 KMNUMnLSTYN3vDt0 diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner_out.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner_out.png index a6157a0729dcced8c72dd07377a9e0e34a813438..21371102fe3adf7cbe3aa17c51e079cf9a9c441f 100644 GIT binary patch delta 1126 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 N002ovPDHLkV1hEVkTd`Q diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/left.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/left.png index dd4dd8e80093c5a46e979ded3267bff8e0cb145d..1c3205d3e8e2784762d5195f777fa78e62bdcbdc 100644 GIT binary patch delta 1115 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 diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/middle.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/middle.png index 589526aa7514c191bfbb6609c1a4670ccdebb913..e94561941db67377bafc1ea819d8c56faa814958 100644 GIT binary patch delta 864 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 h<0AC{>Z`N<@E4= zK@=nx<4I8T;0r`#AHt*0;dA&L9({;KT=wokQSg-PB?wADyu^H)e4Cou>fh<8@|8tE;Lz6Sw2o6X13ndji~!V^4tFaqJ1O3SU2V=YOpR@afpyYSkb5(q$V2 zU@%9At|iXjJZsmNCc)Hz!+WkNPR`tDFbVj4(smF(f4k9O5^!+$`uhHz%ill$Hrs{j zQh?`|XWjmW#M00-?hkw;JM0|$;tN^gcAHUbr081$S)nvWz-ul`lZMo!fHJHc>x%^RxRvM53 z-xP_pmF>imyIK-ArT~|u)4!L0A;ju^ZBm{KAtZQ8Teo`JJH|wMX80x!Lmkw@7Fz8xp zKY*bBkAE-2#(JJ<*Vb1j>#b)v=NS!x@SI;D_ZiD`4dw)6K6j`tClcgybiMVvq)Yzf zf&E;ptq&ane8O2)S4UZv@K!t#iZOhB`H<6=&~4WQ+2vz>yiH-gCIKv1UWw0q6N9HnOriedpWuQR>DA5&=57 zs0ZRRdNmy(-G{u#*rWzj4~DFCm(Tg(Z|!W5rFEK=!E69tOe07u+cJ|2NP+=51%LWX zw`3at1DJcJ7g|t*sF26m*VY6HkejAhkLdtO!y^Ycl={m)cuna1WG=G(0J^1gQ3*~H z&coWf%hqumKu?WaBoTms1XBRN6wD`}EU$IaEOZvBnFf%A9LSRxePNwW0h(w4_txc^ zfzbB1KCjysKH+L)pNhj_-`4n0nOk6=4bXMDC~|~S>uPy|quKzT8?X*i%WHig8qj<3 zeK4vGC_Oiz_u@;DYXhnVL-O3f1-_=g+P%Od&o&W#< diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa_corp.rsi/corner_out.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa_corp.rsi/corner_out.png index 306d354e2ce8228c1409afada13a98e099f0ed7e..c42b9c3a81c6033892c5a8ee6799f6bb6865795e 100644 GIT binary patch delta 1428 zcmV;F1#9~H38o8>B!2;OQb$4nuFf3k000F>NklVvE6WvFcAsmoqoYw|fs!W0xyq^&H=S_XEu0I@5riy?3%j5JI{E0H9o| zqS35l3@O~5Tkli9K>P(LZew{-cvEFfv<;~#}Dr>0KmNmkD>|XL7D*!JwKBN zT)w2wTwgS<%zPeLp8)_BbCo&vFO3)2+}fT#et3W3+0!RdjUe3v4o3q3)xhgSaRMvJ zGW0xdZ`=U@Y;J8&Wd}{B0eG{(u=Mu3f!B&lWmt9}hJT)qZT?te01uNB|5W7ElbmHV zHop2qNSXoSepSNo?CBHcJ<<%o+6fM<&u0Q)60nRQB?cTFjgZM?0RU!c6~DD!0|0W_ zMF6LXQ4r(tP-rgRyy0J%D+bd5hMuRow_AAt$YioGOS5bHa3t^bxc==80AF4?zZF7D z7tm_&aDU|vkvzbwJRy_G!Yr-_KIcw}ZTnZDIlaFOzhBOWj~%QmSD>YDIk`iS5keav zNO{6uuN`*iND#R!yFXKu3G#qYL6D_<9Pm__!pJ3D5}SweJow4Qv-=eCfd7*6yig5r zXpN;z5*3>JN0o~j1apRpMzao0HE@0X7Jyl|5`W45{FbYz*&|DNp7Ggzf#MoI^nT|m zZqNwY^`%0tL$W-QYkE@L@D??^@TR&v<5-p*cwOe}$TUFr{ga@62hN0)7r3+3@z#D|j;yQl%`A1m8Pr}CY7BXb_0|>FcWy9kGbs^X}x_jZyBUQ@`uf>ZLa=-613H&ZGdEMMr7hv-m+|`txm&9gowhl zz53y30A0^Tl`}T(J$QtQS)G#R3Baxj#hMAu+e^s&v@-}7FRXj$?RQ~WHYO)2-+zA> z-T*8@86Zj5=IQZA;YYtG{$1l zxDxv-K=A&_j+^CT<;-`)7>f6|DeDvn87r%&rHvOwjvy3P|DOiW*?_G6P3ZAOI9+`@ zzSn3vD%VO^0r>alqfo2WrhmNuGx9jR2@mbefVVyGKAZ3lC!2EzJ9Es_0000EWmrjO iO-%qQ00008000000002eQw@^<0000$O=}ZD7{{k! z&b2mgRq!BEHEr!t5E>Lj@!&!H0ODux6Nx8J>cN8uqLPB(sc6zR7V)5HcJor(UZt`B zsS_rfnc3Oh+3b$}U9wGPxAXjWUY=*3hmst#vb;K6ys$*7m47p&bm|;=@#---{8M1R zRVrnpXZU`XY_>OMRKMq102MI)^ywlKMu+GBVgl%JLIAvd889#@P6!|aZ$C@`v}w1u zwQZagz!nq>O(5V z*|EPn-cRy--zT!RLDoOK8Hr$%*3QR~2>fpwNOu7k41z*rL216q-Xuij(-HGOICbMr zRcE$AjI1Ms6R=HL@F1rGy?kkfU5J4L@4V>A z@pdw{+fDY_+WI^a!4)VsGR$pN{l2@~XQwmxbdf~605@KSt!OQ6VhbP|kHF_djR4)7 zca6vb=zold`+4NJ5|>~CsE(I0kHxT4W&H6D(j+cI5o+>7had<-?%#dDM96B`_Xa*Y z)QC!f4$0m@_usX;-PnOh(9?Ur{+c{{`DB!cP@U-!QEbG=3S!``QgphBVvQTe?V%r8oRzxzokv#@icgW9`WM$*y3f08E$v( zkAK8W>i|GlEr5*N3jpG*F{aUI?gcQd1Bkm;$;*v`Nrb(&-xKLjZSpd@-0a?4vt>j*xZHxur+YV|3 zWLrxxEiS7ukkul@iQ#P$c?7`t<=Pc?t*aRj0~o&7%W4pO|1HUq*lPezYET$ql7BNW ztwG2FBLP$a4KIvvIa3^a1n`p@*F}gdfXo|nSp;i-fU6?J7C?4XB@+Q*sw#V&hegr4 zCn$;lw}U_#YE Q&Hw-a07*qoM6N<$g0U)FWB>pF From 020b34a4fd66771acbed6ce624413af70a99eaf9 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 24 Mar 2024 09:05:34 +0000 Subject: [PATCH 2/4] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 9d7909f987..3aea602812 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -2772,3 +2772,22 @@ id: 216 time: '2024-03-24T08:59:57.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/227 +- author: ThereDrD + changes: + - message: "\u0420\u0435\u0441\u043F\u0440\u0430\u0439\u0442 \u044D\u043A\u0441\u043F\ + \u0435\u0440\u0438\u043C\u0435\u043D\u0442\u0430\u043B\u044C\u043D\u043E\u0439\ + \ \u0434\u0443\u0431\u0438\u043D\u043A\u0438" + type: Add + - message: "\u0420\u0435\u0441\u043F\u0440\u0430\u0439\u0442 \u043A\u043E\u0440\u0438\ + \u0447\u043D\u0435\u0432\u043E\u0433\u043E \u0434\u0438\u0432\u0430\u043D\u0430" + type: Add + - message: "\u0420\u0435\u0441\u043F\u0440\u0430\u0439\u0442 \u0433\u0430\u043B\u043E\ + \u0448" + type: Add + - message: "\u0421\u043F\u0440\u0430\u0439\u0442 \u0432\u043D\u0435\u0448\u043D\u0435\ + \u0433\u043E \u0443\u0433\u043B\u0430 \u0441\u0435\u0440\u043E\u0433\u043E \u0434\ + \u0438\u0432\u0430\u043D\u0430" + type: Fix + id: 217 + time: '2024-03-24T09:04:31.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/235 From 91d3d40be56fcaf6160b870463682d1b09ddbcf4 Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Sun, 24 Mar 2024 12:31:43 +0300 Subject: [PATCH 3/4] add: new cargo items by Armenian (#238) --- .../Catalog/Cargo/cargo_materials.yml | 48 ++++ Resources/Prototypes/White/Catalog/cargo.yml | 9 - .../{White => _White}/Actions/catears.yml | 0 .../{White => _White}/Actions/emotes.yml | 0 .../{White => _White}/Actions/petsummon.yml | 0 .../{White => _White}/Actions/types.yml | 0 .../{White => _White}/Alerts/alerts.yml | 0 .../{White => _White}/Aspects/Aspects.yml | 0 .../Body/Prototypes/felinid.yml | 0 .../Body/Prototypes/harpy.yml | 0 .../Catalog/Cargo/cargo.yml} | 237 +++++------------- .../Catalog/Fills/Boxes/security.yml | 0 .../{White => _White}/Catalog/Fills/misc.yml | 0 .../Catalog/seniors_fills.yml | 0 .../{White => _White}/Catalog/uplink.yml | 0 .../Construction/Paperworks/graphs.yml | 0 .../Construction/Paperworks/structures.yml | 0 .../Construction/Surgery/body_surgery.yml | 0 .../Construction/Wallmount/graphs.yml | 0 .../Construction/Wallmount/structures.yml | 0 .../Damage/modifier_sets.yml | 0 .../{White => _White}/Decals/drydock.yml | 0 .../{White => _White}/Economy/card.yml | 0 .../{White => _White}/Economy/eftpos.yml | 0 .../{White => _White}/Economy/salary.yml | 0 .../Emotes/felinid_emotes.yml | 0 .../{White => _White}/Emotes/harpy_emotes.yml | 0 .../Entities/Clothing/Belt/paramedwebbing.yml | 0 .../Clothing/Head/chaplain_helmets.yml | 0 .../Clothing/Head/night_vision_goggle.yml | 0 .../Entities/Clothing/Neck/necklace.yml | 0 .../Clothing/OuterClothing/chaplain_armor.yml | 0 .../Clothing/OuterClothing/seniors_outer.yml | 0 .../Entities/Clothing/Underwear/Bottom.yml | 0 .../Entities/Clothing/Underwear/Socks.yml | 0 .../Entities/Clothing/Underwear/Top.yml | 0 .../Entities/Clothing/nigger.yml | 0 .../Entities/Clothing/seniors_other.yml | 0 .../Entities/Hampter/barmen.yml | 0 .../Entities/Hampter/cap_hampter.yml | 0 .../Entities/Hampter/centcom.yml | 0 .../Entities/Hampter/clown_humpter.yml | 0 .../Entities/Hampter/comisar.yml | 0 .../Entities/Hampter/deadth.yml | 0 .../Entities/Hampter/emergency.yml | 0 .../Entities/Hampter/golden_hampter.yml | 0 .../Entities/Hampter/grey.yml | 0 .../Entities/Hampter/greywave.yml | 0 .../Entities/Hampter/hamhell.yml | 0 .../Entities/Hampter/krah.yml | 0 .../Entities/Hampter/lgbthampter.yml | 0 .../Entities/Hampter/med_hampter.yml | 0 .../Entities/Hampter/nuke_hampter.yml | 0 .../Entities/Hampter/sb_hampter.yml | 0 .../Entities/Hampter/shrek.yml | 0 .../Entities/Hampter/spu_hampter.yml | 0 .../Entities/Hampter/virusolog.yml | 0 .../Entities/Markers/Spawners/ERT.yml | 0 .../Objects/CargoCrates/materialcrates.yml | 39 +++ .../Objects/CargoCrates/weaponcrates.yml | 223 ++++++++++++++++ .../Circuitboards/wallmount_consoles.yml | 0 .../Objects/Misc/armaments_beacon.yml | 0 .../Entities/Objects/Misc/books.yml | 0 .../Entities/Objects/Misc/cartridges.yml | 0 .../Entities/Objects/Misc/implanters.yml | 0 .../Objects/Misc/improvised_parts.yml | 0 .../Entities/Objects/Misc/paper.yml | 0 .../Objects/Misc/subdermal_implants.yml | 0 .../Entities/Objects/Misc/ziplock.yml | 0 .../Specific/Medical/expanded_medkit.yml | 0 .../Entities/Objects/Tools/seniors_tools.yml | 0 .../Entities/Objects/Tools/tricorder.yml | 0 .../Projectiles/flamethrower_projectile.yml | 0 .../Objects/Weapons/Guns/crossbow.yml | 0 .../Objects/Weapons/Guns/flamethrower.yml | 0 .../Entities/Objects/Weapons/Guns/tempgun.yml | 0 .../Objects/Weapons/chaplain_weapons.yml | 0 .../Entities/Objects/Weapons/energy_axe.yml | 0 .../Weapons/experimental_stunbaton.yml | 0 .../Objects/Weapons/hardlight_spear.yml | 0 .../Entities/Objects/Weapons/snatcherprod.yml | 0 .../{White => _White}/Fluff/centurion.yml | 0 .../{White => _White}/Fluff/fluff.yml | 0 .../{White => _White}/Fluff/fluff1.yml | 0 .../{White => _White}/Fluff/serbwo.yml | 0 .../{White => _White}/Fluff/sponsor.yml | 0 .../{White => _White}/Fluff/waggier.yml | 0 .../Ghosts/custom_ghosts.yml | 0 .../JukeboxAndStuff/jukebox_stuff.yml | 0 .../JukeboxAndStuff/tapes.yml | 0 .../Customization/Markings/2shonka-parts.yml | 0 .../Mobs/Customization/Markings/cat_parts.yml | 0 .../Markings/egoruch17_markings.yml | 0 .../Mobs/Customization/Markings/felinid.yml | 0 .../Markings/fox_parts-vtergot.yml | 0 .../Mobs/Customization/Markings/fox_parts.yml | 0 .../Customization/Markings/harpy-parts.yml | 0 .../Customization/Markings/human_hair.yml | 0 .../Markings/imercuryi-parts.yml | 0 .../Markings/knifeCappy_parts.yml | 0 .../Customization/Markings/reider207_tail.yml | 0 .../Markings/tajaran-tail-fluff.yml | 0 .../Customization/Markings/warete_parts.yml | 0 .../Customization/Markings/wolf_parts.yml | 0 .../{White => _White}/Mobs/Pets/pets.yml | 0 .../{White => _White}/Mobs/Player/felinid.yml | 0 .../{White => _White}/Mobs/Player/harpy.yml | 0 .../{White => _White}/Mobs/Player/human.yml | 0 .../Mobs/Species/felinid.yml | 0 .../{White => _White}/Mobs/Species/harpy.yml | 0 .../Mood/generic_negativeEffects.yml | 0 .../Mood/generic_positveEffects.yml | 0 .../Mood/moodEffects_needs.yml | 0 .../NonPeacefulRoundItems.yml | 0 .../Objects/Scrolls/magic.yml | 0 .../Objects/Scrolls/scrolls.yml | 0 .../Objects/Specific/Species/felinid.yml | 0 .../Objects/Tools/crafts.yml | 0 .../{White => _White}/Objects/Tools/form.yml | 0 .../{White => _White}/Objects/Tools/key.yml | 0 .../{White => _White}/Recipes/crafts.yml | 0 .../Recipes/hidden_crafts.yml | 0 .../Recipes/lathe_recipes.yml | 0 .../{White => _White}/Research/arsenal.yml | 0 .../Research/experimental.yml | 0 .../SoundCollections/coindrop.yml | 0 .../SoundCollections/felinid.yml | 0 .../SoundCollections/harpy.yml | 0 .../SoundCollections/web.yml | 0 .../{White => _White}/Species/actions.yml | 0 .../{White => _White}/Species/felinid.yml | 0 .../{White => _White}/Species/harpy.yml | 0 .../StatusEffects/criminal_records.yml | 0 .../Structures/Airlocks/qm.yml | 0 .../Structures/Furniture/benches.yml | 0 .../Structures/Machines/atm.yml | 0 .../Structures/Machines/doc_printer.yml | 0 .../Structures/Supermatter/supermatter.yml | 0 .../Structures/Wallmounts/auth.yml | 0 .../Structures/Wallmounts/consoles.yml | 0 .../Structures/Windows/paper.yml | 0 .../{White => _White}/Tiles/floors.yml | 0 .../{White => _White}/event_prototypes.yml | 0 .../{White => _White}/polymorphs.yml | 0 .../{White => _White}/store_categories.yml | 0 .../Prototypes/{White => _White}/tags.yml | 0 .../{White => _White}/tts-voices.yml | 0 147 files changed, 379 insertions(+), 177 deletions(-) delete mode 100644 Resources/Prototypes/White/Catalog/cargo.yml rename Resources/Prototypes/{White => _White}/Actions/catears.yml (100%) rename Resources/Prototypes/{White => _White}/Actions/emotes.yml (100%) rename Resources/Prototypes/{White => _White}/Actions/petsummon.yml (100%) rename Resources/Prototypes/{White => _White}/Actions/types.yml (100%) rename Resources/Prototypes/{White => _White}/Alerts/alerts.yml (100%) rename Resources/Prototypes/{White => _White}/Aspects/Aspects.yml (100%) rename Resources/Prototypes/{White => _White}/Body/Prototypes/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Body/Prototypes/harpy.yml (100%) rename Resources/Prototypes/{White/Entities/Objects/CargoCrates/weaponcrates.yml => _White/Catalog/Cargo/cargo.yml} (62%) rename Resources/Prototypes/{White => _White}/Catalog/Fills/Boxes/security.yml (100%) rename Resources/Prototypes/{White => _White}/Catalog/Fills/misc.yml (100%) rename Resources/Prototypes/{White => _White}/Catalog/seniors_fills.yml (100%) rename Resources/Prototypes/{White => _White}/Catalog/uplink.yml (100%) rename Resources/Prototypes/{White => _White}/Construction/Paperworks/graphs.yml (100%) rename Resources/Prototypes/{White => _White}/Construction/Paperworks/structures.yml (100%) rename Resources/Prototypes/{White => _White}/Construction/Surgery/body_surgery.yml (100%) rename Resources/Prototypes/{White => _White}/Construction/Wallmount/graphs.yml (100%) rename Resources/Prototypes/{White => _White}/Construction/Wallmount/structures.yml (100%) rename Resources/Prototypes/{White => _White}/Damage/modifier_sets.yml (100%) rename Resources/Prototypes/{White => _White}/Decals/drydock.yml (100%) rename Resources/Prototypes/{White => _White}/Economy/card.yml (100%) rename Resources/Prototypes/{White => _White}/Economy/eftpos.yml (100%) rename Resources/Prototypes/{White => _White}/Economy/salary.yml (100%) rename Resources/Prototypes/{White => _White}/Emotes/felinid_emotes.yml (100%) rename Resources/Prototypes/{White => _White}/Emotes/harpy_emotes.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Belt/paramedwebbing.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Head/chaplain_helmets.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Head/night_vision_goggle.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Neck/necklace.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/OuterClothing/chaplain_armor.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/OuterClothing/seniors_outer.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Underwear/Bottom.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Underwear/Socks.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Underwear/Top.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/nigger.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/seniors_other.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/barmen.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/cap_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/centcom.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/clown_humpter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/comisar.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/deadth.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/emergency.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/golden_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/grey.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/greywave.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/hamhell.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/krah.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/lgbthampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/med_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/nuke_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/sb_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/shrek.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/spu_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/virusolog.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Markers/Spawners/ERT.yml (100%) create mode 100644 Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml create mode 100644 Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml rename Resources/Prototypes/{White => _White}/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/armaments_beacon.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/books.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/cartridges.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/implanters.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/improvised_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/paper.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/subdermal_implants.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/ziplock.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Specific/Medical/expanded_medkit.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Tools/seniors_tools.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Tools/tricorder.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/Guns/crossbow.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/Guns/flamethrower.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/Guns/tempgun.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/chaplain_weapons.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/energy_axe.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/experimental_stunbaton.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/hardlight_spear.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/snatcherprod.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/centurion.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/fluff.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/fluff1.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/serbwo.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/sponsor.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/waggier.yml (100%) rename Resources/Prototypes/{White => _White}/Ghosts/custom_ghosts.yml (100%) rename Resources/Prototypes/{White => _White}/JukeboxAndStuff/jukebox_stuff.yml (100%) rename Resources/Prototypes/{White => _White}/JukeboxAndStuff/tapes.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/2shonka-parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/cat_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/egoruch17_markings.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/fox_parts-vtergot.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/fox_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/harpy-parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/human_hair.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/imercuryi-parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/knifeCappy_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/reider207_tail.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/tajaran-tail-fluff.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/warete_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/wolf_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Pets/pets.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Player/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Player/harpy.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Player/human.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Species/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Species/harpy.yml (100%) rename Resources/Prototypes/{White => _White}/Mood/generic_negativeEffects.yml (100%) rename Resources/Prototypes/{White => _White}/Mood/generic_positveEffects.yml (100%) rename Resources/Prototypes/{White => _White}/Mood/moodEffects_needs.yml (100%) rename Resources/Prototypes/{White => _White}/NonPeacefulRound/NonPeacefulRoundItems.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Scrolls/magic.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Scrolls/scrolls.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Specific/Species/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Tools/crafts.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Tools/form.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Tools/key.yml (100%) rename Resources/Prototypes/{White => _White}/Recipes/crafts.yml (100%) rename Resources/Prototypes/{White => _White}/Recipes/hidden_crafts.yml (100%) rename Resources/Prototypes/{White => _White}/Recipes/lathe_recipes.yml (100%) rename Resources/Prototypes/{White => _White}/Research/arsenal.yml (100%) rename Resources/Prototypes/{White => _White}/Research/experimental.yml (100%) rename Resources/Prototypes/{White => _White}/SoundCollections/coindrop.yml (100%) rename Resources/Prototypes/{White => _White}/SoundCollections/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/SoundCollections/harpy.yml (100%) rename Resources/Prototypes/{White => _White}/SoundCollections/web.yml (100%) rename Resources/Prototypes/{White => _White}/Species/actions.yml (100%) rename Resources/Prototypes/{White => _White}/Species/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Species/harpy.yml (100%) rename Resources/Prototypes/{White => _White}/StatusEffects/criminal_records.yml (100%) rename Resources/Prototypes/{White/Entities => _White}/Structures/Airlocks/qm.yml (100%) rename Resources/Prototypes/{White/Entities => _White}/Structures/Furniture/benches.yml (100%) rename Resources/Prototypes/{White => _White}/Structures/Machines/atm.yml (100%) rename Resources/Prototypes/{White/Entities => _White}/Structures/Machines/doc_printer.yml (100%) rename Resources/Prototypes/{White/Entities => _White}/Structures/Supermatter/supermatter.yml (100%) rename Resources/Prototypes/{White/Entities => _White}/Structures/Wallmounts/auth.yml (100%) rename Resources/Prototypes/{White/Entities => _White}/Structures/Wallmounts/consoles.yml (100%) rename Resources/Prototypes/{White => _White}/Structures/Windows/paper.yml (100%) rename Resources/Prototypes/{White => _White}/Tiles/floors.yml (100%) rename Resources/Prototypes/{White => _White}/event_prototypes.yml (100%) rename Resources/Prototypes/{White => _White}/polymorphs.yml (100%) rename Resources/Prototypes/{White => _White}/store_categories.yml (100%) rename Resources/Prototypes/{White => _White}/tags.yml (100%) rename Resources/Prototypes/{White => _White}/tts-voices.yml (100%) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index e23a756ca0..7cde7fbccd 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -97,3 +97,51 @@ cost: 1000 category: Materials group: market + +- type: cargoProduct + name: Ящик с ураном + description: Ящик с 30 листами урана. + id: MaterialUranium + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: uranium + product: CrateMaterialUranium + cost: 3000 + category: Materials + group: market + +- type: cargoProduct + name: ящик с золотом + description: Ящик с 30 слитками золота. + id: MaterialGold + icon: + sprite: Objects/Materials/ingots.rsi + state: gold + product: CrateMaterialGold + cost: 4000 + category: Materials + group: market + +- type: cargoProduct + name: ящик с серебром + description: Ящик с 30 слитками серебра. + id: MaterialSilver + icon: + sprite: Objects/Materials/ingots.rsi + state: silver + product: CrateMaterialSilver + cost: 3000 + category: Materials + group: market + +- type: cargoProduct + name: ящик с бананиумом + description: Ящик с 30 кусочками бананиума. + id: MaterialBananium + icon: + sprite: Objects/Materials/ore.rsi + state: bananium + product: CrateMaterialBananium + cost: 3000 + category: Materials + group: market diff --git a/Resources/Prototypes/White/Catalog/cargo.yml b/Resources/Prototypes/White/Catalog/cargo.yml deleted file mode 100644 index 34ea2aeba9..0000000000 --- a/Resources/Prototypes/White/Catalog/cargo.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: CratePaper - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: paper - product: CratePaper - cost: 1000 - category: Materials - group: market \ No newline at end of file diff --git a/Resources/Prototypes/White/Actions/catears.yml b/Resources/Prototypes/_White/Actions/catears.yml similarity index 100% rename from Resources/Prototypes/White/Actions/catears.yml rename to Resources/Prototypes/_White/Actions/catears.yml diff --git a/Resources/Prototypes/White/Actions/emotes.yml b/Resources/Prototypes/_White/Actions/emotes.yml similarity index 100% rename from Resources/Prototypes/White/Actions/emotes.yml rename to Resources/Prototypes/_White/Actions/emotes.yml diff --git a/Resources/Prototypes/White/Actions/petsummon.yml b/Resources/Prototypes/_White/Actions/petsummon.yml similarity index 100% rename from Resources/Prototypes/White/Actions/petsummon.yml rename to Resources/Prototypes/_White/Actions/petsummon.yml diff --git a/Resources/Prototypes/White/Actions/types.yml b/Resources/Prototypes/_White/Actions/types.yml similarity index 100% rename from Resources/Prototypes/White/Actions/types.yml rename to Resources/Prototypes/_White/Actions/types.yml diff --git a/Resources/Prototypes/White/Alerts/alerts.yml b/Resources/Prototypes/_White/Alerts/alerts.yml similarity index 100% rename from Resources/Prototypes/White/Alerts/alerts.yml rename to Resources/Prototypes/_White/Alerts/alerts.yml diff --git a/Resources/Prototypes/White/Aspects/Aspects.yml b/Resources/Prototypes/_White/Aspects/Aspects.yml similarity index 100% rename from Resources/Prototypes/White/Aspects/Aspects.yml rename to Resources/Prototypes/_White/Aspects/Aspects.yml diff --git a/Resources/Prototypes/White/Body/Prototypes/felinid.yml b/Resources/Prototypes/_White/Body/Prototypes/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Body/Prototypes/felinid.yml rename to Resources/Prototypes/_White/Body/Prototypes/felinid.yml diff --git a/Resources/Prototypes/White/Body/Prototypes/harpy.yml b/Resources/Prototypes/_White/Body/Prototypes/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Body/Prototypes/harpy.yml rename to Resources/Prototypes/_White/Body/Prototypes/harpy.yml diff --git a/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml similarity index 62% rename from Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml rename to Resources/Prototypes/_White/Catalog/Cargo/cargo.yml index 4457d0be07..20014d0bda 100644 --- a/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml +++ b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml @@ -1,3 +1,13 @@ +- type: cargoProduct + id: CratePaper + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: paper + product: CratePaper + cost: 1000 + category: Materials + group: market + - type: cargoProduct name: ящик магазинов для ПП description: ящик с магазинами для пистолетов-пулеметов, заполненными патронами. @@ -10,16 +20,6 @@ category: Security group: market -- type: entity - id: CrateSubMachineGunCrateAmmo - parent: CrateWeaponSecure - name: ящик с магазинами для ПП - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGun - amount: 2 - - type: cargoProduct name: ящик магазинов для WT-550 description: ящик с магазинами для пистолетов-пулеметов WT-550, заполненными патронами. @@ -32,16 +32,6 @@ category: Security group: market -- type: entity - id: CrateWT550Magazines - parent: CrateWeaponSecure - name: ящик с магазинами для WT-550 - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGunTopMounted - amount: 2 - - type: cargoProduct name: ящик магазинов для Лектера description: ящик с магазинами для Лектора, заполненными патронами. @@ -54,16 +44,6 @@ category: Security group: market -- type: entity - id: CrateLecterMagazines - parent: CrateWeaponSecure - name: ящик с магазинами для Лектера - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 2 - - type: cargoProduct name: ящик магазинов для пистолетов description: ящик с магазинами для пистолетов, заполненными патронами. @@ -76,16 +56,6 @@ category: Security group: market -- type: entity - id: CratePistolMagazines - parent: CrateWeaponSecure - name: ящик с магазинами для пистолетов - components: - - type: StorageFill - contents: - - id: MagazinePistol - amount: 3 - - type: cargoProduct name: ящик магазинов для CV-47 description: ящик с магазинами для CV-47, заполненными патронами. @@ -98,16 +68,6 @@ category: Security group: market -- type: entity - id: CrateAKmagazines - parent: CrateWeaponSecure - name: ящик с магазинами для CV-47 - components: - - type: StorageFill - contents: - - id: MagazineLightRifle - amount: 2 - - type: cargoProduct name: ящик патронов .35 авто description: ящик с упаковками патронов .35 авто @@ -120,16 +80,6 @@ category: Security group: market -- type: entity - id: Crate35auto - parent: CrateWeaponSecure - name: ящик патронов .35 авто - components: - - type: StorageFill - contents: - - id: MagazineBoxPistol - amount: 2 - - type: cargoProduct name: ящик патронов .30 description: ящик с упаковками патронов калибра .30 @@ -142,16 +92,6 @@ category: Security group: market -- type: entity - id: Crate30normal - parent: CrateWeaponSecure - name: ящик патронов .30 - components: - - type: StorageFill - contents: - - id: MagazineBoxLightRifle - amount: 2 - - type: cargoProduct name: ящик с большой коробкой патронов .30 description: ящик с патронами калибра .30 в большой коробке @@ -164,15 +104,6 @@ category: Security group: market -- type: entity - id: crate30big - parent: CrateWeaponSecure - name: ящик с большой коробкой патронов .30 - components: - - type: StorageFill - contents: - - id: MagazineBoxLightRifleBig - amount: 1 - type: cargoProduct name: пачки патронов .20 @@ -186,16 +117,6 @@ category: Security group: market -- type: entity - id: Crate20normal - parent: CrateWeaponSecure - name: ящик с пачками патронов калибра .20 - components: - - type: StorageFill - contents: - - id: MagazineBoxRifle - amount: 2 - - type: cargoProduct name: ящик с большой коробкой патронов .20 description: ящик с патронами калибра .20 в большой коробке @@ -208,15 +129,6 @@ category: Security group: market -- type: entity - id: Crate20big - parent: CrateWeaponSecure - name: ящик с большой коробкой патронов .20 - components: - - type: StorageFill - contents: - - id: MagazineBoxRifleBig - amount: 1 - type: cargoProduct name: ящик патронов .40 магнум @@ -230,15 +142,6 @@ category: Security group: market -- type: entity - id: Crate40magnum - parent: CrateWeaponSecure - name: ящик патронов .40 магнум - components: - - type: StorageFill - contents: - - id: MagazineBoxMagnum - amount: 1 - type: cargoProduct name: коробки с дробью для дробовика @@ -252,16 +155,6 @@ category: Security group: market -- type: entity - id: CrateShotgunShell - parent: CrateWeaponSecure - name: ящик с дробью для дробовика - components: - - type: StorageFill - contents: - - id: MagazineShotgun - amount: 3 - - type: cargoProduct name: коробки с травматическими патронами для дробовика description: ящик с магазинами травматических патронов для дробовика @@ -274,16 +167,6 @@ category: Security group: market -- type: entity - id: CrateShotgunShellTrauma - parent: CrateWeaponSecure - name: ящик с травматическими патронами для дробовика - components: - - type: StorageFill - contents: - - id: MagazineShotgunBeanbag - amount: 4 - - type: cargoProduct name: ящик с дробовиками Каммерер description: набор стандартных дробовиков, поставляемых на станции НаноТрейзен. @@ -296,16 +179,6 @@ category: Security group: market -- type: entity - id: CrateKammerer - parent: CrateWeaponSecure - name: ящик с дробовиками Каммерер - components: - - type: StorageFill - contents: - - id: WeaponShotgunKammerer - amount: 2 - - type: cargoProduct name: ящик с CV-47 description: проверенная временем автоматическая винтовка. @@ -318,17 +191,6 @@ category: Security group: market -- type: entity - id: CrateCV47 - parent: CrateWeaponSecure - name: ящик с CV-47 - components: - - type: StorageFill - contents: - - id: MagazineLightRifle - amount: 2 - - id: WeaponRifleAk - amount: 1 - type: cargoProduct name: ящик с Лектером @@ -342,17 +204,6 @@ category: Security group: market -- type: entity - id: CrateLecter - parent: CrateWeaponSecure - name: ящик с Лектером - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 2 - - id: WeaponRifleLecter - amount: 1 - type: cargoProduct name: ящик с винтовками Мосина @@ -366,12 +217,62 @@ category: Security group: market -- type: entity - id: CrateMosin - parent: CrateWeaponSecure - name: ящик с Лектером - components: - - type: StorageFill - contents: - - id: WeaponSniperMosin - amount: 2 +- type: cargoProduct + name: ящик нелетальных магазинов для пистолетов + description: ящик с с тремя нелетальными магазинами для пистолетов. + id: cargoPistolRubberMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + state: rubber + product: CratePistolRubberMagazines + cost: 300 + category: Security + group: market + +- type: cargoProduct + name: ящик нелетальных магазинов для лектора + description: Ящик с тремя обоймами нелетальных магазинов для лектора. + id: CargoLecterRubberMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + state: rubber + product: CrateLecterRubberMagazines + cost: 500 + category: Security + group: market + +- type: cargoProduct + name: ящик нелетальных магазинов для ПП + description: Ящик с с тремя нелетальными магазинами для ПП. + id: cargoSubMachineGunRubberAmmo + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi + state: rubber + product: CrateSubMachineGunRubberMagazines + cost: 400 + category: Security + group: market + +- type: cargoProduct + name: ящик нелетальных магазинов для CV-47 + description: Ящик с с тремя нелетальными магазинами для CV-47. + id: cargoRifleRubberMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + state: rubber + product: CrateRifleRubberMagazines + cost: 600 + category: Security + group: market + +- type: cargoProduct + name: Ящик скафандров СБ. + description: Ящик с двумя скафандрами СБ. Отлично подходит для прогулки в вакууме. + id: cargoSecurityVoidsuit + icon: + sprite: Clothing/Head/Hardsuits/security.rsi + state: icon-flash + product: CrateSecurityVoidsuit + cost: 4000 + category: Security + group: market diff --git a/Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/_White/Catalog/Fills/Boxes/security.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml rename to Resources/Prototypes/_White/Catalog/Fills/Boxes/security.yml diff --git a/Resources/Prototypes/White/Catalog/Fills/misc.yml b/Resources/Prototypes/_White/Catalog/Fills/misc.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/Fills/misc.yml rename to Resources/Prototypes/_White/Catalog/Fills/misc.yml diff --git a/Resources/Prototypes/White/Catalog/seniors_fills.yml b/Resources/Prototypes/_White/Catalog/seniors_fills.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/seniors_fills.yml rename to Resources/Prototypes/_White/Catalog/seniors_fills.yml diff --git a/Resources/Prototypes/White/Catalog/uplink.yml b/Resources/Prototypes/_White/Catalog/uplink.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/uplink.yml rename to Resources/Prototypes/_White/Catalog/uplink.yml diff --git a/Resources/Prototypes/White/Construction/Paperworks/graphs.yml b/Resources/Prototypes/_White/Construction/Paperworks/graphs.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Paperworks/graphs.yml rename to Resources/Prototypes/_White/Construction/Paperworks/graphs.yml diff --git a/Resources/Prototypes/White/Construction/Paperworks/structures.yml b/Resources/Prototypes/_White/Construction/Paperworks/structures.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Paperworks/structures.yml rename to Resources/Prototypes/_White/Construction/Paperworks/structures.yml diff --git a/Resources/Prototypes/White/Construction/Surgery/body_surgery.yml b/Resources/Prototypes/_White/Construction/Surgery/body_surgery.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Surgery/body_surgery.yml rename to Resources/Prototypes/_White/Construction/Surgery/body_surgery.yml diff --git a/Resources/Prototypes/White/Construction/Wallmount/graphs.yml b/Resources/Prototypes/_White/Construction/Wallmount/graphs.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Wallmount/graphs.yml rename to Resources/Prototypes/_White/Construction/Wallmount/graphs.yml diff --git a/Resources/Prototypes/White/Construction/Wallmount/structures.yml b/Resources/Prototypes/_White/Construction/Wallmount/structures.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Wallmount/structures.yml rename to Resources/Prototypes/_White/Construction/Wallmount/structures.yml diff --git a/Resources/Prototypes/White/Damage/modifier_sets.yml b/Resources/Prototypes/_White/Damage/modifier_sets.yml similarity index 100% rename from Resources/Prototypes/White/Damage/modifier_sets.yml rename to Resources/Prototypes/_White/Damage/modifier_sets.yml diff --git a/Resources/Prototypes/White/Decals/drydock.yml b/Resources/Prototypes/_White/Decals/drydock.yml similarity index 100% rename from Resources/Prototypes/White/Decals/drydock.yml rename to Resources/Prototypes/_White/Decals/drydock.yml diff --git a/Resources/Prototypes/White/Economy/card.yml b/Resources/Prototypes/_White/Economy/card.yml similarity index 100% rename from Resources/Prototypes/White/Economy/card.yml rename to Resources/Prototypes/_White/Economy/card.yml diff --git a/Resources/Prototypes/White/Economy/eftpos.yml b/Resources/Prototypes/_White/Economy/eftpos.yml similarity index 100% rename from Resources/Prototypes/White/Economy/eftpos.yml rename to Resources/Prototypes/_White/Economy/eftpos.yml diff --git a/Resources/Prototypes/White/Economy/salary.yml b/Resources/Prototypes/_White/Economy/salary.yml similarity index 100% rename from Resources/Prototypes/White/Economy/salary.yml rename to Resources/Prototypes/_White/Economy/salary.yml diff --git a/Resources/Prototypes/White/Emotes/felinid_emotes.yml b/Resources/Prototypes/_White/Emotes/felinid_emotes.yml similarity index 100% rename from Resources/Prototypes/White/Emotes/felinid_emotes.yml rename to Resources/Prototypes/_White/Emotes/felinid_emotes.yml diff --git a/Resources/Prototypes/White/Emotes/harpy_emotes.yml b/Resources/Prototypes/_White/Emotes/harpy_emotes.yml similarity index 100% rename from Resources/Prototypes/White/Emotes/harpy_emotes.yml rename to Resources/Prototypes/_White/Emotes/harpy_emotes.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Belt/paramedwebbing.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/paramedwebbing.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Belt/paramedwebbing.yml rename to Resources/Prototypes/_White/Entities/Clothing/Belt/paramedwebbing.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/chaplain_helmets.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml rename to Resources/Prototypes/_White/Entities/Clothing/Head/chaplain_helmets.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Head/night_vision_goggle.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Head/night_vision_goggle.yml rename to Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml b/Resources/Prototypes/_White/Entities/Clothing/Neck/necklace.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml rename to Resources/Prototypes/_White/Entities/Clothing/Neck/necklace.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/chaplain_armor.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml rename to Resources/Prototypes/_White/Entities/Clothing/OuterClothing/chaplain_armor.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/seniors_outer.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml rename to Resources/Prototypes/_White/Entities/Clothing/OuterClothing/seniors_outer.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Bottom.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml rename to Resources/Prototypes/_White/Entities/Clothing/Underwear/Bottom.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml rename to Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Top.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml rename to Resources/Prototypes/_White/Entities/Clothing/Underwear/Top.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/nigger.yml b/Resources/Prototypes/_White/Entities/Clothing/nigger.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/nigger.yml rename to Resources/Prototypes/_White/Entities/Clothing/nigger.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/seniors_other.yml b/Resources/Prototypes/_White/Entities/Clothing/seniors_other.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/seniors_other.yml rename to Resources/Prototypes/_White/Entities/Clothing/seniors_other.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/barmen.yml b/Resources/Prototypes/_White/Entities/Hampter/barmen.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/barmen.yml rename to Resources/Prototypes/_White/Entities/Hampter/barmen.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/cap_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/cap_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/cap_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/cap_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/centcom.yml b/Resources/Prototypes/_White/Entities/Hampter/centcom.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/centcom.yml rename to Resources/Prototypes/_White/Entities/Hampter/centcom.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/clown_humpter.yml b/Resources/Prototypes/_White/Entities/Hampter/clown_humpter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/clown_humpter.yml rename to Resources/Prototypes/_White/Entities/Hampter/clown_humpter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/comisar.yml b/Resources/Prototypes/_White/Entities/Hampter/comisar.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/comisar.yml rename to Resources/Prototypes/_White/Entities/Hampter/comisar.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/deadth.yml b/Resources/Prototypes/_White/Entities/Hampter/deadth.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/deadth.yml rename to Resources/Prototypes/_White/Entities/Hampter/deadth.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/emergency.yml b/Resources/Prototypes/_White/Entities/Hampter/emergency.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/emergency.yml rename to Resources/Prototypes/_White/Entities/Hampter/emergency.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/golden_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/golden_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/golden_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/golden_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/grey.yml b/Resources/Prototypes/_White/Entities/Hampter/grey.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/grey.yml rename to Resources/Prototypes/_White/Entities/Hampter/grey.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/greywave.yml b/Resources/Prototypes/_White/Entities/Hampter/greywave.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/greywave.yml rename to Resources/Prototypes/_White/Entities/Hampter/greywave.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/hamhell.yml b/Resources/Prototypes/_White/Entities/Hampter/hamhell.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/hamhell.yml rename to Resources/Prototypes/_White/Entities/Hampter/hamhell.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/krah.yml b/Resources/Prototypes/_White/Entities/Hampter/krah.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/krah.yml rename to Resources/Prototypes/_White/Entities/Hampter/krah.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/lgbthampter.yml b/Resources/Prototypes/_White/Entities/Hampter/lgbthampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/lgbthampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/lgbthampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/med_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/med_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/med_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/med_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/nuke_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/nuke_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/nuke_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/nuke_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/sb_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/sb_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/sb_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/sb_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/shrek.yml b/Resources/Prototypes/_White/Entities/Hampter/shrek.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/shrek.yml rename to Resources/Prototypes/_White/Entities/Hampter/shrek.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/spu_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/spu_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/spu_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/spu_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/virusolog.yml b/Resources/Prototypes/_White/Entities/Hampter/virusolog.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/virusolog.yml rename to Resources/Prototypes/_White/Entities/Hampter/virusolog.yml diff --git a/Resources/Prototypes/White/Entities/Markers/Spawners/ERT.yml b/Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Markers/Spawners/ERT.yml rename to Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml new file mode 100644 index 0000000000..2095696cd8 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml @@ -0,0 +1,39 @@ +- type: entity + id: CrateMaterialBananium + parent: CrateGenericSteel + name: ящик с бананиумом + components: + - type: StorageFill + contents: + - id: MaterialBananium + amount: 3 + +- type: entity + id: CrateMaterialSilver + parent: CrateGenericSteel + name: ящик с серебром + components: + - type: StorageFill + contents: + - id: IngotSilver + amount: 1 + +- type: entity + id: CrateMaterialGold + parent: CrateGenericSteel + name: ящик с золотом + components: + - type: StorageFill + contents: + - id: IngotGold + amount: 1 + +- type: entity + id: CrateMaterialUranium + parent: CrateGenericSteel + name: ящик урана + components: + - type: StorageFill + contents: + - id: SheetUranium + amount: 1 diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml new file mode 100644 index 0000000000..b39dca5408 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml @@ -0,0 +1,223 @@ +- type: entity + id: CrateSubMachineGunCrateAmmo + parent: CrateWeaponSecure + name: ящик с магазинами для ПП + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGun + amount: 2 + +- type: entity + id: CrateWT550Magazines + parent: CrateWeaponSecure + name: ящик с магазинами для WT-550 + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGunTopMounted + amount: 2 + +- type: entity + id: CrateLecterMagazines + parent: CrateWeaponSecure + name: ящик с магазинами для Лектера + components: + - type: StorageFill + contents: + - id: MagazineRifle + amount: 2 + +- type: entity + id: CratePistolMagazines + parent: CrateWeaponSecure + name: ящик с магазинами для пистолетов + components: + - type: StorageFill + contents: + - id: MagazinePistol + amount: 3 + +- type: entity + id: CrateAKmagazines + parent: CrateWeaponSecure + name: ящик с магазинами для CV-47 + components: + - type: StorageFill + contents: + - id: MagazineLightRifle + amount: 2 + +- type: entity + id: Crate35auto + parent: CrateWeaponSecure + name: ящик патронов .35 авто + components: + - type: StorageFill + contents: + - id: MagazineBoxPistol + amount: 2 + +- type: entity + id: Crate30normal + parent: CrateWeaponSecure + name: ящик патронов .30 + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifle + amount: 2 + +- type: entity + id: crate30big + parent: CrateWeaponSecure + name: ящик с большой коробкой патронов .30 + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifleBig + amount: 1 + +- type: entity + id: Crate20normal + parent: CrateWeaponSecure + name: ящик с пачками патронов калибра .20 + components: + - type: StorageFill + contents: + - id: MagazineBoxRifle + amount: 2 + +- type: entity + id: Crate20big + parent: CrateWeaponSecure + name: ящик с большой коробкой патронов .20 + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleBig + amount: 1 + +- type: entity + id: Crate40magnum + parent: CrateWeaponSecure + name: ящик патронов .40 магнум + components: + - type: StorageFill + contents: + - id: MagazineBoxMagnum + amount: 1 + +- type: entity + id: CrateShotgunShell + parent: CrateWeaponSecure + name: ящик с дробью для дробовика + components: + - type: StorageFill + contents: + - id: MagazineShotgun + amount: 3 + +- type: entity + id: CrateShotgunShellTrauma + parent: CrateWeaponSecure + name: ящик с травматическими патронами для дробовика + components: + - type: StorageFill + contents: + - id: MagazineShotgunBeanbag + amount: 4 + +- type: entity + id: CrateKammerer + parent: CrateWeaponSecure + name: ящик с дробовиками Каммерер + components: + - type: StorageFill + contents: + - id: WeaponShotgunKammerer + amount: 2 + +- type: entity + id: CrateCV47 + parent: CrateWeaponSecure + name: ящик с CV-47 + components: + - type: StorageFill + contents: + - id: MagazineLightRifle + amount: 2 + - id: WeaponRifleAk + amount: 1 + +- type: entity + id: CrateLecter + parent: CrateWeaponSecure + name: ящик с Лектером + components: + - type: StorageFill + contents: + - id: MagazineRifle + amount: 2 + - id: WeaponRifleLecter + amount: 1 + +- type: entity + id: CrateMosin + parent: CrateWeaponSecure + name: ящик с Лектером + components: + - type: StorageFill + contents: + - id: WeaponSniperMosin + amount: 2 + +- type: entity + id: CratePistolRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для пистолетов + components: + - type: StorageFill + contents: + - id: BoxMagazinePistolRubber + amount: 1 + +- type: entity + id: CrateLecterRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для лектора + components: + - type: StorageFill + contents: + - id: BoxMagazineRifleRubber + amount: 1 + +- type: entity + id: CrateSubMachineGunRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для ПП + components: + - type: StorageFill + contents: + - id: BoxMagazinePistolSubMachineGunRubber + amount: 1 + +- type: entity + id: CrateRifleRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для CV-47 + components: + - type: StorageFill + contents: + - id: BoxMagazineLightRifleRubber + amount: 1 + +- type: entity + id: CrateSecurityVoidsuit + parent: CrateWeaponSecure + name: ящик с скафандрами СБ + components: + - type: StorageFill + contents: + - id: ClothingOuterHardsuitSecurity + amount: 2 diff --git a/Resources/Prototypes/White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml b/Resources/Prototypes/_White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml rename to Resources/Prototypes/_White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/armaments_beacon.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/armaments_beacon.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/books.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/books.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/books.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/cartridges.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/cartridges.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/cartridges.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/cartridges.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/implanters.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/improvised_parts.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/improvised_parts.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/improvised_parts.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/improvised_parts.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/paper.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/paper.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/paper.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/subdermal_implants.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/ziplock.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/ziplock.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml rename to Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml rename to Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Tools/tricorder.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/tricorder.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Tools/tricorder.yml rename to Resources/Prototypes/_White/Entities/Objects/Tools/tricorder.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/crossbow.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/crossbow.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/flamethrower.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/flamethrower.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/tempgun.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/tempgun.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/energy_axe.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/energy_axe.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/experimental_stunbaton.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/experimental_stunbaton.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/hardlight_spear.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/hardlight_spear.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/snatcherprod.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/snatcherprod.yml diff --git a/Resources/Prototypes/White/Fluff/centurion.yml b/Resources/Prototypes/_White/Fluff/centurion.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/centurion.yml rename to Resources/Prototypes/_White/Fluff/centurion.yml diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/fluff.yml rename to Resources/Prototypes/_White/Fluff/fluff.yml diff --git a/Resources/Prototypes/White/Fluff/fluff1.yml b/Resources/Prototypes/_White/Fluff/fluff1.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/fluff1.yml rename to Resources/Prototypes/_White/Fluff/fluff1.yml diff --git a/Resources/Prototypes/White/Fluff/serbwo.yml b/Resources/Prototypes/_White/Fluff/serbwo.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/serbwo.yml rename to Resources/Prototypes/_White/Fluff/serbwo.yml diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/_White/Fluff/sponsor.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/sponsor.yml rename to Resources/Prototypes/_White/Fluff/sponsor.yml diff --git a/Resources/Prototypes/White/Fluff/waggier.yml b/Resources/Prototypes/_White/Fluff/waggier.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/waggier.yml rename to Resources/Prototypes/_White/Fluff/waggier.yml diff --git a/Resources/Prototypes/White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml similarity index 100% rename from Resources/Prototypes/White/Ghosts/custom_ghosts.yml rename to Resources/Prototypes/_White/Ghosts/custom_ghosts.yml diff --git a/Resources/Prototypes/White/JukeboxAndStuff/jukebox_stuff.yml b/Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml similarity index 100% rename from Resources/Prototypes/White/JukeboxAndStuff/jukebox_stuff.yml rename to Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml diff --git a/Resources/Prototypes/White/JukeboxAndStuff/tapes.yml b/Resources/Prototypes/_White/JukeboxAndStuff/tapes.yml similarity index 100% rename from Resources/Prototypes/White/JukeboxAndStuff/tapes.yml rename to Resources/Prototypes/_White/JukeboxAndStuff/tapes.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/2shonka-parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/2shonka-parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/cat_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/cat_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/cat_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/egoruch17_markings.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/egoruch17_markings.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/felinid.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/felinid.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts-vtergot.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts-vtergot.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts-vtergot.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts-vtergot.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/harpy-parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/harpy-parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/harpy-parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/harpy-parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/human_hair.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/human_hair.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/human_hair.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/imercuryi-parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/imercuryi-parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/knifeCappy_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/knifeCappy_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/knifeCappy_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/knifeCappy_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/reider207_tail.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/reider207_tail.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/tajaran-tail-fluff.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/tajaran-tail-fluff.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/tajaran-tail-fluff.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/tajaran-tail-fluff.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/warete_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/warete_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/warete_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/warete_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/wolf_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/wolf_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/wolf_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/wolf_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Pets/pets.yml b/Resources/Prototypes/_White/Mobs/Pets/pets.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Pets/pets.yml rename to Resources/Prototypes/_White/Mobs/Pets/pets.yml diff --git a/Resources/Prototypes/White/Mobs/Player/felinid.yml b/Resources/Prototypes/_White/Mobs/Player/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Player/felinid.yml rename to Resources/Prototypes/_White/Mobs/Player/felinid.yml diff --git a/Resources/Prototypes/White/Mobs/Player/harpy.yml b/Resources/Prototypes/_White/Mobs/Player/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Player/harpy.yml rename to Resources/Prototypes/_White/Mobs/Player/harpy.yml diff --git a/Resources/Prototypes/White/Mobs/Player/human.yml b/Resources/Prototypes/_White/Mobs/Player/human.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Player/human.yml rename to Resources/Prototypes/_White/Mobs/Player/human.yml diff --git a/Resources/Prototypes/White/Mobs/Species/felinid.yml b/Resources/Prototypes/_White/Mobs/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Species/felinid.yml rename to Resources/Prototypes/_White/Mobs/Species/felinid.yml diff --git a/Resources/Prototypes/White/Mobs/Species/harpy.yml b/Resources/Prototypes/_White/Mobs/Species/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Species/harpy.yml rename to Resources/Prototypes/_White/Mobs/Species/harpy.yml diff --git a/Resources/Prototypes/White/Mood/generic_negativeEffects.yml b/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml similarity index 100% rename from Resources/Prototypes/White/Mood/generic_negativeEffects.yml rename to Resources/Prototypes/_White/Mood/generic_negativeEffects.yml diff --git a/Resources/Prototypes/White/Mood/generic_positveEffects.yml b/Resources/Prototypes/_White/Mood/generic_positveEffects.yml similarity index 100% rename from Resources/Prototypes/White/Mood/generic_positveEffects.yml rename to Resources/Prototypes/_White/Mood/generic_positveEffects.yml diff --git a/Resources/Prototypes/White/Mood/moodEffects_needs.yml b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml similarity index 100% rename from Resources/Prototypes/White/Mood/moodEffects_needs.yml rename to Resources/Prototypes/_White/Mood/moodEffects_needs.yml diff --git a/Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml b/Resources/Prototypes/_White/NonPeacefulRound/NonPeacefulRoundItems.yml similarity index 100% rename from Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml rename to Resources/Prototypes/_White/NonPeacefulRound/NonPeacefulRoundItems.yml diff --git a/Resources/Prototypes/White/Objects/Scrolls/magic.yml b/Resources/Prototypes/_White/Objects/Scrolls/magic.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Scrolls/magic.yml rename to Resources/Prototypes/_White/Objects/Scrolls/magic.yml diff --git a/Resources/Prototypes/White/Objects/Scrolls/scrolls.yml b/Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Scrolls/scrolls.yml rename to Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml diff --git a/Resources/Prototypes/White/Objects/Specific/Species/felinid.yml b/Resources/Prototypes/_White/Objects/Specific/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Specific/Species/felinid.yml rename to Resources/Prototypes/_White/Objects/Specific/Species/felinid.yml diff --git a/Resources/Prototypes/White/Objects/Tools/crafts.yml b/Resources/Prototypes/_White/Objects/Tools/crafts.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Tools/crafts.yml rename to Resources/Prototypes/_White/Objects/Tools/crafts.yml diff --git a/Resources/Prototypes/White/Objects/Tools/form.yml b/Resources/Prototypes/_White/Objects/Tools/form.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Tools/form.yml rename to Resources/Prototypes/_White/Objects/Tools/form.yml diff --git a/Resources/Prototypes/White/Objects/Tools/key.yml b/Resources/Prototypes/_White/Objects/Tools/key.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Tools/key.yml rename to Resources/Prototypes/_White/Objects/Tools/key.yml diff --git a/Resources/Prototypes/White/Recipes/crafts.yml b/Resources/Prototypes/_White/Recipes/crafts.yml similarity index 100% rename from Resources/Prototypes/White/Recipes/crafts.yml rename to Resources/Prototypes/_White/Recipes/crafts.yml diff --git a/Resources/Prototypes/White/Recipes/hidden_crafts.yml b/Resources/Prototypes/_White/Recipes/hidden_crafts.yml similarity index 100% rename from Resources/Prototypes/White/Recipes/hidden_crafts.yml rename to Resources/Prototypes/_White/Recipes/hidden_crafts.yml diff --git a/Resources/Prototypes/White/Recipes/lathe_recipes.yml b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml similarity index 100% rename from Resources/Prototypes/White/Recipes/lathe_recipes.yml rename to Resources/Prototypes/_White/Recipes/lathe_recipes.yml diff --git a/Resources/Prototypes/White/Research/arsenal.yml b/Resources/Prototypes/_White/Research/arsenal.yml similarity index 100% rename from Resources/Prototypes/White/Research/arsenal.yml rename to Resources/Prototypes/_White/Research/arsenal.yml diff --git a/Resources/Prototypes/White/Research/experimental.yml b/Resources/Prototypes/_White/Research/experimental.yml similarity index 100% rename from Resources/Prototypes/White/Research/experimental.yml rename to Resources/Prototypes/_White/Research/experimental.yml diff --git a/Resources/Prototypes/White/SoundCollections/coindrop.yml b/Resources/Prototypes/_White/SoundCollections/coindrop.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/coindrop.yml rename to Resources/Prototypes/_White/SoundCollections/coindrop.yml diff --git a/Resources/Prototypes/White/SoundCollections/felinid.yml b/Resources/Prototypes/_White/SoundCollections/felinid.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/felinid.yml rename to Resources/Prototypes/_White/SoundCollections/felinid.yml diff --git a/Resources/Prototypes/White/SoundCollections/harpy.yml b/Resources/Prototypes/_White/SoundCollections/harpy.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/harpy.yml rename to Resources/Prototypes/_White/SoundCollections/harpy.yml diff --git a/Resources/Prototypes/White/SoundCollections/web.yml b/Resources/Prototypes/_White/SoundCollections/web.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/web.yml rename to Resources/Prototypes/_White/SoundCollections/web.yml diff --git a/Resources/Prototypes/White/Species/actions.yml b/Resources/Prototypes/_White/Species/actions.yml similarity index 100% rename from Resources/Prototypes/White/Species/actions.yml rename to Resources/Prototypes/_White/Species/actions.yml diff --git a/Resources/Prototypes/White/Species/felinid.yml b/Resources/Prototypes/_White/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Species/felinid.yml rename to Resources/Prototypes/_White/Species/felinid.yml diff --git a/Resources/Prototypes/White/Species/harpy.yml b/Resources/Prototypes/_White/Species/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Species/harpy.yml rename to Resources/Prototypes/_White/Species/harpy.yml diff --git a/Resources/Prototypes/White/StatusEffects/criminal_records.yml b/Resources/Prototypes/_White/StatusEffects/criminal_records.yml similarity index 100% rename from Resources/Prototypes/White/StatusEffects/criminal_records.yml rename to Resources/Prototypes/_White/StatusEffects/criminal_records.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Airlocks/qm.yml b/Resources/Prototypes/_White/Structures/Airlocks/qm.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Airlocks/qm.yml rename to Resources/Prototypes/_White/Structures/Airlocks/qm.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Furniture/benches.yml b/Resources/Prototypes/_White/Structures/Furniture/benches.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Furniture/benches.yml rename to Resources/Prototypes/_White/Structures/Furniture/benches.yml diff --git a/Resources/Prototypes/White/Structures/Machines/atm.yml b/Resources/Prototypes/_White/Structures/Machines/atm.yml similarity index 100% rename from Resources/Prototypes/White/Structures/Machines/atm.yml rename to Resources/Prototypes/_White/Structures/Machines/atm.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml b/Resources/Prototypes/_White/Structures/Machines/doc_printer.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml rename to Resources/Prototypes/_White/Structures/Machines/doc_printer.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml b/Resources/Prototypes/_White/Structures/Supermatter/supermatter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml rename to Resources/Prototypes/_White/Structures/Supermatter/supermatter.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Wallmounts/auth.yml b/Resources/Prototypes/_White/Structures/Wallmounts/auth.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Wallmounts/auth.yml rename to Resources/Prototypes/_White/Structures/Wallmounts/auth.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml b/Resources/Prototypes/_White/Structures/Wallmounts/consoles.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml rename to Resources/Prototypes/_White/Structures/Wallmounts/consoles.yml diff --git a/Resources/Prototypes/White/Structures/Windows/paper.yml b/Resources/Prototypes/_White/Structures/Windows/paper.yml similarity index 100% rename from Resources/Prototypes/White/Structures/Windows/paper.yml rename to Resources/Prototypes/_White/Structures/Windows/paper.yml diff --git a/Resources/Prototypes/White/Tiles/floors.yml b/Resources/Prototypes/_White/Tiles/floors.yml similarity index 100% rename from Resources/Prototypes/White/Tiles/floors.yml rename to Resources/Prototypes/_White/Tiles/floors.yml diff --git a/Resources/Prototypes/White/event_prototypes.yml b/Resources/Prototypes/_White/event_prototypes.yml similarity index 100% rename from Resources/Prototypes/White/event_prototypes.yml rename to Resources/Prototypes/_White/event_prototypes.yml diff --git a/Resources/Prototypes/White/polymorphs.yml b/Resources/Prototypes/_White/polymorphs.yml similarity index 100% rename from Resources/Prototypes/White/polymorphs.yml rename to Resources/Prototypes/_White/polymorphs.yml diff --git a/Resources/Prototypes/White/store_categories.yml b/Resources/Prototypes/_White/store_categories.yml similarity index 100% rename from Resources/Prototypes/White/store_categories.yml rename to Resources/Prototypes/_White/store_categories.yml diff --git a/Resources/Prototypes/White/tags.yml b/Resources/Prototypes/_White/tags.yml similarity index 100% rename from Resources/Prototypes/White/tags.yml rename to Resources/Prototypes/_White/tags.yml diff --git a/Resources/Prototypes/White/tts-voices.yml b/Resources/Prototypes/_White/tts-voices.yml similarity index 100% rename from Resources/Prototypes/White/tts-voices.yml rename to Resources/Prototypes/_White/tts-voices.yml From 2b227be6f647fd6f0d9d8822678d970241c3b927 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 24 Mar 2024 09:32:46 +0000 Subject: [PATCH 4/4] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 3aea602812..01a3ad1d49 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -2791,3 +2791,21 @@ id: 217 time: '2024-03-24T09:04:31.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/235 +- author: Armenian + changes: + - message: "\u0412\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0437\ + \u0430\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0440\u0435\u0441\u0443\ + \u0440\u0441\u044B \u0432 \u043A\u0430\u0440\u0433\u043E" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0437\u0430\u043A\u0430\ + \u0437 \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u043E\u0432 \u0421\u0411\ + \ \u0432 \u043A\u0430\u0440\u0433\u043E" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0437\u0430\u043A\u0430\ + \u0437 \u043D\u0435\u043B\u0435\u0442\u0430\u043B\u044C\u043D\u044B\u0445 \u043F\ + \u0430\u0442\u0440\u043E\u043D \u043F\u043E \u043F\u0440\u0438\u0435\u043C\u043B\ + \u0435\u043C\u044B\u043C \u0446\u0435\u043D\u0430\u043C." + type: Add + id: 218 + time: '2024-03-24T09:31:43.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/238