From 6759d6a6142c411ac445a56d9623042383d034a9 Mon Sep 17 00:00:00 2001 From: DieselMohawk Date: Mon, 12 Aug 2024 01:20:56 -0500 Subject: [PATCH 01/15] Sec Vest & Helmet Resprite (Attempt 2) (#30291) * Sec Vest & Helmet Resprite * Made Helmet side sprites better * Vest Alterations In Line With Feedback * Feedback Based Alterations PT.2 (How did I miss that?) * Alterations in line with Art Director Feedback --- .../security.rsi/equipped-HELMET-vox.png | Bin 832 -> 776 bytes .../Helmets/security.rsi/equipped-HELMET.png | Bin 787 -> 662 bytes .../Clothing/Head/Helmets/security.rsi/icon.png | Bin 205 -> 252 bytes .../Head/Helmets/security.rsi/inhand-left.png | Bin 387 -> 394 bytes .../Head/Helmets/security.rsi/inhand-right.png | Bin 380 -> 393 bytes .../Head/Helmets/security.rsi/meta.json | 2 +- .../security.rsi/equipped-OUTERCLOTHING-vox.png | Bin 465 -> 702 bytes .../security.rsi/equipped-OUTERCLOTHING.png | Bin 343 -> 628 bytes .../OuterClothing/Armor/security.rsi/icon.png | Bin 252 -> 392 bytes .../Armor/security.rsi/inhand-left.png | Bin 286 -> 413 bytes .../Armor/security.rsi/inhand-right.png | Bin 291 -> 412 bytes .../OuterClothing/Armor/security.rsi/meta.json | 2 +- 12 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png index 47a6bfb145fc646fbcd7a39d6b676832281a8b94..519d82efe32f32af0c21384348f17146b594a23e 100644 GIT binary patch delta 740 zcmV@MJ>B*x{!{CX2wZK%g+7?7T*U#*qPn;ee-7C zT;2nS|C>9mA9OoC1pvN(*Ni2}1pwga+gE3Mt_UF%0C3+oV}Egy004%=p|d`7dAZx^ zsm=CNc%FwwqXEzJkftf7(<#z41prlL5QGpa2!d<%g%HX$2u=a0)&JU_PNxh1%kx!W z@A@izdp;|fJr+W!G)+z9>-D;so6TlsCp^!~briGcbKi&0IRL=(JTo^xeMsUMagsRc zXFdUpF*KV^$bYx*KW((1A1%+H9e?Q#-o1HY??{<2#!RmJoSQ{!^x_$FI@G9TeUWpH zR;y*6)n#peZ#&pkm$iL8)@rrD=Q~t3+U|K2A&Fy*$7AzL;uz;qwD4Y5oKheRLktFk zYrm0Fs?lgvSqcDG=>`CYhlfU^-|s5`CM{j`GoOI0Mt`eVytW&LA%Mlj+s|PbR;F)| zQYx46b!e~Chm}HW6TU%fojwo*K@bE%5ClOG1VIo4K@hiE>b0nO)%iW6J& z>X1#6Tomd{aH}L*=w1Qe_rW03>(qLSCr*Es^#6=z;Qzqj%P@@f~_H%PS?96sn zl3pi|xV`{(XFM&mh~yQsv~0~`VY9xhj0`aTe*rOoqp^qq9F0W`;Akvj07qjH12`Is z7{Jk3!~l-QA_j0Y7BPUMAQ+0H8yx&9`n((2&-?qX-wYx5H#YwGBHQU@tnCLe`D``| ze!m|gk$(s@n@#Qk__Vi2(JdoX;tw`Asf{Sje!mZeLcz8PwjRRd@rMdG*4D@XD{a1{ z{CRv#mzGXVz~u2Zcr_NIb~qfSs6YdL939#IafYM60w``Rxbj~Q4ya)AZh>Q|aZzJh z*9nexfLfJeu}Belwo};QD#2Iiwt4mCWgA;6@PwQo*T8Vr<5A}N8(V4%9csxGL<#JTF?!1M52u_2O z!Wakypi-%LYCtlX9QJxWs(Wp=HaIyf+;knU$9E04C;HzcE(n4k2!bF8f*=TjAPB-G b2NvKrw}o_e;_eG!00000NkvXXu0mjfRP}J; diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png index fd0c4dd25d592d8337bb365515a28ffa2ca4a513..e849900b9b0a9e3380f5d01485d09ec9efa4c6b6 100644 GIT binary patch delta 625 zcmV-%0*?KY29^boFn za{&6k-LW|->_yu1?v?E{{f_fbXI5j`kWy;j^U8LTrWlPzR)6sw(-Xp8q@%+S?RFck z>mtu{WLX9Px`{=QQtBWG*2cG4gu5nR4ttUAbPoUkS(a6UqtiV=*o(Aj0w$!CS_rW= zz7PUZO5^y(cfe#k#eLs{=XqEx765=WP4O*BO@}g8-1d2%!*$(q@_C-uj+-!Efaoy9 z)7NiLSNq?+dVe-J`*?1gfT=V|;Q4+z>1w|Xqeo!X$+38Tlk-hoEtj}jE|De)=JR>^ zNt2{JwsmnFuYJz`)W7N2{eEBf`~6z1qOXY@%0#YfHyQh;IavQ}RRa!(!^Zvt5D^g( z5fKp)5fKrQwT;vV6h2t)(VIG2vkPonqhMVh&}y~d`+q)?`lh7b_97ffsXN_n*)DQW zN&yx%3dZ#TyL&qT0HsuI@=7V}3$gaJa+eXjB6B(?*QQU{=8BO zpJy|hA*@|qT-4f+gP_dGhSdT9z^pRym#6P*^#Uiy!gkney;zC!X7FTC&}>Ywvo|`l^gb7zkcCu+1ztaopSztwm$I7J0ouORfWkXXPC+L`(|&A>TD5M zz5lJ4!{@bUeJ`gc=Wz5re*Wx$u-%`vLdng4epxNKoN3(Vqb4j76FYO?`P~oBo;#;A z|NQKKVFD7a=c;WNHy^BL*e5H0|Ni|l?gWO#7dh-|einK-bMxKXmzAjJF{~M~Y!(gb72?#teofNf#MBjxJ)H08#LRVa~t#{icU9YUgcSb$Ttsb&kar zdzBvqNgO;HzB<%nY0!kzPZKO;E~zub_xJ5-Z|J^%_x57th%<>+bDehI-Nt=zn_ffr z^ItYnZsPK73s>H{S6ce0>Gb0l^+!KE5}aPnGG`uRPDfX`?CtZDC%bmuQh(7H_eOed zH+R@}?fZ<#uVsu+{rvZRy z+qwrHJc{2}ktem!K=9~uYv%3ed+*uwzhK>X@TFo$SEusXG~r)=_g!bdZ`5`4(VDo7 z^|S5R6MhSnu$|qQXwT6U>i3kT+Uzopr0PRd$R{#J2 diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png index 325084b69fcf7afcbefa810c075063362a26e4f4..701dd659a5a8db84aee5012f5e96c8cf9dcfdefb 100644 GIT binary patch delta 236 zcmVm`pWVYpSXOz&Xe5>O!B2D_}E&S*||jjtyYDX z@2{GEl&xjeG5Z466SO=~bn&-+DJgU~|c8hMg#YI|LI(@O>_%)r2R7=#&**XOTD0g7Jmba4!caDO|^o3Gh`hxP1s#{2*G9X-au)Ep90 z8hCOu$HPRmq@%)rCy6XM;Ni&CGoNEgr>}2wyQ9Y1_51FB*e&MY{kpG2??s>glFeJ! zZen1$#J_592-C~Zb}McNgMB?4g&f2-ENFNzhgHCLX@+L-owWhmn3%Ti{G6kc%EwtU z@A-|l0ci^!aB6xqPHYm9(EQ!=~3S4cFjE6Wy3U0xBfl^L(B{S00000 z002PfhB!0O%W@EB2DWL{9F>MSGtfrswo(0pr)MY1vTP)M_utF1)aOSjNy^_Bduv14 z>buZ5A7JBqW}vR0-QPIdv-K6&rhfsff)%Q^s01nO< XRoIbs4150400000NkvXXu0mjf&~~u0 delta 364 zcmeBV{=+muvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g>fKQ04 ziII_}re3{fI;Z~ zxpP2q&H|6fVg?4j!ywFfygq+L3Q+WUH++Xa#$@!IyYsv(H-$9E0P5z3Fzk`@6It^7^ y?)`sa>9VJR$yDV^m3X6+kk;MR2@JvlcNq;ouK8Lo6OsV*6@#a%pUXO@geCwz>xU5l diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json index 20fb373db65..acafec0f309 100644 --- a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", + "copyright": "Made by DieselMohawk for use in SS14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png index 1d9b1d145965586bf68a08f1b5f872e0460b9174..413594691f9b9cae6cd4377fccc64597dbbc1fc3 100644 GIT binary patch delta 689 zcmV;i0#5zW1HJ{28Gi-<0063Kaozv`00DDSM?wIu&K&6g00MYPL_t(|obB4Xj^Z#B z2H>AfY}r5%G?qYA5mgG_|2ZhA5EWviG+11%T$C+#9EHow#(}UJ?fE2%NizOVjFTDZ z7$AfYLI@$`ztnNLIEtczbB^tHi#U$U-&IN#lgR{0l3=-9I)9D%uk-!77b>NS!C(LY zkWxY^Rm5@JQA!n3N(dn!geZ@@6wx%_o_i+WsZe{f)9Dlda5x+g1OWhGv)SNsxuA`k z|0=(#Y5p&li$7<+{P}o1R*Qp_(q%Yj)%?@xRDPbxul)!B0Amcs802|g9=lvF0Dv@2 z!5DKcz%}3M^?!Qbp0CSk0yyW$^Bh75aL%E%hLjRXlE4@P&be~|uKBlLfR(0cqkQM* zHHxCb^E@!dptZ(uI7FJJ$n(6_zW~+z(P(sce7D;*%6D1;*6j-LJg{arzfDg0<_jxuh*@;1V6_vhQr}qc2iF8fGCQtp10+4*NS%G|&0G|+7 zD@!{~P0i5IP)7%c;Gi&PC%5phsJy(q$jC?=D|=U0SD?a#TvHVw#ZwaG7yKUq7=-Sh zI|mf!EbxddW?+@Hn0Bx4@ba4!caDO}PHQylx9=A-vneYDIzh2i+xK{V$ zr{famCNXMSYwJXM{+_OLP^jU)kV+P>Ymj-Jgvz-Yjx%eWtwfogF1cqF<#31P?K{V( zJY8Mcj#I_2bTYIV3FmCRrYjaR>w%GQ!+BO~Q^zlRj->LYvAQ*g9AcT!RR3n8-vJJz z;{Vg^S^{?48Za3M$2^_IkSU^jHagnavv{ISL!UD|rdntqi<8 lhv!~0=QM^I%^TmPqgF4!^>+1?JYWbic)I$ztaD0e0swf>vbF#K diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png index 427c203b198f8124ab283106ea28c080a1f0a726..95cf642147e5593f2917ace70aea389464d798e8 100644 GIT binary patch delta 615 zcmV-t0+{{R0`vrs7=H)`00020X>r~F0004VQb$4nuFf3k0006mNkl_m2 zO_UjcF~%5UjQyVmE-#MbxDi5NzuzOvGV{Aisb)Hz;&?nFO@C9THNQJQeD;M(sb(^n z005+vP)arJb5cqW5r_y%sm3nuRr<V#JQD8hC0|0ir9jdBAA8-C% zzO8HiFP9g8?!5W_a5&h-K}zYeoHIMWEKBq7$$$D10Dvfpyq@=EuRk0PUy|>%0YV69 zt#Lk|&CjZ;0)GIUPA3Qu~A}UH9ITBxwM& z?Xh0w0`AqZTrN#lYQ0`x3`_JfA8>EsBuSdKKUfq6Hk(bao3L7~nsz3ks;Y}O|EShm zoLXa#*z*E?d3A=@1}qkfo7dqx`PSgv9kvM}-qsbiy>ceOYXg9fsf_j>kmtGYa!;{G zVQ#g`U0`@`z;~YjUrzUcIF2u_w=_)$*Yg7JV9z96&jnuB_{h^IAj`7BXf*n3@jTDb z_UnnrCA$+MLRpq~hat4qZ~vo=F~%5Uj4}4}{07724!Hxjrak}w002ovPDHLkV1n0h BA8Y^s delta 328 zcmV-O0k{721lIzP7=Hu<00013M{Ml?001gbOjJbx000;l86zSlDJdyBIX*l(KS4l1 zLqbMHMMYCmR#jD1S5{hCSy^swZg}atJpcdz0d!JMQvg8b*k%9#0NY7KK~zY`?bAI9 z!axuO;D;lm_XK)_g;9$I!B$%l4-iO^Dv&}XWsb7l66+MXL4Q~)TfK{=Gw}xmv5>s( z4If(!J3yarW@v!vn~rr1N|*P(%9#(MgB-}oUNlWEU!Wr|6xcVl2G#YVz^OynFgu%u^ceSs7=k2L=K3{k`*B4{y+8kv*_CeV9)BC6UeGVA!i^5W1tIw zK?j^ASUiBpoQ3Ycer6o_mkLF+OFCcxZF;A3E<_5e;KNEk5PWxgzZ aev=zDtvcEW$;fR000002BRSsnmrn&zYYM*{l3k8Rr$Lcn|fVnXjdAq3jC z%`#z@faj>Yu5v>}5D|bBcU|}L-V(As01!f8p69fFPU7)+WY>C2K+`no>&J0SG4LX6 z3E97)F($57E2^pj;Cj8XUawR0aU8MMF0T95{cVhibzM`}{{}cs6Vo(hH7^tjggy$QVH-0aRt&qz|YSwCMG5)C+Fzk;Ogoc7#J8D8X6fH znU|MWQ&V#zRpuj55o1Y^UoeBivm0qZPMfETV~EE2Fo<9*#v4-dPzLGnk7w gb}}4vI3~c%FzLC$%f(iEwt;-%>FVdQ&MBb@0P_({0ssI2 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png index aea0f39676c9a3df42501063df31031b33721268..c571e77c872fab7191e48677a2422fe5140efc5f 100644 GIT binary patch delta 399 zcmbQoG?#gTL_G%^0|UdV%))y>im^Dz-HBn{IhmJ0cDSdDV@SoEx3~7MYBrEy{czb^ z#8n`MsY$`YV)yTV>lH12a&*<7m@ASgte?5~`k|kW?R8s<+GaepW)Oq{Mu*VQQ)zYL z+jiEMIBPEDYGMdFHQj#Zv+@nk%+8kXlwa2Vw7zoR-yONPkJoLh+rRjEPmq^ro8q_4 zwuw~%_rIU`EOXgJ(Nl<(VczqFxwnIxc5ixiZj(=GY`clCVc%lI?cYQh8Z7!483ILe z=l}h)&gZ93@ng;pwep7z5+bMNn)wRX-2ZRzXy?4*@3r+aZdWk1C2p8?zcu&W;nQn0 zxKvvj1eiY8+a%9RH}NgL&0X+y?as~)ICyb7=B9kX#YBU3$L^Je)<2l5*U)#l^y1aO zjJJWTLhGE>>#|F?wA(l5iaQ+tsa=p-e_$K;g2!)I{%nN_a_-n<|6tMK2X8iMoeuhY kTy9=0gVG}YKTK2pAM_WWb!#Os#2Gj|UHx3vIVCg!0O!2AHUIzs delta 271 zcmbQsJdbIDL_G^L0|P^Zd(K-RB@y5g;tHfSH8mX_9D)J^LqkI&BO?&v6Xy0jT<2JSLr09Cm$O|%N3Iw!;OO75e~wg^!JF0KWJZU;3aRxM>^UU;d=Mwo+f$t5Pfgr&??nT+f@ zOPOwXakFp~iaY4)-nl5!vWSDho4bTnPlKuFq23FwQ`{S;ixo74Y49v_Vq(~@B5sqS T>lp_000W1otDnm{r-UW|%~4g# diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png index cef6f162c719878faa0304435ed3aa68bb35ba13..830a503736a44ff430f13d05d1b9d67fcef34387 100644 GIT binary patch delta 398 zcmV;90dfAL0-OVo7=H)`00020X>r~F0004VQb$4nuFf3k00042Nkl9S7)Af`7rn+(v);0T=)tDFTcz z2PRJW6wyR8Y9^r_=U1DuJ|GLEvKsu%0jGDLvNy-w;(SQ}ENp<--=}nvl6?n|SU+La ziUlQLi~lB+`|;^IQD*@u*r`%J(2bX&a*lYtpv~*uBj`+eV0J*Av a@C0#A7e40000 Date: Mon, 12 Aug 2024 06:22:03 +0000 Subject: [PATCH 02/15] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5492d695b5b..38cc8ed9ed1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: EdenTheLiznerd - changes: - - message: Removed the throngler from the grand lottery - type: Tweak - id: 6597 - time: '2024-05-15T21:02:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28060 - author: deltanedas changes: - message: Fixed ninja criminal records hack not changing sechud icons. @@ -3795,3 +3788,10 @@ id: 7096 time: '2024-08-12T03:57:50.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28688 +- author: DieselMohawk + changes: + - message: Resprited Security vest and helmet + type: Tweak + id: 7097 + time: '2024-08-12T06:20:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30291 From d220249902028b9ecd983e6556ec887b854ac0d5 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 12 Aug 2024 17:04:21 +1000 Subject: [PATCH 03/15] Hotfix #30291 (#30932) * add * Revert "add" This reverts commit 2b4ae87c4fbdd80d224ab19a655c9c547fcc43fd. * add --- .../security.rsi/equipped-HELMET-vox.png | Bin 776 -> 1823 bytes .../Helmets/security.rsi/equipped-HELMET.png | Bin 662 -> 1718 bytes .../Head/Helmets/security.rsi/icon.png | Bin 252 -> 1282 bytes .../Head/Helmets/security.rsi/inhand-left.png | Bin 394 -> 1509 bytes .../Head/Helmets/security.rsi/inhand-right.png | Bin 393 -> 1488 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png index 519d82efe32f32af0c21384348f17146b594a23e..815ba143e536f400648773405f84a31c91b6c300 100644 GIT binary patch literal 1823 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IS84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aJzRZ!T|;d2A&OBAfrz4-ZKIFH z88#r#TSW$?7U$=bf`Z@9$jrnB93&{Bh=_pbh`_1?SrlDIKt_H^J}_YwWhQ&(m82FG z6af<%#73xnxK*H=g|Iv{FSEqX2xi~sc3d|4@SJ7GrQY*`8<-E3JY5_^Dj46++TSnaC~~~LnL*khOU07c{ZZhA zg#5%m%4^nLK6c~Qji_JhHzFb=t-1fRNluiOVY{?Z$DN_NLC zjpt^vO%iKcb?5chIbXeRb-6O0lixaPQH)-9*49;@jwUHS`@GXZ?{d|Afd@5-hSeh@CaK6xWxqEfD{rGoTTWF7R zgPKU`j8~t}FkbRe6WDxj`5Z|Gm-ck!wSWH{p8oxpqu3L{T|ZyM)O~w*+5TJHe47fN zsvYYln?~N}?+|u+k!W;-?}u((eB87}`*zqnq~5p5VwPIMo_j{o`%@LWgTQ-6p=DDg zc-WFmq$+Q#RC`u#z8SOqcJ9?yB}V>z@l5Y^6Sz)=1{!EheS3AMiu$H4j?4?VTbm^K z+N)dN+W7A@ijb9+JjWKq_U3k7*Phzqd%|aL&)chhXEMHEZ2aGQAbyLRVM?5pzdERL N@^tlcS?83{1OOZVq5%K^ delta 740 zcmV@MJ>B*x{!{CX2wZK%g+7?7T*U#*qPn;ee-7C zT;2nS|C>9mA9OoC1pvN(*Ni2}1pwga+gE3Mt_UF%0C3+oV}Egy004%=p|d`7dAZx^ zsm=CNc%FwwqXEzJkftf7(<#z41prlL5QGpa2!d<%g%HX$2u=a0)&JU_PNxh1%kx!W z@A@izdp;|fJr+W!G)+z9>-D;so6TlsCp^!~briGcbKi&0IRL=(JTo^xeMsUMagsRc zXFdUpF*KV^$bYx*KW((1A1%+H9e?Q#-o1HY??{<2#!RmJoSQ{!^x_$FI@G9TeUWpH zR;y*6)n#peZ#&pkm$iL8)@rrD=Q~t3+U|K2A&Fy*$7AzL;uz;qwD4Y5oKheRLktFk zYrm0Fs?lgvSqcDG=>`CYhlfU^-|s5`CM{j`GoOI0Mt`eVytW&LA%Mlj+s|PbR;F)| zQYx46b!e~Chm}HW6TU%fojwo*K@bE%5ClOG1VIo4K@hiE>b0nO)%iW6J& z>X1#6Tomd{aH}L*=w1Qe_rWh?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aJzRZ!T|;d2A&OBAfrz4-ZKIFH z88#r#TSW$?7U$=bf`Z@9$jrnB93&{Bh=_pbh`_1?SrlDIKt_H^J}_YwWhQ&(m82FG z6af<%#73xnxK*H=g|Iv{FSEqX2xi~sc3d|4@SJ7GrQY*`n}LC8r>Bc!NCo5DSr@x5JBYNoYi~6a57Sw5d)b4s zg-heO?)~PlJFqUi>Sgcyhr$)gkD4ohd*1YQ z9E&}^R@timwO%=0*VLYJSsQlxYP;;`ZFXzR51f~GEu7qJ?$&k45s|~vU6r_Q#!u+w0A4_$-d){zZ{Bq)^+9jKIvY!ch%d@?K|Bd zCo6O8ZCP}D#3D`Q(la z4iCEwv*0kH!$mt=&hBzM_^LqUWVrmD>yHG^sP%t5{G`Y3{dLd9dlT9BEi9b7=3ARY zO3#g)Y>_qP3?WZz za{&6k-LW|->_yu1?v?E{{f_fbXI5j`kWy;j^U8LTrWlPzR)6sw(-Xp8q@%+S?RFck z>mtu{WLX9Px`{=QQtBWG*2cG4gu5nR4ttUAbPoUkS(a6UqtiV=*o(Aj0w$!CS_rW= zz7PUZO5^y(cfe#k#eLs{=XqEx765=WP4O*BO@}g8-1d2%!*$(q@_C-uj+-!Efaoy9 z)7NiLSNq?+dVe-J`*?1gfT=V|;Q4+z>1w|Xqeo!X$+38Tlk-hoEtj}jE|De)=JR>^ zNt2{JwsmnFuYJz`)W7N2{eEBf`~6z1qOXY@%0#YfHyQh;IavQ}RRa!(!^Zvt5D^g( z5fKp)5fKrQwT;vV6h2t)(VIG2vkPonqhMVh&}y~d`+q)?`lh7b_97ffsXN_n*)DQW zN&yx%3dZ#TyL&qT0HsuI@=7V}3$gaJa+eXjB6B(?*QQU{=8BO zpJy|hA*@|qT-4f+gP_dGhSdT9z^pRym#6P*^#Uiy!gkney;zC!X7FTCznTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Ug$@zIU`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{ zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?* zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McEVJ- UM`U3~DyaPNboFyt=akR{0OnYw>i_@% delta 211 zcmV;^04)E43j6_(F@Ls6L_t(oh3(M63BoWG#__)*vC$D!Xwp%7bO|?c2Pbd|kB(w1 zr~~w%slCLD7C{garMS9oG2u2dBuRo& zil%9(>l(nvln5$dQtRi78Ne&FJ)iU762U)kK3$khHCk(`s!RgFImhklLZ6B&U^9bR zu0H1FZcA|}g9{9UH{R?w>tEL6h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2Xt=`Ln;{G&f4pD*g)WT?2+Rk5{!&Nnn6nprmgXr zSix0xE$_`59UmLU{sZT#U7A=k5?Ry|IAXe_PkYML#{{(3FVXmR^ZWO^`X@`&S@Z-L z7_p-dY8&h&p0yXwspgiDnS4>B-};i7O!j`4lgl%sJm zeHAx$^6{B=dY#zIw_sr6er?(H2lNAZ;Eko%g;S8c-{IW?X9=t>e*j+ z?n*Ph_V??~UbowF&&@BZRT#|KTY0Pe{{+_8#jm#>?JvddZ$x-B9#wG&P1)M8Yerz1 zh^XrMi~Sco3$JXIKQL7={Xc_s!@9}SH|+Q&c;gqd#)i$SXV2MPr!RbM{-*kdH;R8b za^e|O*R%hO|2*Men5&Xe;lW&pUMXfh)Kt-<Dnm{r-UW|9P$OA delta 355 zcmV-p0i6Ej3yK4fFn<9=NklWvCFdTU%^or@4X4jtU4zaAyF8+(RjG=*=Ri6tAB9ItX-JA07;t97OJXB zX_~GIOp?USXNy*|>YQ2y#TSvHn>$I;)vZ>Am+!Bdew3|c)iL`5*5xlxoy=;~rbBDn zeP3B#{VnjAf-SSQ8CVCd7nH7Y$kskggRx<=0K;%iQv6V|@VVwO>4Ym33UJnqvR}002ovPDHLkV1f*l Br?db7 diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png index 31f0109985cc63ccbfc17398257d16c73fdc81a8..0dbc1447027e88afc12abe267380ad004d5bdce9 100644 GIT binary patch literal 1488 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2XRX6vL!IaA+MB)U0!7ch*X%CrSLzGJART9z)#8vqxvtZ>x)S%l8jI`|Voaof|Rd zw_P@QTRCs~-InXq%|Cvzx%%tnqn(?AWw~Fgrt8`KKl}aGj%^pS|4erOJKx@)_1?Xu z$3CxfEb(2R9e0ACNr3?$+QzcW$T%Uo|Kprhy7!LGWQ73K`0A*+rEvf|%iEfUt`)CmGM=ihs#DdUyknDG>PqPY3#Yt1SiE2B8q2~i3z5Yl zo>}JS)7W-2EK6gnsGAk}KuRk5dG))W?{~GD%=M4t|N0<({U?XBZg$K8#ab=wz~FEE b@B4uJ%-yaP_RBM$gGy6RS3j3^P6YO%G-lk)rEcT}gjVE`NR2;w^U)*tIU18~*{nrB4qI;{C7QnT;{lJJa-i z2%Kl$Tp04p*LKZ3+GWEuO}G9&1VhXW000000000$=!Q5m(8~~K2DWL{9F>MSGtfrs zwo(0pr)MY1vRiB Date: Mon, 12 Aug 2024 17:14:45 +1000 Subject: [PATCH 04/15] Make mantles loadout only. (#30929) * remove cloaks and mantles from dresser * remove mantles from lathe * add role timer loadout thing * add back cloak dresser * fix test fail * potentially fix test fail (?) --- .../Catalog/Fills/Lockers/dressers.yml | 22 +++---- .../Entities/Structures/Machines/lathe.yml | 7 --- .../Loadouts/Jobs/Cargo/quartermaster.yml | 18 ++++++ .../Loadouts/Jobs/Command/captain.yml | 18 ++++++ .../Jobs/Command/head_of_personnel.yml | 18 ++++++ .../Jobs/Engineering/chief_engineer.yml | 18 ++++++ .../Jobs/Medical/chief_medical_officer.yml | 18 ++++++ .../Jobs/Science/research_director.yml | 20 ++++++- .../Jobs/Security/head_of_security.yml | 18 ++++++ .../Prototypes/Recipes/Lathes/clothing.yml | 60 ++----------------- 10 files changed, 138 insertions(+), 79 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index d04b6aff60a..febfe23ad16 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -7,13 +7,11 @@ contents: - id: ClothingHeadHatCaptain - id: ClothingHeadHatCapcap - - id: ClothingNeckCloakCap - - id: ClothingNeckCloakCapFormal - id: ClothingUniformJumpsuitCapFormal - id: ClothingUniformJumpskirtCapFormalDress - id: ClothingHandsGlovesCaptain - - id: ClothingNeckMantleCap - id: ClothingOuterWinterCap + - id: ClothingNeckCloakCap - type: entity id: DresserChiefEngineerFilled @@ -22,12 +20,11 @@ components: - type: StorageFill contents: - - id: ClothingNeckMantleCE - id: ClothingUniformJumpsuitChiefEngineerTurtle - id: ClothingUniformJumpskirtChiefEngineerTurtle - - id: ClothingNeckCloakCe - id: ClothingHeadHatBeretEngineering - id: ClothingOuterWinterCE + - id: ClothingNeckCloakCe - type: entity id: DresserChiefMedicalOfficerFilled @@ -36,8 +33,6 @@ components: - type: StorageFill contents: - - id: ClothingNeckMantleCMO - - id: ClothingCloakCmo - id: ClothingOuterCoatLabCmo - id: ClothingUniformJumpsuitCMOTurtle - id: ClothingUniformJumpskirtCMOTurtle @@ -45,6 +40,7 @@ - id: ClothingHeadMirror - id: ClothingEyesGlasses - id: ClothingOuterWinterCMO + - id: ClothingCloakCmo - type: entity id: DresserHeadOfPersonnelFilled @@ -53,11 +49,10 @@ components: - type: StorageFill contents: - - id: ClothingNeckMantleHOP - - id: ClothingNeckCloakHop - id: ClothingHeadHatHopcap - id: ClothingOuterWinterHoP - id: ClothingEyesGlasses + - id: ClothingNeckCloakHop - type: entity id: DresserHeadOfSecurityFilled @@ -66,15 +61,14 @@ components: - type: StorageFill contents: - - id: ClothingNeckMantleHOS - id: ClothingHeadHatBeretHoS - id: ClothingHeadHatHoshat - - id: ClothingNeckCloakHos - id: ClothingUniformJumpskirtHoSAlt - id: ClothingUniformJumpsuitHoSAlt - id: ClothingUniformJumpskirtHosFormal - id: ClothingUniformJumpsuitHosFormal - id: ClothingOuterWinterHoS + - id: ClothingNeckCloakHos - type: entity id: DresserQuarterMasterFilled @@ -83,14 +77,13 @@ components: - type: StorageFill contents: - - id: ClothingNeckCloakQm - id: ClothingHeadHatBeretQM - id: ClothingUniformJumpsuitQMFormal - id: ClothingUniformJumpsuitQMTurtleneck - id: ClothingUniformJumpskirtQMTurtleneck - id: ClothingHandsGlovesColorBrown - - id: ClothingNeckMantleQM - id: ClothingOuterWinterQM + - id: ClothingNeckCloakQm - type: entity id: DresserResearchDirectorFilled @@ -99,13 +92,12 @@ components: - type: StorageFill contents: - - id: ClothingNeckMantleRD - - id: ClothingNeckCloakRd - id: ClothingHeadHatBeretRND - id: ClothingHandsGlovesColorPurple - id: ClothingEyesGlasses - id: ClothingOuterWinterRD - id: ClothingOuterCoatRD + - id: ClothingNeckCloakRd - type: entity id: DresserWardenFilled diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8f6fb16f046..98d5440e3ed 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1065,13 +1065,6 @@ - ClothingOuterWinterWardenUnarmored - ClothingOuterWinterQM - ClothingOuterWinterRD - - ClothingNeckMantleCap - - ClothingNeckMantleCE - - ClothingNeckMantleCMO - - ClothingNeckMantleHOP - - ClothingNeckMantleHOS - - ClothingNeckMantleRD - - ClothingNeckMantleQM - ClothingOuterWinterMusician - ClothingOuterWinterClown - ClothingOuterWinterMime diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml index ecdf1e5ffee..60fc1834fb5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterQM + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobQuartermaster + time: 72000 #20 hrs + # Jumpsuit - type: loadout id: QuartermasterJumpsuit @@ -42,6 +52,14 @@ neck: ClothingNeckCloakQm - type: loadout + id: QuartermasterMantle + equipment: + neck: ClothingNeckMantleQM + effects: + - !type:GroupLoadoutEffect + proto: MasterQM + +- type: startingGear id: QuartermasterMantle equipment: neck: ClothingNeckMantleQM diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index f665038ff20..9043354a315 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterCap + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobCaptain + time: 72000 #20 hrs + # Jumpsuit - type: loadout id: CaptainJumpsuit @@ -45,6 +55,14 @@ id: CaptainMantle equipment: neck: ClothingNeckMantleCap + effects: + - !type:GroupLoadoutEffect + proto: MasterCap + +- type: startingGear + id: CaptainMantle + equipment: + neck: ClothingNeckMantleCap # Back - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml index 76c46d7d1a0..45223bea149 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterHoP + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobHeadOfPersonnel + time: 72000 #20 hrs + # Professional HoP Time - type: loadoutEffectGroup id: ProfessionalHoP @@ -35,6 +45,14 @@ id: HoPMantle equipment: neck: ClothingNeckMantleHOP + effects: + - !type:GroupLoadoutEffect + proto: MasterHoP + +- type: startingGear + id: HoPMantle + equipment: + neck: ClothingNeckMantleHOP # Back - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml index 522f16d09e2..13b72e0af4f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterCE + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobChiefEngineer + time: 72000 #20 hrs + # Jumpsuit - type: loadout id: ChiefEngineerJumpsuit @@ -39,6 +49,14 @@ id: ChiefEngineerMantle equipment: neck: ClothingNeckMantleCE + effects: + - !type:GroupLoadoutEffect + proto: MasterCE + +- type: startingGear + id: ChiefEngineerMantle + equipment: + neck: ClothingNeckMantleCE # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml index 12bde1be96f..43bbc42f46e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterCMO + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobChiefMedicalOfficer + time: 72000 #20 hrs + # Jumpsuit - type: loadout id: ChiefMedicalOfficerJumpsuit @@ -40,6 +50,14 @@ id: ChiefMedicalOfficerMantle equipment: neck: ClothingNeckMantleCMO + effects: + - !type:GroupLoadoutEffect + proto: MasterCMO + +- type: startingGear + id: ChiefMedicalOfficerMantle + equipment: + neck: ClothingNeckMantleCMO # Outer clothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml index c1c644de2a7..2e607aca698 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml @@ -1,15 +1,31 @@ -# Head +# For mantles +- type: loadoutEffectGroup + id: MasterRD + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobResearchDirector + time: 72000 #20 hrs +# Head - type: loadout id: ResearchDirectorBeret startingGear: ScientificBeret # Neck - - type: loadout id: ResearchDirectorMantle equipment: neck: ClothingNeckMantleRD + effects: + - !type:GroupLoadoutEffect + proto: MasterRD + +- type: startingGear + id: ResearchDirectorMantle + equipment: + neck: ClothingNeckMantleRD - type: loadout id: ResearchDirectorCloak diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index ceecef6cc6e..a393006d9c5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterHoS + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobHeadOfSecurity + time: 72000 #20 hrs + # Jumpsuit - type: loadout id: HeadofSecurityJumpsuit @@ -50,6 +60,14 @@ id: HeadofSecurityMantle equipment: neck: ClothingNeckMantleHOS + effects: + - !type:GroupLoadoutEffect + proto: MasterHoS + +- type: startingGear + id: HeadofSecurityMantle + equipment: + neck: ClothingNeckMantleHOS # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index b7b6a5c1a15..100cbe8f386 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -685,6 +685,7 @@ completetime: 4 materials: Cloth: 300 + # Command winter coats - type: latheRecipe id: ClothingOuterWinterCap @@ -757,62 +758,7 @@ materials: Cloth: 500 Durathread: 300 -# Mantles -- type: latheRecipe - id: ClothingNeckMantleCap - result: ClothingNeckMantleCap - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - -- type: latheRecipe - id: ClothingNeckMantleCE - result: ClothingNeckMantleCE - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - -- type: latheRecipe - id: ClothingNeckMantleCMO - result: ClothingNeckMantleCMO - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - -- type: latheRecipe - id: ClothingNeckMantleHOP - result: ClothingNeckMantleHOP - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 -- type: latheRecipe - id: ClothingNeckMantleHOS - result: ClothingNeckMantleHOS - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - -- type: latheRecipe - id: ClothingNeckMantleRD - result: ClothingNeckMantleRD - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - -- type: latheRecipe - id: ClothingNeckMantleQM - result: ClothingNeckMantleQM - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 # Winter coats - type: latheRecipe id: ClothingOuterWinterMusician @@ -989,6 +935,7 @@ materials: Cloth: 500 Durathread: 200 + # Hats - type: latheRecipe id: ClothingHeadHatCaptain @@ -1171,6 +1118,7 @@ completetime: 1 materials: Cloth: 100 + # Ties - type: latheRecipe id: ClothingNeckTieRed @@ -1192,6 +1140,7 @@ completetime: 2 materials: Cloth: 200 + # Scarfs - type: latheRecipe id: ClothingNeckScarfStripedGreen @@ -1248,6 +1197,7 @@ completetime: 2 materials: Cloth: 200 + # Carpets - type: latheRecipe id: Carpet From ca75d5a3e3a3634ab442fd46f382f6f14c750c86 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 12 Aug 2024 07:15:52 +0000 Subject: [PATCH 05/15] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 38cc8ed9ed1..d48ee26cf21 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fixed ninja criminal records hack not changing sechud icons. - type: Fix - id: 6598 - time: '2024-05-16T20:51:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28021 - author: EmoGarbage404 changes: - message: Fixed a bug that would cause items in your inventory to get stuck to @@ -3795,3 +3788,14 @@ id: 7097 time: '2024-08-12T06:20:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30291 +- author: Ubaser + changes: + - message: Mantles are now available in loadouts, requiring 20 hours of that head + of department's time. + type: Add + - message: Mantles are no longer spawned in dressers or able to be printed at uniform + lathes. + type: Remove + id: 7098 + time: '2024-08-12T07:14:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30929 From 7e17063b86858794fe35e4eab2b3de8446c25148 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 12 Aug 2024 18:16:59 +1000 Subject: [PATCH 06/15] Removes variant cube migration (#30934) add --- Resources/migration.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index 92b2ca6d3b9..b20d7fc4f4a 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -130,7 +130,6 @@ DrinkGoldschlagerGlass: DrinkGildlagerGlass # 2024-01-07 ClosetBase: ClosetSteelBase -MonkeyCubeBox: VariantCubeBox # 2024-01-08 SalvagePartsT4Spawner: SalvageLootSpawner @@ -355,7 +354,6 @@ ClothingOuterCoatInspector: ClothingOuterCoatJensen # 2024-06-23 FloorTileItemReinforced: PartRodMetal1 - #2024-06-25 BookChefGaming: BookHowToCookForFortySpaceman From 883dc998e6ccbb1a27e93d0ac372f8a6ee75aab8 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Mon, 12 Aug 2024 01:17:26 -0700 Subject: [PATCH 07/15] First Review Pass Contraband Fixes (#30930) * First pass contra fix * bam * More * Security crates are now marked as security restricted * Syndicate raid suit is contra * damn I forgot gatfruit --- .../en-US/contraband/contraband-severity.ftl | 1 + .../Catalog/Fills/Boxes/general.yml | 4 ++-- .../Catalog/Fills/Crates/armory.yml | 12 +++++------ .../Catalog/Fills/Crates/syndicate.yml | 4 ++-- .../Catalog/Fills/Items/briefcases.yml | 2 +- .../Entities/Clothing/Belt/belts.yml | 2 +- .../Entities/Clothing/Hands/gloves.yml | 2 +- .../Entities/Clothing/Head/eva-helmets.yml | 2 +- .../Entities/Clothing/Head/helmets.yml | 2 +- .../Entities/Clothing/Head/misc.yml | 2 +- .../Entities/Clothing/OuterClothing/armor.yml | 2 +- .../Clothing/OuterClothing/softsuits.yml | 2 +- .../Objects/Consumable/Food/produce.yml | 20 +++++++++---------- .../Objects/Devices/encryption_keys.yml | 2 +- .../Entities/Objects/Devices/radio.yml | 2 +- .../Prototypes/Entities/Objects/Fun/darts.yml | 2 +- .../Prototypes/Entities/Objects/Fun/pai.yml | 2 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 2 +- .../Entities/Objects/Misc/briefcases.yml | 2 +- .../Entities/Objects/Misc/implanters.yml | 6 +++--- .../Entities/Objects/Shields/shields.yml | 6 +++--- .../Objects/Specific/Medical/hypospray.yml | 2 +- .../Entities/Objects/Tools/lantern.yml | 2 +- .../Entities/Objects/Tools/tools.yml | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 10 +++++----- .../Objects/Weapons/Guns/HMGs/hmgs.yml | 2 +- .../Weapons/Guns/Launchers/launchers.yml | 2 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 4 ++-- .../Weapons/Guns/Revolvers/revolvers.yml | 4 ++-- .../Objects/Weapons/Guns/SMGs/smgs.yml | 6 +++--- .../Entities/Objects/Weapons/Melee/mining.yml | 4 ++-- .../Objects/Weapons/Throwable/grenades.yml | 4 ++-- .../Entities/Objects/base_contraband.yml | 9 +++++++++ .../Structures/Storage/Crates/crates.yml | 16 +++++++-------- .../Prototypes/contraband_severities.yml | 5 +++++ 35 files changed, 84 insertions(+), 69 deletions(-) diff --git a/Resources/Locale/en-US/contraband/contraband-severity.ftl b/Resources/Locale/en-US/contraband/contraband-severity.ftl index 594a64f8b75..37d83c4575a 100644 --- a/Resources/Locale/en-US/contraband/contraband-severity.ftl +++ b/Resources/Locale/en-US/contraband/contraband-severity.ftl @@ -1,6 +1,7 @@ contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color] contraband-examine-text-Restricted = [color=yellow]This item is departmentally restricted.[/color] contraband-examine-text-Restricted-department = [color=yellow]This item is restricted to {$departments}, and may be considered contraband.[/color] +contraband-examine-text-Major = [color=red]This item is considered major contraband.[/color] contraband-examine-text-GrandTheft = [color=red]This item is a highly valuable target for Syndicate agents![/color] contraband-examine-text-Syndicate = [color=crimson]This item is highly illegal Syndicate contraband![/color] diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 15b187cd15f..bc20d4a7cd0 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -340,7 +340,7 @@ - type: entity name: syndicate encryption key box - parent: [BoxEncryptionKeyPassenger, BaseRestrictedContraband] + parent: [BoxEncryptionKeyPassenger, BaseSyndicateContraband] id: BoxEncryptionKeySyndie description: Two syndicate encryption keys for the price of one. Miniaturized for ease of use. components: @@ -445,4 +445,4 @@ - type: StorageFill contents: - id: Envelope - amount: 9 \ No newline at end of file + amount: 9 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml index d5aab237170..bc5377fe81f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml @@ -1,6 +1,6 @@ - type: entity id: CrateArmorySMG - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: SMG crate description: Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open. components: @@ -13,7 +13,7 @@ - type: entity id: CrateArmoryShotgun - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: shotgun crate description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. components: @@ -26,7 +26,7 @@ - type: entity id: CrateTrackingImplants - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: tracking implants description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of. components: @@ -36,7 +36,7 @@ amount: 5 - type: entity - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] id: CrateTrainingBombs name: training bombs description: Contains three low-yield training bombs for security to learn defusal and safe ordnance disposal, EOD suit not included. Requires Armory access to open. @@ -48,7 +48,7 @@ - type: entity id: CrateArmoryLaser - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: lasers crate description: Contains three standard-issue laser rifles. Requires Armory access to open. components: @@ -59,7 +59,7 @@ - type: entity id: CrateArmoryPistols - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: pistols crate description: Contains two standard NT pistols with four mags. Requires Armory access to open. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index ba97af39250..1b191d90f7f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -1,6 +1,6 @@ - type: entity id: CrateSyndicateSurplusBundle - parent: [ CrateSyndicate, StorePresetUplink ] + parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] name: Syndicate surplus crate description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good. components: @@ -24,7 +24,7 @@ - type: entity id: CrateSyndicateSuperSurplusBundle - parent: [ CrateSyndicate, StorePresetUplink ] + parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] name: Syndicate super surplus crate description: Contains 125 telecrystals worth of completely random Syndicate items. components: diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index f47cb49ea6f..6764cb8496a 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -10,7 +10,7 @@ - type: entity id: BriefcaseSyndieSniperBundleFilled - parent: [BriefcaseSyndie, BaseSyndicateContraband] + parent: BriefcaseSyndie suffix: Syndicate, Sniper Bundle components: - type: Item diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 66b601b8c76..0613ec97269 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -643,7 +643,7 @@ sprite: Clothing/Belt/salvagewebbing.rsi - type: entity - parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase] + parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseSyndicateContraband] id: ClothingBeltMilitaryWebbing name: chest rig description: A set of tactical webbing worn by Syndicate boarding parties. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 1bd858b4f78..684ef791ec0 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -79,7 +79,7 @@ - type: FingerprintMask - type: entity - parent: [ClothingHandsGlovesBoxingBlue, BaseSyndicateContraband] + parent: ClothingHandsGlovesBoxingBlue id: ClothingHandsGlovesBoxingRigged suffix: Rigged components: diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index dd1bfd91bc6..827d28265a0 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -28,7 +28,7 @@ #Syndicate EVA Helmet - type: entity - parent: ClothingHeadEVAHelmetBase + parent: [ ClothingHeadEVAHelmetBase, BaseSyndicateContraband ] id: ClothingHeadHelmetSyndicate name: syndicate EVA helmet description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery. diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index b2ae5b294e3..47fb4ad451f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -358,7 +358,7 @@ sprite: Clothing/Head/Helmets/ert_janitor.rsi - type: entity - parent: ClothingHeadHelmetBasic + parent: [ ClothingHeadHelmetBasic, BaseSyndicateContraband ] id: ClothingHeadHelmetRaid name: syndicate raid helmet description: An armored helmet for use with the syndicate raid suit. Very stylish. diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index cdd6ee894ef..1fb47c04393 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -170,7 +170,7 @@ accent: MobsterAccent - type: entity - parent: ClothingHeadBase + parent: [ ClothingHeadBase, BaseSyndicateContraband ] id: ClothingHeadHatCatEars name: cat ears description: "NYAH!" diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 101190faf3e..80588ba493b 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -100,7 +100,7 @@ - Energy - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSyndicateContraband ] id: ClothingOuterArmorRaid name: syndicate raid suit description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect its wearer from space. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 8e90efafc15..27ee1d5a6a1 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -17,7 +17,7 @@ #Syndicate EVA - type: entity - parent: ClothingOuterEVASuitBase + parent: [ ClothingOuterEVASuitBase, BaseSyndicateContraband ] id: ClothingOuterHardsuitSyndicate # TODO: rename to ClothingOuterEVASuitSyndicate name: syndicate EVA suit description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'" diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index d980db0ca12..76256bb81e1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -261,7 +261,7 @@ flavors: - banana - type: Food - trash: + trash: - TrashBananaPeel - type: SolutionContainerManager solutions: @@ -304,7 +304,7 @@ - banana - nothing - type: Food - trash: + trash: - TrashMimanaPeel - type: SolutionContainerManager solutions: @@ -1091,7 +1091,7 @@ flavors: - corn - type: Food - trash: + trash: - FoodCornTrash - type: SolutionContainerManager solutions: @@ -1714,12 +1714,12 @@ name: glasstle parent: FoodProduceBase id: FoodGlasstle - description: A fragile crystal plant with lot of spiky thorns. + description: A fragile crystal plant with lot of spiky thorns. components: - type: Item size: Small sprite: Objects/Specific/Hydroponics/glasstle.rsi - heldPrefix: produce + heldPrefix: produce - type: FlavorProfile flavors: - sharp @@ -1736,7 +1736,7 @@ seedId: glasstle - type: Extractable grindableSolutionName: food - - type: Damageable + - type: Damageable damageContainer: Inorganic - type: ToolRefinable refineResult: @@ -1759,7 +1759,7 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: DamageOnHit + - type: DamageOnHit damage: types: Blunt: 10 @@ -1816,7 +1816,7 @@ - type: entity name: gatfruit - parent: FoodProduceBase + parent: [ FoodProduceBase, BaseSyndicateContraband ] id: FoodGatfruit description: A delicious, gun-shaped fruit with a thick wooden stem. components: @@ -1837,7 +1837,7 @@ - type: Produce seedId: gatfruit - type: Food - trash: + trash: - WeaponRevolverPython - type: Tag tags: @@ -2152,7 +2152,7 @@ flavors: - bungo - type: Food - trash: + trash: - FoodBungoPit - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 66b40d0b407..d7b059f3d85 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -215,7 +215,7 @@ - state: synd_label - type: entity - parent: [EncryptionKey, BaseSyndicateContraband] + parent: [ EncryptionKey, BaseScienceContraband ] id: EncryptionKeyBinary name: binary translator key description: An encryption key that translates binary signals used by silicons. diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index 77b6cac2d37..e750e4dbc1e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -28,7 +28,7 @@ - type: entity name: security radio description: A handy security radio. - parent: RadioHandheld + parent: [ RadioHandheld, BaseRestrictedContraband ] id: RadioHandheldSecurity components: - type: RadioMicrophone diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml index dfcb0c68f1e..a127930feaf 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml @@ -191,7 +191,7 @@ acts: [ "Destruction" ] - type: entity - parent: BaseItem + parent: [ BaseItem, BaseSyndicateContraband ] id: HypoDartBox name: hypodart box suffix: HypoDart diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 77f16fcd412..4695f1c125d 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -75,7 +75,7 @@ - type: StationMap - type: entity - parent: PersonalAI + parent: [ PersonalAI, BaseSyndicateContraband] id: SyndicatePersonalAI name: syndicate personal ai device description: Your Syndicate pal who's fun to be with! diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 92baa1f86ff..e7fa9934745 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -215,7 +215,7 @@ shader: unshaded - type: entity - parent: BasePlushie + parent: [ BasePlushie, BaseSyndicateContraband ] id: PlushieNuke name: nukie plushie description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml index 9a4ec3b5926..762204701cb 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml @@ -25,7 +25,7 @@ sprite: Objects/Storage/Briefcases/briefcase_brown.rsi - type: entity - parent: [BriefcaseBrown, BaseSyndicateContraband] + parent: BriefcaseBrown id: BriefcaseSyndie suffix: Syndicate, Empty components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index a93472658ed..4f92bcc2652 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -4,7 +4,7 @@ name: implanter description: A syringe exclusively designed for the injection and extraction of subdermal implants. id: BaseImplanter - parent: [BaseItem, BaseRestrictedContraband] + parent: BaseItem abstract: true components: - type: ItemSlots @@ -153,7 +153,7 @@ - type: entity id: TrackingImplanter name: tracking implanter - parent: BaseImplantOnlyImplanter + parent: [ BaseImplantOnlyImplanter, BaseRestrictedContraband] components: - type: Implanter implant: TrackingImplant @@ -247,7 +247,7 @@ - type: entity id: MindShieldImplanter name: mindshield implanter - parent: BaseImplantOnlyImplanter + parent: [ BaseImplantOnlyImplanter, BaseSecurityCommandContraband] components: - type: Implanter implant: MindShieldImplant diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 71598a7ff9b..e0e7eb11710 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -64,7 +64,7 @@ - type: entity name: riot shield - parent: BaseShield + parent: [ BaseShield, BaseRestrictedContraband ] id: RiotShield description: A large tower shield. Good for controlling crowds. components: @@ -85,7 +85,7 @@ - type: entity name: riot laser shield - parent: BaseShield + parent: [ BaseShield, BaseRestrictedContraband ] id: RiotLaserShield description: A riot shield built for withstanding lasers, but not much else. components: @@ -105,7 +105,7 @@ - type: entity name: riot bullet shield - parent: BaseShield + parent: [ BaseShield, BaseRestrictedContraband ] id: RiotBulletShield description: A ballistic riot shield built for withstanding bullets, but not much else. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index eb18893791d..c81af6e1280 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -436,7 +436,7 @@ handle: false # don't want the sound to stop the self-inject from triggering - type: entity - parent: BaseItem + parent: [ BaseItem, BaseSyndicateContraband ] id: HypopenBox name: hypopen box description: A small box containing a hypopen. Packaging disintegrates when opened, leaving no evidence behind. diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml index 801755a7771..89101e34ff4 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml @@ -66,7 +66,7 @@ - Flashlight - type: entity - parent: [Lantern, BaseSyndicateContraband] + parent: Lantern id: LanternFlash suffix: Flash components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 269e480c1d4..83cfb331be0 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -284,7 +284,7 @@ - type: entity id: RCD - parent: BaseItem + parent: [ BaseItem, BaseEngineeringContraband ] name: RCD description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 2f7aa653e7c..e60c955f4e4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -104,7 +104,7 @@ - type: entity name: svalinn laser pistol - parent: BaseWeaponPowerCellSmall + parent: [ BaseWeaponPowerCellSmall, BaseRestrictedContraband ] id: WeaponLaserSvalinn description: A cheap and widely used laser pistol. components: @@ -125,7 +125,7 @@ - type: entity name: retro laser blaster - parent: BaseWeaponBatterySmall + parent: [ BaseWeaponBatterySmall, BaseMajorContraband ] id: WeaponLaserGun description: A weapon using light amplified by the stimulated emission of radiation. components: @@ -200,7 +200,7 @@ - type: entity name: laser rifle - parent: [BaseWeaponBattery, BaseGunWieldable] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband] id: WeaponLaserCarbine description: Favoured by Nanotrasen Security for being cheap and easy to use. components: @@ -325,7 +325,7 @@ - type: entity name: laser cannon - parent: [BaseWeaponBattery, BaseGunWieldable] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband] id: WeaponLaserCannon description: A heavy duty, high powered laser weapon. components: @@ -588,7 +588,7 @@ - type: entity name: advanced laser pistol - parent: BaseWeaponBatterySmall + parent: [ BaseWeaponBatterySmall, BaseRestrictedContraband] id: WeaponAdvancedLaser description: An experimental high-energy laser pistol with a self-charging nuclear battery. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index aa1e7ec84d6..ebcba7d5e44 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -24,7 +24,7 @@ - type: entity name: minigun id: WeaponMinigun - parent: BaseWeaponHeavyMachineGun + parent: [ BaseWeaponHeavyMachineGun, BaseMajorContraband ] description: Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 696d507a638..3abb32a37fb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -55,7 +55,7 @@ - type: entity name: RPG-7 - parent: BaseWeaponLauncher + parent: [ BaseWeaponLauncher, BaseMajorContraband ] id: WeaponLauncherRocket description: A modified ancient rocket-propelled grenade launcher. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index e778393710a..167e21e15f2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -103,7 +103,7 @@ - type: entity name: echis - parent: BaseItem + parent: [ BaseItem, BaseSyndicateContraband ] id: WeaponPistolEchis description: A viper for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges. components: @@ -138,7 +138,7 @@ - type: entity name: cobra - parent: BaseWeaponPistol + parent: [ BaseWeaponPistol, BaseSyndicateContraband ] id: WeaponPistolCobra description: A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 8a6e027b128..309c2c502d6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -52,7 +52,7 @@ - type: entity name: Deckard - parent: [BaseWeaponRevolver, BaseRestrictedContraband] + parent: [BaseWeaponRevolver, BaseSecurityCommandContraband] id: WeaponRevolverDeckard description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. components: @@ -95,7 +95,7 @@ - type: entity name: Mateba - parent: [BaseWeaponRevolver, BaseMinorContraband] + parent: [BaseWeaponRevolver, BaseMajorContraband] id: WeaponRevolverMateba description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index cf1d77d94bc..a22be1da042 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -58,7 +58,7 @@ - type: entity name: Atreides - parent: [BaseWeaponSubMachineGun, BaseMinorContraband] + parent: [BaseWeaponSubMachineGun, BaseMajorContraband] id: WeaponSubMachineGunAtreides description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. components: @@ -119,7 +119,7 @@ - type: entity name: Drozd - parent: BaseWeaponSubMachineGun + parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband] id: WeaponSubMachineGunDrozd description: An excellent fully automatic Heavy SMG. components: @@ -221,7 +221,7 @@ - type: entity name: WT550 - parent: BaseWeaponSubMachineGun + parent: [ BaseWeaponSubMachineGun, BaseRestrictedContraband ] id: WeaponSubMachineGunWt550 description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index faebcaa734d..337c7f07f7b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -153,7 +153,7 @@ - type: Prying - type: entity - parent: BaseWeaponCrusher + parent: [ BaseWeaponCrusher, BaseSecurityCargoContraband] id: WeaponCrusherDagger name: crusher dagger description: A scaled down version of a proto-kinetic crusher. Uses kinetic energy to vibrate the blade at high speeds. @@ -174,7 +174,7 @@ # Like a crusher... but better - type: entity - parent: WeaponCrusher + parent: [ WeaponCrusher, BaseSecurityCargoContraband] id: WeaponCrusherGlaive name: crusher glaive description: An early design of the proto-kinetic accelerator, in glaive form. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 97b9edf7a4d..e5627ea88d1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -60,7 +60,7 @@ - type: entity name: flashbang description: Eeeeeeeeeeeeeeeeeeeeee. - parent: GrenadeBase + parent: [ GrenadeBase, BaseRestrictedContraband ] id: GrenadeFlashBang components: - type: Sprite @@ -373,7 +373,7 @@ path: /Audio/Effects/hallelujah.ogg - type: entity - parent: GrenadeBase + parent: [ GrenadeBase, BaseMinorContraband ] id: SmokeGrenade name: smoke grenade description: A tactical grenade that releases a large, long-lasting cloud of smoke when used. diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index 051c04b6e27..84783ccf7d6 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -18,6 +18,15 @@ # according to space law no dept is authorized to have allowedDepartments: null +# major contraband, for things like guns or weaponry that don't belong to any department and aren't syndicate specific +- type: entity + id: BaseMajorContraband + abstract: true + components: + - type: Contraband + severity: Major + allowedDepartments: null + # minor contraband by default restricted to security only - type: entity id: BaseRestrictedContraband diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 171b664c83a..9b0558a4114 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -140,7 +140,7 @@ map: ["enum.StorageVisualLayers.Door"] - state: paper sprite: Structures/Storage/Crates/labels.rsi - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Construction graph: WebStructures node: crate @@ -171,7 +171,7 @@ # Secure Crates - type: entity - parent: CrateBaseSecure + parent: [ CrateBaseSecure, BaseRestrictedContraband ] id: CrateSecgear name: secgear crate components: @@ -287,7 +287,7 @@ access: [["Armory"]] - type: entity - parent: CrateBaseSecure + parent: [ CrateBaseSecure, BaseRestrictedContraband ] suffix: Armory, Secure id: CrateContrabandStorageSecure name: contraband storage crate @@ -326,7 +326,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "-0.25,0.625" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/livestock.rsi state: base @@ -381,7 +381,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "0.0,0.125" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/cage.rsi - type: Destructible @@ -483,7 +483,7 @@ - state: closed map: ["enum.StorageVisualLayers.Door"] - state: paper - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/coffin.rsi state: base @@ -525,7 +525,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "-0.28125,0.625" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/wooden_grave.rsi state: base @@ -573,7 +573,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "-0.3125,0.5625" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/stone_grave.rsi state: base diff --git a/Resources/Prototypes/contraband_severities.yml b/Resources/Prototypes/contraband_severities.yml index aad9916b257..54f5cd62ef6 100644 --- a/Resources/Prototypes/contraband_severities.yml +++ b/Resources/Prototypes/contraband_severities.yml @@ -4,6 +4,11 @@ id: Minor examineText: contraband-examine-text-Minor +# Dangerous fucking shit that doesn't belong to CyberSun or NanoTrasen, RPGs, retro laser blasters, unholy things +- type: contrabandSeverity + id: Major + examineText: contraband-examine-text-Major + # Having this without a good reason might get you yelled at by security. (spears, shivs, etc). # or, Having this as a regular crew member, not the department it was made for, is considered theft IC. (rcd, sec gear, etc) - type: contrabandSeverity From c02aeebdf126f2b15492bdd5a50798acf8de0581 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 12 Aug 2024 19:06:55 +1000 Subject: [PATCH 08/15] Add conducting gloves to the maintenance loot table (#30904) * add * lower weight --- .../Prototypes/Entities/Markers/Spawners/Random/maintenance.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index f7e22ef62da..521dde5a65e 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -242,6 +242,8 @@ weight: 0.5 - id: ClothingHandsGlovesColorYellow weight: 1 + - id: ClothingHandsGlovesConducting + weight: 0.1 # Uncommon Group - !type:GroupSelector weight: 23 From e4f37a46ef70e4e0d1621363b449aff76bd84206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=8F?= <164001172+meowstushka@users.noreply.github.com> Date: Mon, 12 Aug 2024 12:24:13 +0300 Subject: [PATCH 09/15] [Maps] Paper Mega Super Big Update (#2479) --- Resources/Maps/corvax_paper.yml | 2833 ++++++++++++++++--------------- 1 file changed, 1420 insertions(+), 1413 deletions(-) diff --git a/Resources/Maps/corvax_paper.yml b/Resources/Maps/corvax_paper.yml index a9bb677e899..f0e89917c41 100644 --- a/Resources/Maps/corvax_paper.yml +++ b/Resources/Maps/corvax_paper.yml @@ -9700,7 +9700,7 @@ entities: - type: ContainedSolution containerName: food container: 3 - - uid: 15651 + - uid: 15652 components: - type: MetaData name: grid @@ -9976,7 +9976,7 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance - - uid: 15968 + - uid: 15969 components: - type: MetaData name: grid @@ -10202,14 +10202,14 @@ entities: - type: Joint joints: docking178950: !type:WeldJoint - bodyB: 16266 - bodyA: 15968 + bodyB: 16267 + bodyA: 15969 id: docking178950 localAnchorB: 9.5,1 localAnchorA: -8.5,-4 damping: 573.12585 stiffness: 5144.3657 - - uid: 16266 + - uid: 16267 components: - type: MetaData name: grid @@ -10298,8 +10298,8 @@ entities: - type: Joint joints: docking178950: !type:WeldJoint - bodyB: 16266 - bodyA: 15968 + bodyB: 16267 + bodyA: 15969 id: docking178950 localAnchorB: 9.5,1 localAnchorA: -8.5,-4 @@ -11989,11 +11989,11 @@ entities: parent: 2 - proto: AirlockAssembly entities: - - uid: 16267 + - uid: 16268 components: - type: Transform pos: 9.5,-4.5 - parent: 16266 + parent: 16267 - proto: AirlockAssemblyShuttleGlass entities: - uid: 168 @@ -12308,12 +12308,12 @@ entities: - type: Transform pos: 45.5,59.5 parent: 2 - - uid: 15969 + - uid: 15970 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,11.5 - parent: 15968 + parent: 15969 - proto: AirlockEVALocked entities: - uid: 221 @@ -12389,16 +12389,16 @@ entities: rot: -1.5707963267948966 rad pos: 84.5,57.5 parent: 2 - - uid: 15970 + - uid: 15971 components: - type: Transform pos: -8.5,-1.5 - parent: 15968 - - uid: 15971 + parent: 15969 + - uid: 15972 components: - type: Transform pos: -15.5,-1.5 - parent: 15968 + parent: 15969 - proto: AirlockExternalGlassAtmosphericsLocked entities: - uid: 234 @@ -12520,47 +12520,47 @@ entities: parent: 2 - proto: AirlockExternalGlassShuttleSyndicateLocked entities: - - uid: 15972 + - uid: 15973 components: - type: Transform rot: 3.141592653589793 rad pos: -16.5,14.5 - parent: 15968 - - uid: 15973 + parent: 15969 + - uid: 15974 components: - type: Transform pos: -8.5,-3.5 - parent: 15968 + parent: 15969 - type: Door changeAirtight: False - type: Docking dockJointId: docking178950 - dockedWith: 16269 + dockedWith: 16270 - type: DeviceLinkSource lastSignals: DoorStatus: False DockStatus: True - - uid: 15974 + - uid: 15975 components: - type: Transform pos: -15.5,-3.5 - parent: 15968 - - uid: 16268 + parent: 15969 + - uid: 16269 components: - type: Transform pos: 2.5,-4.5 - parent: 16266 - - uid: 16269 + parent: 16267 + - uid: 16270 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,0.5 - parent: 16266 + parent: 16267 - type: Door changeAirtight: False - type: Docking dockJointId: docking178950 - dockedWith: 15973 + dockedWith: 15974 - type: DeviceLinkSource lastSignals: DoorStatus: False @@ -13474,42 +13474,42 @@ entities: parent: 2 - proto: AirlockShuttleAssembly entities: - - uid: 16270 + - uid: 16271 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,0.5 - parent: 16266 + parent: 16267 - proto: AirlockSyndicateGlassLocked entities: - - uid: 15975 + - uid: 15976 components: - type: Transform pos: -7.5,7.5 - parent: 15968 - - uid: 15976 + parent: 15969 + - uid: 15977 components: - type: Transform pos: -4.5,7.5 - parent: 15968 - - uid: 15977 + parent: 15969 + - uid: 15978 components: - type: Transform pos: -19.5,7.5 - parent: 15968 - - uid: 15978 + parent: 15969 + - uid: 15979 components: - type: Transform pos: -16.5,7.5 - parent: 15968 + parent: 15969 - proto: AirlockSyndicateLocked entities: - - uid: 15979 + - uid: 15980 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,11.5 - parent: 15968 + parent: 15969 - proto: AirlockTheatreLocked entities: - uid: 411 @@ -14480,11 +14480,11 @@ entities: parent: 2 - proto: AnomalyCoreFleshInert entities: - - uid: 15652 + - uid: 15653 components: - type: Transform pos: 13.610641,2.5852165 - parent: 15651 + parent: 15652 - proto: APCBasic entities: - uid: 563 @@ -14903,11 +14903,11 @@ entities: parent: 2 - proto: APECircuitboard entities: - - uid: 15653 + - uid: 15654 components: - type: Transform pos: 13.568056,2.461093 - parent: 15651 + parent: 15652 - proto: ArrivalsShuttleTimer entities: - uid: 609 @@ -14917,26 +14917,33 @@ entities: parent: 2 - proto: Ash entities: - - uid: 16271 + - uid: 16272 components: - type: Transform pos: 10.338333,-1.4580917 - parent: 16266 - - uid: 16272 + parent: 16267 + - uid: 16273 components: - type: Transform pos: 5.2381744,-2.2286224 - parent: 16266 - - uid: 16273 + parent: 16267 + - uid: 16274 components: - type: Transform pos: 3.4586182,-0.6508713 - parent: 16266 - - uid: 16274 + parent: 16267 + - uid: 16275 components: - type: Transform pos: 2.3395233,-3.4211044 - parent: 16266 + parent: 16267 +- proto: Ashtray + entities: + - uid: 15651 + components: + - type: Transform + pos: 22.364468,52.491203 + parent: 2 - proto: AsteroidRock entities: - uid: 610 @@ -16410,11 +16417,11 @@ entities: - type: Transform pos: 75.47701,6.517964 parent: 2 - - uid: 15980 + - uid: 15981 components: - type: Transform pos: -20.411377,14.523493 - parent: 15968 + parent: 15969 - proto: BananaSeeds entities: - uid: 896 @@ -16463,21 +16470,21 @@ entities: - type: Transform pos: 54.5,30.5 parent: 2 - - uid: 15654 + - uid: 15655 components: - type: Transform pos: 14.5,7.5 - parent: 15651 - - uid: 15981 + parent: 15652 + - uid: 15982 components: - type: Transform pos: -14.5,5.5 - parent: 15968 - - uid: 15982 + parent: 15969 + - uid: 15983 components: - type: Transform pos: -9.5,5.5 - parent: 15968 + parent: 15969 - proto: BarberScissors entities: - uid: 904 @@ -16549,16 +16556,16 @@ entities: rot: 1.5707963267948966 rad pos: 10.5,70.5 parent: 2 - - uid: 15983 + - uid: 15984 components: - type: Transform pos: -1.5,11.5 - parent: 15968 - - uid: 15984 + parent: 15969 + - uid: 15985 components: - type: Transform pos: -15.5,-2.5 - parent: 15968 + parent: 15969 - proto: BarricadeBlock entities: - uid: 916 @@ -16607,16 +16614,16 @@ entities: rot: 1.5707963267948966 rad pos: 64.5,32.5 parent: 2 - - uid: 15985 + - uid: 15986 components: - type: Transform pos: -19.5,7.5 - parent: 15968 - - uid: 15986 + parent: 15969 + - uid: 15987 components: - type: Transform pos: -4.5,11.5 - parent: 15968 + parent: 15969 - proto: BarricadeDirectional entities: - uid: 924 @@ -16625,11 +16632,11 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,-15.5 parent: 2 - - uid: 15987 + - uid: 15988 components: - type: Transform pos: -20.5,6.5 - parent: 15968 + parent: 15969 - proto: BarSign entities: - uid: 925 @@ -16667,12 +16674,12 @@ entities: rot: 3.141592653589793 rad pos: 55.5,-5.5 parent: 2 - - uid: 15988 + - uid: 15989 components: - type: Transform rot: 3.141592653589793 rad pos: -12.5,4.5 - parent: 15968 + parent: 15969 - proto: BaseGasCondenser entities: - uid: 931 @@ -17117,30 +17124,30 @@ entities: parent: 2 - proto: BenchRedComfy entities: - - uid: 15989 + - uid: 15990 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,-1.5 - parent: 15968 - - uid: 15990 + parent: 15969 + - uid: 15991 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,-1.5 - parent: 15968 - - uid: 15991 + parent: 15969 + - uid: 15992 components: - type: Transform rot: 3.141592653589793 rad pos: -12.5,-1.5 - parent: 15968 - - uid: 15992 + parent: 15969 + - uid: 15993 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,-1.5 - parent: 15968 + parent: 15969 - proto: BigBox entities: - uid: 1005 @@ -17257,26 +17264,26 @@ entities: - type: Transform pos: 40.5,89.5 parent: 2 - - uid: 15655 + - uid: 15656 components: - type: Transform pos: 8.5,0.5 - parent: 15651 - - uid: 15656 + parent: 15652 + - uid: 15657 components: - type: Transform pos: 7.5,0.5 - parent: 15651 - - uid: 15657 + parent: 15652 + - uid: 15658 components: - type: Transform pos: 8.5,4.5 - parent: 15651 - - uid: 15658 + parent: 15652 + - uid: 15659 components: - type: Transform pos: 8.5,8.5 - parent: 15651 + parent: 15652 - proto: BlastDoorOpen entities: - uid: 1027 @@ -18285,40 +18292,40 @@ entities: parent: 2 - proto: ButtonFrameCautionSecurity entities: - - uid: 15659 + - uid: 15660 components: - type: Transform pos: 9.5,0.5 - parent: 15651 - - uid: 15660 + parent: 15652 + - uid: 15661 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,0.5 - parent: 15651 - - uid: 15661 + parent: 15652 + - uid: 15662 components: - type: Transform pos: 9.5,8.5 - parent: 15651 - - uid: 16275 + parent: 15652 + - uid: 16276 components: - type: Transform pos: 8.5,0.5 - parent: 16266 + parent: 16267 - proto: ButtonFrameGrey entities: - - uid: 15662 + - uid: 15663 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,4.5 - parent: 15651 - - uid: 15663 + parent: 15652 + - uid: 15664 components: - type: Transform pos: 9.5,4.5 - parent: 15651 + parent: 15652 - proto: CableApcExtension entities: - uid: 1135 @@ -40517,36 +40524,36 @@ entities: - type: Transform pos: 53.5,61.5 parent: 2 - - uid: 15993 + - uid: 15994 components: - type: Transform pos: -6.5,11.5 - parent: 15968 - - uid: 15994 + parent: 15969 + - uid: 15995 components: - type: Transform pos: -7.5,11.5 - parent: 15968 - - uid: 15995 + parent: 15969 + - uid: 15996 components: - type: Transform pos: -7.5,12.5 - parent: 15968 - - uid: 15996 + parent: 15969 + - uid: 15997 components: - type: Transform pos: -21.5,9.5 - parent: 15968 - - uid: 15997 + parent: 15969 + - uid: 15998 components: - type: Transform pos: -21.5,4.5 - parent: 15968 - - uid: 15998 + parent: 15969 + - uid: 15999 components: - type: Transform pos: -21.5,3.5 - parent: 15968 + parent: 15969 - proto: Chair entities: - uid: 5518 @@ -41078,50 +41085,50 @@ entities: rot: 3.141592653589793 rad pos: 78.5,36.5 parent: 2 - - uid: 15999 + - uid: 16000 components: - type: Transform pos: -5.5,8.5 - parent: 15968 - - uid: 16000 + parent: 15969 + - uid: 16001 components: - type: Transform pos: -6.5,8.5 - parent: 15968 - - uid: 16001 + parent: 15969 + - uid: 16002 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,6.5 - parent: 15968 - - uid: 16002 + parent: 15969 + - uid: 16003 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,6.5 - parent: 15968 - - uid: 16003 + parent: 15969 + - uid: 16004 components: - type: Transform rot: 3.141592653589793 rad pos: -17.5,6.5 - parent: 15968 - - uid: 16004 + parent: 15969 + - uid: 16005 components: - type: Transform rot: 3.141592653589793 rad pos: -18.5,6.5 - parent: 15968 - - uid: 16005 + parent: 15969 + - uid: 16006 components: - type: Transform pos: -18.5,8.5 - parent: 15968 - - uid: 16006 + parent: 15969 + - uid: 16007 components: - type: Transform pos: -17.5,8.5 - parent: 15968 + parent: 15969 - proto: ChairCarp entities: - uid: 5611 @@ -41169,18 +41176,18 @@ entities: parent: 2 - proto: ChairMeat entities: - - uid: 15664 + - uid: 15665 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,3.5 - parent: 15651 - - uid: 15665 + parent: 15652 + - uid: 15666 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,2.5 - parent: 15651 + parent: 15652 - proto: ChairOfficeDark entities: - uid: 5618 @@ -41427,12 +41434,12 @@ entities: parent: 2 - proto: ChairPilotSeat entities: - - uid: 16276 + - uid: 16277 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-1.5 - parent: 16266 + parent: 16267 - proto: ChairWood entities: - uid: 5660 @@ -41799,11 +41806,11 @@ entities: canCollide: False - proto: CigPackSyndicate entities: - - uid: 16007 + - uid: 16008 components: - type: Transform pos: -18.541876,6.4375577 - parent: 15968 + parent: 15969 - proto: CircuitImprinter entities: - uid: 5718 @@ -42603,11 +42610,11 @@ entities: parent: 2 - proto: ClothingBeltSyndieHolster entities: - - uid: 16008 + - uid: 16009 components: - type: Transform pos: -6.5866647,13.499123 - parent: 15968 + parent: 15969 - proto: ClothingBeltUtilityFilled entities: - uid: 5817 @@ -42999,11 +43006,11 @@ entities: - type: InsideEntityStorage - proto: ClothingHeadHelmetSyndicate entities: - - uid: 16009 + - uid: 16010 components: - type: Transform pos: -17.520046,8.45009 - parent: 15968 + parent: 15969 - proto: ClothingHeadPyjamaSyndicateBlack entities: - uid: 5885 @@ -43228,11 +43235,11 @@ entities: parent: 2 - proto: ClothingNeckScarfStripedSyndieRed entities: - - uid: 16010 + - uid: 16011 components: - type: Transform pos: -24.547577,1.5303264 - parent: 15968 + parent: 15969 - proto: ClothingNeckStethoscope entities: - uid: 5921 @@ -43242,11 +43249,11 @@ entities: parent: 2 - proto: ClothingNeckSyndicakePin entities: - - uid: 16011 + - uid: 16012 components: - type: Transform pos: -13.574856,12.48324 - parent: 15968 + parent: 15969 - proto: ClothingNeckTieDet entities: - uid: 1056 @@ -43341,11 +43348,11 @@ entities: - type: InsideEntityStorage - proto: ClothingOuterHardsuitSyndicate entities: - - uid: 16277 + - uid: 16278 components: - type: Transform pos: 8.465851,-1.8983917 - parent: 16266 + parent: 16267 - proto: ClothingOuterHospitalGown entities: - uid: 5925 @@ -43396,18 +43403,18 @@ entities: parent: 2 - proto: ClothingOuterSuitEmergency entities: - - uid: 16278 + - uid: 16279 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.467499,-3.5495224 - parent: 16266 - - uid: 16279 + parent: 16267 + - uid: 16280 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.1748505,-1.733284 - parent: 16266 + parent: 16267 - proto: ClothingOuterWinterCE entities: - uid: 5933 @@ -43417,11 +43424,11 @@ entities: parent: 2 - proto: ClothingOuterWinterSyndie entities: - - uid: 16012 + - uid: 16013 components: - type: Transform pos: -17.275108,13.58588 - parent: 15968 + parent: 15969 - proto: ClothingShoesBootsMag entities: - uid: 13 @@ -43501,15 +43508,15 @@ entities: - type: InsideEntityStorage - proto: ClothingShoesBootsMagSyndie entities: - - uid: 15666 + - uid: 15667 components: - type: Transform pos: 10.4299,7.5667324 - parent: 15651 - - uid: 16014 + parent: 15652 + - uid: 16015 components: - type: Transform - parent: 16013 + parent: 16014 - type: Physics canCollide: False - type: InsideEntityStorage @@ -43531,11 +43538,11 @@ entities: - type: InsideEntityStorage - proto: ClothingShoesBootsWinterSyndicate entities: - - uid: 16015 + - uid: 16016 components: - type: Transform pos: -17.56403,13.413836 - parent: 15968 + parent: 15969 - proto: ClothingShoesChef entities: - uid: 5947 @@ -43739,11 +43746,11 @@ entities: parent: 2 - proto: ClothingUniformJumpsuitRepairmanSyndie entities: - - uid: 16016 + - uid: 16017 components: - type: Transform pos: -23.500319,8.475307 - parent: 15968 + parent: 15969 - proto: ClothingUniformJumpsuitReporter entities: - uid: 5976 @@ -43777,31 +43784,31 @@ entities: parent: 2 - proto: Coal1 entities: - - uid: 16280 + - uid: 16281 components: - type: Transform pos: 11.098724,-2.2842026 - parent: 16266 - - uid: 16281 + parent: 16267 + - uid: 16282 components: - type: Transform pos: 5.411499,-0.7064514 - parent: 16266 - - uid: 16282 + parent: 16267 + - uid: 16283 components: - type: Transform pos: 5.2647247,-3.531723 - parent: 16266 - - uid: 16283 + parent: 16267 + - uid: 16284 components: - type: Transform pos: 2.292694,-2.6878052 - parent: 16266 - - uid: 16284 + parent: 16267 + - uid: 16285 components: - type: Transform pos: 2.4578094,-0.522995 - parent: 16266 + parent: 16267 - proto: ComfyChair entities: - uid: 5978 @@ -44032,17 +44039,17 @@ entities: - type: Transform pos: 76.5,11.5 parent: 2 - - uid: 16017 + - uid: 16018 components: - type: Transform pos: -11.5,10.5 - parent: 15968 - - uid: 16285 + parent: 15969 + - uid: 16286 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,-1.5 - parent: 16266 + parent: 16267 - proto: ComputerCargoBounty entities: - uid: 6016 @@ -44150,18 +44157,18 @@ entities: - type: Transform pos: 77.5,11.5 parent: 2 - - uid: 16018 + - uid: 16019 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,4.5 - parent: 15968 - - uid: 16286 + parent: 15969 + - uid: 16287 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,-2.5 - parent: 16266 + parent: 16267 - proto: ComputerId entities: - uid: 6033 @@ -44227,11 +44234,11 @@ entities: - type: Transform pos: 27.5,30.5 parent: 2 - - uid: 16019 + - uid: 16020 components: - type: Transform pos: -12.5,10.5 - parent: 15968 + parent: 15969 - proto: ComputerResearchAndDevelopment entities: - uid: 6043 @@ -44590,18 +44597,18 @@ entities: - type: Transform pos: 10.5,40.5 parent: 2 - - uid: 16013 + - uid: 16014 components: - type: Transform pos: -8.5,13.5 - parent: 15968 + parent: 15969 - type: ContainerContainer containers: entity_storage: !type:Container showEnts: False occludes: True ents: - - 16014 + - 16015 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -46262,11 +46269,11 @@ entities: - type: Transform pos: 27.5,-8.5 parent: 2 - - uid: 16020 + - uid: 16021 components: - type: Transform pos: -9.5,9.5 - parent: 15968 + parent: 15969 - proto: DisposalPipe entities: - uid: 6345 @@ -50362,11 +50369,11 @@ entities: parent: 2 - proto: DrinkSyndicatebomb entities: - - uid: 16021 + - uid: 16022 components: - type: Transform pos: -13.510606,4.6665616 - parent: 15968 + parent: 15969 - proto: DrinkVacuumFlask entities: - uid: 7042 @@ -50938,11 +50945,11 @@ entities: rot: -1.5707963267948966 rad pos: 76.58544,3.692996 parent: 2 - - uid: 16022 + - uid: 16023 components: - type: Transform pos: -26.506432,8.519196 - parent: 15968 + parent: 15969 - proto: EvidenceMarkerNine entities: - uid: 7126 @@ -54486,36 +54493,36 @@ entities: parent: 2 - proto: FleshBlocker entities: - - uid: 15667 + - uid: 15668 components: - type: Transform pos: 14.5,2.5 - parent: 15651 - - uid: 15668 + parent: 15652 + - uid: 15669 components: - type: Transform pos: 13.5,5.5 - parent: 15651 - - uid: 15669 + parent: 15652 + - uid: 15670 components: - type: Transform pos: 10.5,5.5 - parent: 15651 - - uid: 15670 + parent: 15652 + - uid: 15671 components: - type: Transform pos: 10.5,1.5 - parent: 15651 - - uid: 15671 + parent: 15652 + - uid: 15672 components: - type: Transform pos: 9.5,7.5 - parent: 15651 - - uid: 15672 + parent: 15652 + - uid: 15673 components: - type: Transform pos: 13.5,7.5 - parent: 15651 + parent: 15652 - proto: FlippoEngravedLighter entities: - uid: 7521 @@ -54525,12 +54532,12 @@ entities: parent: 2 - proto: FloodlightBroken entities: - - uid: 16023 + - uid: 16024 components: - type: Transform rot: -1.5707963267948966 rad pos: -21.502981,1.4919581 - parent: 15968 + parent: 15969 - proto: FloorDrain entities: - uid: 7522 @@ -54808,16 +54815,16 @@ entities: parent: 2 - proto: FoodBakedBunMeat entities: - - uid: 15673 + - uid: 15674 components: - type: Transform pos: 5.3243384,1.8476489 - parent: 15651 - - uid: 15674 + parent: 15652 + - uid: 15675 components: - type: Transform pos: 5.5118384,1.7226489 - parent: 15651 + parent: 15652 - proto: FoodBanana entities: - uid: 7568 @@ -54873,16 +54880,16 @@ entities: parent: 2 - proto: FoodBreadMeat entities: - - uid: 15675 + - uid: 15676 components: - type: Transform pos: 5.4805884,2.7070239 - parent: 15651 - - uid: 15676 + parent: 15652 + - uid: 15677 components: - type: Transform pos: 5.7930884,2.5976489 - parent: 15651 + parent: 15652 - proto: FoodBreadSausageSlice entities: - uid: 7576 @@ -54913,23 +54920,23 @@ entities: parent: 2 - proto: FoodCakeSuppermatterSlice entities: - - uid: 16287 + - uid: 16288 components: - type: Transform pos: 8.533615,-1.4947815 - parent: 16266 - - uid: 16288 + parent: 16267 + - uid: 16289 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.763977,-1.6782455 - parent: 16266 - - uid: 16289 + parent: 16267 + - uid: 16290 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.8454895,-3.6229095 - parent: 16266 + parent: 16267 - proto: FoodCartCold entities: - uid: 7580 @@ -55063,23 +55070,23 @@ entities: parent: 2 - proto: FoodMeatClown entities: - - uid: 15677 + - uid: 15678 components: - type: Transform pos: 14.515897,3.6176615 - parent: 15651 - - uid: 15678 + parent: 15652 + - uid: 15679 components: - type: Transform pos: 12.312772,2.3989115 - parent: 15651 + parent: 15652 - proto: FoodMeatCrabCooked entities: - - uid: 15679 + - uid: 15680 components: - type: Transform pos: 5.6598606,3.1330233 - parent: 15651 + parent: 15652 - proto: FoodMeatFish entities: - uid: 6101 @@ -55122,11 +55129,11 @@ entities: parent: 2 - proto: FoodMeatKebab entities: - - uid: 15680 + - uid: 15681 components: - type: Transform pos: 5.5234346,3.6445239 - parent: 15651 + parent: 15652 - proto: FoodMeatRotten entities: - uid: 7596 @@ -55165,23 +55172,23 @@ entities: currentTemperature: 149.95871 - type: InternalTemperature temperature: 140.0411 - - uid: 15681 + - uid: 15682 components: - type: Transform pos: 14.627438,2.4262686 - parent: 15651 - - uid: 15682 + parent: 15652 + - uid: 15683 components: - type: Transform pos: 12.986813,3.2075186 - parent: 15651 + parent: 15652 - proto: FoodMeatSpider entities: - - uid: 15683 + - uid: 15684 components: - type: Transform pos: 5.5504856,2.0481431 - parent: 15651 + parent: 15652 - proto: FoodMeatXeno entities: - uid: 7600 @@ -55277,16 +55284,16 @@ entities: parent: 2 - proto: FoodTinMRE entities: - - uid: 15684 + - uid: 15685 components: - type: Transform pos: 12.5092125,3.5607302 - parent: 15651 - - uid: 15685 + parent: 15652 + - uid: 15686 components: - type: Transform pos: 14.3998375,1.6701052 - parent: 15651 + parent: 15652 - proto: FoodTinMRETrash entities: - uid: 7615 @@ -70711,37 +70718,37 @@ entities: - type: Transform pos: 29.5,-6.5 parent: 2 - - uid: 16024 + - uid: 16025 components: - type: Transform rot: -1.5707963267948966 rad pos: -21.5,12.5 - parent: 15968 - - uid: 16025 + parent: 15969 + - uid: 16026 components: - type: Transform pos: -1.5,12.5 - parent: 15968 - - uid: 16026 + parent: 15969 + - uid: 16027 components: - type: Transform pos: -6.5,0.5 - parent: 15968 - - uid: 16027 + parent: 15969 + - uid: 16028 components: - type: Transform pos: -5.5,0.5 - parent: 15968 - - uid: 16028 + parent: 15969 + - uid: 16029 components: - type: Transform pos: -22.5,3.5 - parent: 15968 - - uid: 16029 + parent: 15969 + - uid: 16030 components: - type: Transform pos: -6.5,-0.5 - parent: 15968 + parent: 15969 - proto: GlowstickBase entities: - uid: 9638 @@ -74819,131 +74826,131 @@ entities: - type: Transform pos: 24.5,15.5 parent: 2 - - uid: 16030 + - uid: 16031 components: - type: Transform pos: -10.5,11.5 - parent: 15968 - - uid: 16031 + parent: 15969 + - uid: 16032 components: - type: Transform pos: -13.5,3.5 - parent: 15968 - - uid: 16032 + parent: 15969 + - uid: 16033 components: - type: Transform pos: -11.5,11.5 - parent: 15968 - - uid: 16033 + parent: 15969 + - uid: 16034 components: - type: Transform pos: -12.5,11.5 - parent: 15968 - - uid: 16034 + parent: 15969 + - uid: 16035 components: - type: Transform pos: -13.5,11.5 - parent: 15968 - - uid: 16035 + parent: 15969 + - uid: 16036 components: - type: Transform pos: -11.5,3.5 - parent: 15968 - - uid: 16036 + parent: 15969 + - uid: 16037 components: - type: Transform pos: -12.5,3.5 - parent: 15968 - - uid: 16037 + parent: 15969 + - uid: 16038 components: - type: Transform pos: -10.5,3.5 - parent: 15968 - - uid: 16038 + parent: 15969 + - uid: 16039 components: - type: Transform pos: -22.5,4.5 - parent: 15968 - - uid: 16039 + parent: 15969 + - uid: 16040 components: - type: Transform pos: -22.5,6.5 - parent: 15968 - - uid: 16040 + parent: 15969 + - uid: 16041 components: - type: Transform pos: -1.5,9.5 - parent: 15968 - - uid: 16041 + parent: 15969 + - uid: 16042 components: - type: Transform pos: -3.5,0.5 - parent: 15968 - - uid: 16042 + parent: 15969 + - uid: 16043 components: - type: Transform pos: -4.5,0.5 - parent: 15968 - - uid: 16043 + parent: 15969 + - uid: 16044 components: - type: Transform pos: -1.5,10.5 - parent: 15968 - - uid: 16044 + parent: 15969 + - uid: 16045 components: - type: Transform pos: -1.5,4.5 - parent: 15968 - - uid: 16045 + parent: 15969 + - uid: 16046 components: - type: Transform pos: -1.5,6.5 - parent: 15968 - - uid: 16046 + parent: 15969 + - uid: 16047 components: - type: Transform pos: -22.5,2.5 - parent: 15968 - - uid: 16047 + parent: 15969 + - uid: 16048 components: - type: Transform pos: -1.5,2.5 - parent: 15968 - - uid: 16048 + parent: 15969 + - uid: 16049 components: - type: Transform pos: -22.5,8.5 - parent: 15968 - - uid: 16049 + parent: 15969 + - uid: 16050 components: - type: Transform pos: -22.5,9.5 - parent: 15968 - - uid: 16050 + parent: 15969 + - uid: 16051 components: - type: Transform pos: -22.5,10.5 - parent: 15968 - - uid: 16051 + parent: 15969 + - uid: 16052 components: - type: Transform pos: -20.5,0.5 - parent: 15968 - - uid: 16052 + parent: 15969 + - uid: 16053 components: - type: Transform pos: -19.5,0.5 - parent: 15968 - - uid: 16290 + parent: 15969 + - uid: 16291 components: - type: Transform pos: 12.5,-2.5 - parent: 16266 - - uid: 16291 + parent: 16267 + - uid: 16292 components: - type: Transform pos: 12.5,-1.5 - parent: 16266 + parent: 16267 - proto: GrilleBroken entities: - uid: 10446 @@ -75035,11 +75042,11 @@ entities: rot: -1.5707963267948966 rad pos: 31.5,93.5 parent: 2 - - uid: 16053 + - uid: 16054 components: - type: Transform pos: -1.5,3.5 - parent: 15968 + parent: 15969 - proto: GrilleSpawner entities: - uid: 10461 @@ -75702,28 +75709,28 @@ entities: rot: 1.5707963267948966 rad pos: 10.5,78.5 parent: 2 - - uid: 16054 + - uid: 16055 components: - type: Transform pos: -1.5,8.5 - parent: 15968 - - uid: 16055 + parent: 15969 + - uid: 16056 components: - type: Transform pos: -8.5,-0.5 - parent: 15968 + parent: 15969 - proto: InflatableWallStack1 entities: - - uid: 16056 + - uid: 16057 components: - type: Transform pos: -16.513504,0.3654132 - parent: 15968 - - uid: 16057 + parent: 15969 + - uid: 16058 components: - type: Transform pos: -21.122879,4.365413 - parent: 15968 + parent: 15969 - proto: IngotGold entities: - uid: 10568 @@ -75973,11 +75980,11 @@ entities: - type: Transform pos: 59.432396,38.112675 parent: 2 - - uid: 15686 + - uid: 15687 components: - type: Transform pos: 6.5522995,3.5336378 - parent: 15651 + parent: 15652 - proto: KitchenMicrowave entities: - uid: 10594 @@ -76000,11 +76007,11 @@ entities: - type: Transform pos: 35.5,-6.5 parent: 2 - - uid: 15687 + - uid: 15688 components: - type: Transform pos: 7.5,3.5 - parent: 15651 + parent: 15652 - proto: KitchenReagentGrinder entities: - uid: 10598 @@ -76049,11 +76056,11 @@ entities: - type: Transform pos: 16.5,54.5 parent: 2 - - uid: 15688 + - uid: 15689 components: - type: Transform pos: 11.5,5.5 - parent: 15651 + parent: 15652 - proto: KnifePlastic entities: - uid: 10606 @@ -77131,18 +77138,18 @@ entities: parent: 2 - proto: LockerOldAISat entities: - - uid: 16058 + - uid: 16059 components: - type: Transform pos: -15.5,13.5 - parent: 15968 + parent: 15969 - type: ContainerContainer containers: entity_storage: !type:Container showEnts: False occludes: True ents: - - 16059 + - 16060 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -77418,11 +77425,11 @@ entities: parent: 2 - proto: LockerSyndicatePersonal entities: - - uid: 16060 + - uid: 16061 components: - type: Transform pos: -17.5,13.5 - parent: 15968 + parent: 15969 - type: Lock locked: False - type: Fixtures @@ -77619,17 +77626,17 @@ entities: - type: Transform pos: 18.5,-14.5 parent: 2 - - uid: 16061 + - uid: 16062 components: - type: Transform pos: -16.5,10.5 - parent: 15968 - - uid: 16292 + parent: 15969 + - uid: 16293 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,-4.5 - parent: 16266 + parent: 16267 - proto: MachineFrameDestroyed entities: - uid: 10703 @@ -77657,21 +77664,21 @@ entities: - type: Transform pos: 28.5,-12.5 parent: 2 - - uid: 16062 + - uid: 16063 components: - type: Transform pos: -16.5,4.5 - parent: 15968 - - uid: 16063 + parent: 15969 + - uid: 16064 components: - type: Transform pos: -5.5,10.5 - parent: 15968 - - uid: 16293 + parent: 15969 + - uid: 16294 components: - type: Transform pos: 11.5,0.5 - parent: 16266 + parent: 16267 - proto: MagazineBoxAntiMateriel entities: - uid: 10708 @@ -77872,16 +77879,16 @@ entities: parent: 2 - proto: MaterialSheetMeat1 entities: - - uid: 15689 + - uid: 15690 components: - type: Transform pos: 12.5717125,1.4963056 - parent: 15651 - - uid: 15690 + parent: 15652 + - uid: 15691 components: - type: Transform pos: 14.5404625,4.6525555 - parent: 15651 + parent: 15652 - proto: MatterBinStockPart entities: - uid: 10743 @@ -78082,26 +78089,26 @@ entities: - type: Transform pos: 61.5,-6.5 parent: 2 - - uid: 16294 + - uid: 16295 components: - type: Transform pos: -0.5,-2.5 - parent: 16266 - - uid: 16295 + parent: 16267 + - uid: 16296 components: - type: Transform pos: 12.5,-1.5 - parent: 16266 - - uid: 16296 + parent: 16267 + - uid: 16297 components: - type: Transform pos: -0.5,-1.5 - parent: 16266 - - uid: 16297 + parent: 16267 + - uid: 16298 components: - type: Transform pos: 12.5,-2.5 - parent: 16266 + parent: 16267 - proto: Mirror entities: - uid: 10777 @@ -78350,28 +78357,28 @@ entities: parent: 2 - proto: OreBag entities: - - uid: 16298 + - uid: 16299 components: - type: Transform pos: 0.47644043,-1.4402847 - parent: 16266 - - uid: 16299 + parent: 16267 + - uid: 16300 components: - type: Transform pos: 0.76997375,-1.5503616 - parent: 16266 + parent: 16267 - proto: OreBox entities: - - uid: 16300 + - uid: 16301 components: - type: Transform pos: 3.5,-3.5 - parent: 16266 - - uid: 16301 + parent: 16267 + - uid: 16302 components: - type: Transform pos: 0.5,-2.5 - parent: 16266 + parent: 16267 - proto: OreProcessor entities: - uid: 10819 @@ -78381,11 +78388,11 @@ entities: parent: 2 - proto: OreProcessorMachineCircuitboard entities: - - uid: 16302 + - uid: 16303 components: - type: Transform pos: 8.507294,-0.5046463 - parent: 16266 + parent: 16267 - proto: OrganHumanEars entities: - uid: 10820 @@ -78992,48 +78999,48 @@ entities: - type: Transform pos: 24.63128,-10.555255 parent: 2 - - uid: 15691 + - uid: 15692 components: - type: Transform pos: 13.453796,1.786519 - parent: 15651 + parent: 15652 - type: Paper content: Я не умру прямо тут! НЕТ! Я должен найти эти ебучие бумаги... - - uid: 16064 - components: - - type: Transform - pos: -15.484587,8.467606 - parent: 15968 - uid: 16065 components: - type: Transform pos: -15.484587,8.467606 - parent: 15968 + parent: 15969 - uid: 16066 components: - type: Transform pos: -15.484587,8.467606 - parent: 15968 + parent: 15969 - uid: 16067 components: - type: Transform pos: -15.484587,8.467606 - parent: 15968 + parent: 15969 - uid: 16068 components: - type: Transform pos: -15.484587,8.467606 - parent: 15968 + parent: 15969 - uid: 16069 components: - type: Transform pos: -15.484587,8.467606 - parent: 15968 + parent: 15969 - uid: 16070 components: - type: Transform pos: -15.484587,8.467606 - parent: 15968 + parent: 15969 + - uid: 16071 + components: + - type: Transform + pos: -15.484587,8.467606 + parent: 15969 - proto: PaperBin10 entities: - uid: 10871 @@ -79261,11 +79268,11 @@ entities: parent: 2 - proto: PhoneInstrumentSyndicate entities: - - uid: 16071 + - uid: 16072 components: - type: Transform pos: -10.457237,10.606245 - parent: 15968 + parent: 15969 - proto: PianoInstrument entities: - uid: 10903 @@ -79318,11 +79325,11 @@ entities: parent: 2 - proto: PlasmaDoor entities: - - uid: 15692 + - uid: 15693 components: - type: Transform pos: 13.5,6.5 - parent: 15651 + parent: 15652 - proto: PlasmaReinforcedWindowDirectional entities: - uid: 10908 @@ -79492,23 +79499,23 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,-7.5 parent: 2 - - uid: 15693 + - uid: 15694 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,7.5 - parent: 15651 - - uid: 15694 + parent: 15652 + - uid: 15695 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,7.5 - parent: 15651 - - uid: 15695 + parent: 15652 + - uid: 15696 components: - type: Transform pos: 10.5,7.5 - parent: 15651 + parent: 15652 - proto: PlasmaTankFilled entities: - uid: 10937 @@ -79713,11 +79720,11 @@ entities: - type: Transform pos: 70.5,8.5 parent: 2 - - uid: 16072 + - uid: 16073 components: - type: Transform pos: -6.5,13.5 - parent: 15968 + parent: 15969 - proto: PortableGeneratorPacman entities: - uid: 10971 @@ -79760,11 +79767,11 @@ entities: - type: Transform pos: 12.5,6.5 parent: 2 - - uid: 16073 + - uid: 16074 components: - type: Transform pos: -7.5,13.5 - parent: 15968 + parent: 15969 - proto: PortableGeneratorSuperPacman entities: - uid: 10979 @@ -79879,22 +79886,22 @@ entities: rot: -1.5707963267948966 rad pos: 61.5,33.5 parent: 2 - - uid: 16074 + - uid: 16075 components: - type: Transform pos: -16.5,5.5 - parent: 15968 - - uid: 16075 + parent: 15969 + - uid: 16076 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,0.5 - parent: 15968 - - uid: 16303 + parent: 15969 + - uid: 16304 components: - type: Transform pos: 1.5,-3.5 - parent: 16266 + parent: 16267 - proto: PosterContrabandGreyTide entities: - uid: 10995 @@ -80040,11 +80047,11 @@ entities: parent: 2 - proto: PosterContrabandSyndicatePistol entities: - - uid: 16076 + - uid: 16077 components: - type: Transform pos: -18.5,9.5 - parent: 15968 + parent: 15969 - proto: PosterContrabandSyndicateRecruitment entities: - uid: 11015 @@ -80062,11 +80069,11 @@ entities: - type: Transform pos: 54.5,34.5 parent: 2 - - uid: 16077 + - uid: 16078 components: - type: Transform pos: -5.5,9.5 - parent: 15968 + parent: 15969 - proto: PosterContrabandTools entities: - uid: 11018 @@ -80475,18 +80482,18 @@ entities: - type: Transform pos: 45.5,2.5 parent: 2 - - uid: 16078 + - uid: 16079 components: - type: Transform pos: -14.5,9.5 - parent: 15968 + parent: 15969 - proto: PowerCellHigh entities: - - uid: 16079 + - uid: 16080 components: - type: Transform pos: -10.481621,4.5962195 - parent: 15968 + parent: 15969 - proto: PowerCellRecharger entities: - uid: 11085 @@ -82877,11 +82884,11 @@ entities: parent: 2 - proto: PrintedDocumentNoteBeginningMilitaryActions entities: - - uid: 16080 + - uid: 16081 components: - type: Transform pos: -13.659574,4.4963784 - parent: 15968 + parent: 15969 - proto: PrinterDoc entities: - uid: 11485 @@ -83148,16 +83155,16 @@ entities: - type: Transform pos: 78.5,11.5 parent: 2 - - uid: 16081 + - uid: 16082 components: - type: Transform pos: -15.5,8.5 - parent: 15968 - - uid: 16304 + parent: 15969 + - uid: 16305 components: - type: Transform pos: 0.5,-1.5 - parent: 16266 + parent: 16267 - proto: RadiationCollector entities: - uid: 11528 @@ -84338,18 +84345,18 @@ entities: parent: 2 - proto: ReinforcedGirder entities: - - uid: 16082 + - uid: 16083 components: - type: Transform rot: -1.5707963267948966 rad pos: -18.5,13.5 - parent: 15968 - - uid: 16083 + parent: 15969 + - uid: 16084 components: - type: Transform rot: -1.5707963267948966 rad pos: -20.5,12.5 - parent: 15968 + parent: 15969 - proto: ReinforcedPlasmaWindow entities: - uid: 11745 @@ -86681,121 +86688,121 @@ entities: rot: -1.5707963267948966 rad pos: 24.5,-28.5 parent: 2 - - uid: 16084 + - uid: 16085 components: - type: Transform pos: -11.5,3.5 - parent: 15968 - - uid: 16085 + parent: 15969 + - uid: 16086 components: - type: Transform pos: -12.5,11.5 - parent: 15968 - - uid: 16086 + parent: 15969 + - uid: 16087 components: - type: Transform pos: -13.5,3.5 - parent: 15968 - - uid: 16087 + parent: 15969 + - uid: 16088 components: - type: Transform pos: -13.5,11.5 - parent: 15968 - - uid: 16088 + parent: 15969 + - uid: 16089 components: - type: Transform pos: -11.5,11.5 - parent: 15968 - - uid: 16089 + parent: 15969 + - uid: 16090 components: - type: Transform pos: -10.5,11.5 - parent: 15968 - - uid: 16090 + parent: 15969 + - uid: 16091 components: - type: Transform pos: -12.5,3.5 - parent: 15968 - - uid: 16091 + parent: 15969 + - uid: 16092 components: - type: Transform pos: -10.5,3.5 - parent: 15968 - - uid: 16092 + parent: 15969 + - uid: 16093 components: - type: Transform pos: -1.5,10.5 - parent: 15968 - - uid: 16093 + parent: 15969 + - uid: 16094 components: - type: Transform pos: -1.5,9.5 - parent: 15968 - - uid: 16094 + parent: 15969 + - uid: 16095 components: - type: Transform pos: -1.5,6.5 - parent: 15968 - - uid: 16095 + parent: 15969 + - uid: 16096 components: - type: Transform pos: -1.5,4.5 - parent: 15968 - - uid: 16096 + parent: 15969 + - uid: 16097 components: - type: Transform pos: -1.5,2.5 - parent: 15968 - - uid: 16097 + parent: 15969 + - uid: 16098 components: - type: Transform pos: -22.5,8.5 - parent: 15968 - - uid: 16098 + parent: 15969 + - uid: 16099 components: - type: Transform pos: -22.5,10.5 - parent: 15968 - - uid: 16099 + parent: 15969 + - uid: 16100 components: - type: Transform pos: -22.5,9.5 - parent: 15968 - - uid: 16100 + parent: 15969 + - uid: 16101 components: - type: Transform pos: -22.5,6.5 - parent: 15968 - - uid: 16101 + parent: 15969 + - uid: 16102 components: - type: Transform pos: -22.5,4.5 - parent: 15968 - - uid: 16102 + parent: 15969 + - uid: 16103 components: - type: Transform pos: -4.5,0.5 - parent: 15968 - - uid: 16103 + parent: 15969 + - uid: 16104 components: - type: Transform pos: -22.5,2.5 - parent: 15968 - - uid: 16104 + parent: 15969 + - uid: 16105 components: - type: Transform pos: -3.5,0.5 - parent: 15968 - - uid: 16105 + parent: 15969 + - uid: 16106 components: - type: Transform pos: -20.5,0.5 - parent: 15968 - - uid: 16106 + parent: 15969 + - uid: 16107 components: - type: Transform pos: -19.5,0.5 - parent: 15968 + parent: 15969 - proto: ResearchAndDevelopmentServer entities: - uid: 12204 @@ -86849,51 +86856,51 @@ entities: parent: 2 - proto: SalvageFleshSpawner entities: - - uid: 15696 + - uid: 15697 components: - type: Transform pos: 14.5,1.5 - parent: 15651 - - uid: 15697 + parent: 15652 + - uid: 15698 components: - type: Transform pos: 12.5,2.5 - parent: 15651 - - uid: 15698 + parent: 15652 + - uid: 15699 components: - type: Transform pos: 14.5,4.5 - parent: 15651 - - uid: 15699 + parent: 15652 + - uid: 15700 components: - type: Transform pos: 11.5,6.5 - parent: 15651 - - uid: 15700 + parent: 15652 + - uid: 15701 components: - type: Transform pos: 9.5,5.5 - parent: 15651 - - uid: 15701 + parent: 15652 + - uid: 15702 components: - type: Transform pos: 10.5,2.5 - parent: 15651 - - uid: 15702 + parent: 15652 + - uid: 15703 components: - type: Transform pos: 7.5,1.5 - parent: 15651 - - uid: 15703 + parent: 15652 + - uid: 15704 components: - type: Transform pos: 8.5,3.5 - parent: 15651 - - uid: 15704 + parent: 15652 + - uid: 15705 components: - type: Transform pos: 12.5,7.5 - parent: 15651 + parent: 15652 - proto: SalvageMagnet entities: - uid: 12210 @@ -87106,116 +87113,116 @@ entities: parent: 2 - proto: ShadowKudzuWeak entities: - - uid: 16107 + - uid: 16108 components: - type: Transform pos: -7.5,4.5 - parent: 15968 + parent: 15969 - type: Fixtures fixtures: {} - - uid: 16108 + - uid: 16109 components: - type: Transform pos: -14.5,-0.5 - parent: 15968 + parent: 15969 - type: Fixtures fixtures: {} - - uid: 16109 + - uid: 16110 components: - type: Transform pos: -18.5,4.5 - parent: 15968 + parent: 15969 - type: Fixtures fixtures: {} - - uid: 16110 + - uid: 16111 components: - type: Transform pos: -15.5,6.5 - parent: 15968 + parent: 15969 - type: Fixtures fixtures: {} - - uid: 16111 + - uid: 16112 components: - type: Transform pos: -10.5,9.5 - parent: 15968 + parent: 15969 - type: Fixtures fixtures: {} - - uid: 16112 + - uid: 16113 components: - type: Transform pos: -2.5,8.5 - parent: 15968 + parent: 15969 - type: Fixtures fixtures: {} - - uid: 16113 + - uid: 16114 components: - type: Transform pos: -8.5,11.5 - parent: 15968 + parent: 15969 - type: Fixtures fixtures: {} - - uid: 16114 + - uid: 16115 components: - type: Transform pos: -16.5,11.5 - parent: 15968 + parent: 15969 - type: Fixtures fixtures: {} - - uid: 16115 + - uid: 16116 components: - type: Transform pos: -20.5,7.5 - parent: 15968 + parent: 15969 - type: Fixtures fixtures: {} - - uid: 16116 + - uid: 16117 components: - type: Transform pos: -20.5,1.5 - parent: 15968 + parent: 15969 - type: Fixtures fixtures: {} - proto: ShadowTree01 entities: - - uid: 16117 + - uid: 16118 components: - type: Transform pos: -20.85241,9.8108635 - parent: 15968 + parent: 15969 - proto: ShadowTree02 entities: - - uid: 16118 + - uid: 16119 components: - type: Transform pos: -10.439648,-0.08605099 - parent: 15968 + parent: 15969 - proto: ShadowTree03 entities: - - uid: 16119 + - uid: 16120 components: - type: Transform pos: -20.47741,3.511994 - parent: 15968 - - uid: 16120 + parent: 15969 + - uid: 16121 components: - type: Transform pos: -17.690504,1.7481451 - parent: 15968 + parent: 15969 - proto: ShadowTree04 entities: - - uid: 16121 + - uid: 16122 components: - type: Transform pos: -3.1023102,9.764383 - parent: 15968 + parent: 15969 - proto: ShadowTree06 entities: - - uid: 16122 + - uid: 16123 components: - type: Transform pos: -3.0646477,3.515057 - parent: 15968 + parent: 15969 - proto: ShardGlass entities: - uid: 12245 @@ -87420,18 +87427,18 @@ entities: parent: 2 - proto: SheetSteel1 entities: - - uid: 16059 + - uid: 16060 components: - type: Transform - parent: 16058 + parent: 16059 - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 16123 + - uid: 16124 components: - type: Transform pos: -15.582573,1.5709224 - parent: 15968 + parent: 15969 - proto: SheetSteel10 entities: - uid: 12271 @@ -88564,56 +88571,56 @@ entities: linkedPorts: 12366: - Pressed: Toggle - - uid: 15705 + - uid: 15706 components: - type: Transform pos: 9.5,0.5 - parent: 15651 + parent: 15652 - type: DeviceLinkSource linkedPorts: - 15655: - - Pressed: Toggle 15656: - Pressed: Toggle - - uid: 15706 + 15657: + - Pressed: Toggle + - uid: 15707 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,0.5 - parent: 15651 + parent: 15652 - type: DeviceLinkSource linkedPorts: - 15655: - - Pressed: Toggle 15656: - Pressed: Toggle - - uid: 15707 + 15657: + - Pressed: Toggle + - uid: 15708 components: - type: Transform pos: 9.5,8.5 - parent: 15651 + parent: 15652 - type: DeviceLinkSource linkedPorts: - 15658: + 15659: - Pressed: Toggle - - uid: 15708 + - uid: 15709 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,4.5 - parent: 15651 + parent: 15652 - type: DeviceLinkSource linkedPorts: - 15657: + 15658: - Pressed: Toggle - - uid: 15709 + - uid: 15710 components: - type: Transform pos: 9.5,4.5 - parent: 15651 + parent: 15652 - type: DeviceLinkSource linkedPorts: - 15657: + 15658: - Pressed: Toggle - proto: SignalTrigger entities: @@ -89404,11 +89411,11 @@ entities: parent: 2 - proto: SoapSyndie entities: - - uid: 16124 + - uid: 16125 components: - type: Transform pos: -18.528275,-0.5117774 - parent: 15968 + parent: 15969 - proto: SodaDispenser entities: - uid: 12535 @@ -90139,128 +90146,128 @@ entities: parent: 2 - proto: SpawnMobCarp entities: - - uid: 16125 + - uid: 16126 components: - type: Transform pos: -24.5,6.5 - parent: 15968 - - uid: 16126 + parent: 15969 + - uid: 16127 components: - type: Transform pos: -4.5,2.5 - parent: 15968 - - uid: 16127 + parent: 15969 + - uid: 16128 components: - type: Transform pos: -11.5,5.5 - parent: 15968 - - uid: 16128 + parent: 15969 + - uid: 16129 components: - type: Transform pos: -15.5,-0.5 - parent: 15968 - - uid: 16129 + parent: 15969 + - uid: 16130 components: - type: Transform pos: -21.5,5.5 - parent: 15968 - - uid: 16130 + parent: 15969 + - uid: 16131 components: - type: Transform pos: -18.5,10.5 - parent: 15968 - - uid: 16131 + parent: 15969 + - uid: 16132 components: - type: Transform pos: -3.5,8.5 - parent: 15968 - - uid: 16132 + parent: 15969 + - uid: 16133 components: - type: Transform pos: -24.5,12.5 - parent: 15968 - - uid: 16133 + parent: 15969 + - uid: 16134 components: - type: Transform pos: -8.5,3.5 - parent: 15968 - - uid: 16134 + parent: 15969 + - uid: 16135 components: - type: Transform pos: -18.5,-0.5 - parent: 15968 - - uid: 16135 + parent: 15969 + - uid: 16136 components: - type: Transform pos: -20.5,13.5 - parent: 15968 - - uid: 16136 + parent: 15969 + - uid: 16137 components: - type: Transform pos: -12.5,12.5 - parent: 15968 - - uid: 16137 + parent: 15969 + - uid: 16138 components: - type: Transform pos: -4.5,13.5 - parent: 15968 - - uid: 16138 + parent: 15969 + - uid: 16139 components: - type: Transform pos: -7.5,12.5 - parent: 15968 - - uid: 16139 + parent: 15969 + - uid: 16140 components: - type: Transform pos: -6.5,11.5 - parent: 15968 - - uid: 16140 + parent: 15969 + - uid: 16141 components: - type: Transform pos: -2.5,1.5 - parent: 15968 - - uid: 16141 + parent: 15969 + - uid: 16142 components: - type: Transform pos: -16.5,3.5 - parent: 15968 - - uid: 16142 + parent: 15969 + - uid: 16143 components: - type: Transform pos: -21.5,8.5 - parent: 15968 - - uid: 16143 + parent: 15969 + - uid: 16144 components: - type: Transform pos: -15.5,6.5 - parent: 15968 - - uid: 16144 + parent: 15969 + - uid: 16145 components: - type: Transform pos: -24.5,1.5 - parent: 15968 + parent: 15969 - proto: SpawnMobCarpHolo entities: - - uid: 16305 + - uid: 16306 components: - type: Transform pos: 8.5,-2.5 - parent: 16266 - - uid: 16306 + parent: 16267 + - uid: 16307 components: - type: Transform pos: 2.5,-2.5 - parent: 16266 - - uid: 16307 + parent: 16267 + - uid: 16308 components: - type: Transform pos: 5.5,-3.5 - parent: 16266 - - uid: 16308 + parent: 16267 + - uid: 16309 components: - type: Transform pos: 2.5,-0.5 - parent: 16266 + parent: 16267 - proto: SpawnMobCatFloppa entities: - uid: 12642 @@ -90375,21 +90382,21 @@ entities: parent: 2 - proto: SpawnMobShark entities: - - uid: 16145 + - uid: 16146 components: - type: Transform pos: -12.5,7.5 - parent: 15968 - - uid: 16146 + parent: 15969 + - uid: 16147 components: - type: Transform pos: -16.5,12.5 - parent: 15968 - - uid: 16147 + parent: 15969 + - uid: 16148 components: - type: Transform pos: -12.5,0.5 - parent: 15968 + parent: 15969 - proto: SpawnMobShiva entities: - uid: 12658 @@ -90918,26 +90925,26 @@ entities: parent: 2 - proto: StairDark entities: - - uid: 16148 + - uid: 16149 components: - type: Transform pos: -21.5,6.5 - parent: 15968 - - uid: 16149 + parent: 15969 + - uid: 16150 components: - type: Transform pos: -20.5,6.5 - parent: 15968 - - uid: 16150 + parent: 15969 + - uid: 16151 components: - type: Transform pos: -3.5,6.5 - parent: 15968 - - uid: 16151 + parent: 15969 + - uid: 16152 components: - type: Transform pos: -2.5,6.5 - parent: 15968 + parent: 15969 - proto: StairStage entities: - uid: 12744 @@ -91012,11 +91019,11 @@ entities: parent: 2 - proto: StationMapAssembly entities: - - uid: 16152 + - uid: 16153 components: - type: Transform pos: -17.5,9.5 - parent: 15968 + parent: 15969 - proto: StationMapBroken entities: - uid: 12756 @@ -91025,11 +91032,11 @@ entities: rot: -1.5707963267948966 rad pos: 34.5,61.5 parent: 2 - - uid: 16153 + - uid: 16154 components: - type: Transform pos: -8.5,4.5 - parent: 15968 + parent: 15969 - proto: StealthBox entities: - uid: 12757 @@ -91069,35 +91076,35 @@ entities: rot: 3.141592653589793 rad pos: 40.5,26.5 parent: 2 - - uid: 16154 + - uid: 16155 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,12.5 - parent: 15968 - - uid: 16155 + parent: 15969 + - uid: 16156 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,11.5 - parent: 15968 + parent: 15969 - proto: SteelOre1 entities: - - uid: 16309 + - uid: 16310 components: - type: Transform pos: 6.8791656,-1.4219437 - parent: 16266 - - uid: 16310 + parent: 16267 + - uid: 16311 components: - type: Transform pos: 6.200363,-3.1648026 - parent: 16266 - - uid: 16311 + parent: 16267 + - uid: 16312 components: - type: Transform pos: 3.0081787,-1.843895 - parent: 16266 + parent: 16267 - proto: Stool entities: - uid: 12763 @@ -91390,11 +91397,11 @@ entities: - type: Transform pos: 55.5,47.5 parent: 2 - - uid: 16156 + - uid: 16157 components: - type: Transform pos: -7.5,10.5 - parent: 15968 + parent: 15969 - proto: SubstationMachineCircuitboard entities: - uid: 12806 @@ -92632,30 +92639,30 @@ entities: - type: Transform pos: 76.5,5.5 parent: 2 - - uid: 16157 + - uid: 16158 components: - type: Transform pos: -14.5,-3.5 - parent: 15968 - - uid: 16158 + parent: 15969 + - uid: 16159 components: - type: Transform pos: -22.5,7.5 - parent: 15968 + parent: 15969 - proto: SyndieHandyFlag entities: - - uid: 16159 + - uid: 16160 components: - type: Transform pos: -5.530535,8.29517 - parent: 15968 + parent: 15969 - proto: SyndieTrickyBomb entities: - - uid: 16160 + - uid: 16161 components: - type: Transform pos: -13.535671,-1.5605578 - parent: 15968 + parent: 15969 - proto: SynthesizerInstrument entities: - uid: 12897 @@ -93435,11 +93442,11 @@ entities: - type: Transform pos: 19.5,-16.5 parent: 2 - - uid: 16161 + - uid: 16162 components: - type: Transform pos: -13.5,10.5 - parent: 15968 + parent: 15969 - proto: TableGlass entities: - uid: 13035 @@ -94107,54 +94114,54 @@ entities: rot: 3.141592653589793 rad pos: -1.5,33.5 parent: 2 - - uid: 15710 + - uid: 15711 components: - type: Transform pos: 7.5,3.5 - parent: 15651 - - uid: 15711 + parent: 15652 + - uid: 15712 components: - type: Transform pos: 6.5,3.5 - parent: 15651 - - uid: 15712 + parent: 15652 + - uid: 15713 components: - type: Transform pos: 5.5,3.5 - parent: 15651 - - uid: 15713 + parent: 15652 + - uid: 15714 components: - type: Transform pos: 5.5,2.5 - parent: 15651 - - uid: 15714 + parent: 15652 + - uid: 15715 components: - type: Transform pos: 5.5,1.5 - parent: 15651 - - uid: 15715 + parent: 15652 + - uid: 15716 components: - type: Transform pos: 10.5,7.5 - parent: 15651 - - uid: 16162 + parent: 15652 + - uid: 16163 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,10.5 - parent: 15968 - - uid: 16163 + parent: 15969 + - uid: 16164 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,4.5 - parent: 15968 - - uid: 16164 + parent: 15969 + - uid: 16165 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,4.5 - parent: 15968 + parent: 15969 - proto: TableStone entities: - uid: 13155 @@ -94707,12 +94714,12 @@ entities: rot: 1.5707963267948966 rad pos: 75.5,72.5 parent: 2 - - uid: 16312 + - uid: 16313 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-4.5 - parent: 16266 + parent: 16267 - proto: TimerTrigger entities: - uid: 13220 @@ -95641,241 +95648,241 @@ entities: parent: 2 - proto: WallMeat entities: - - uid: 15716 + - uid: 15717 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,4.5 - parent: 15651 - - uid: 15717 + parent: 15652 + - uid: 15718 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,2.5 - parent: 15651 - - uid: 15718 + parent: 15652 + - uid: 15719 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,3.5 - parent: 15651 - - uid: 15719 + parent: 15652 + - uid: 15720 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,0.5 - parent: 15651 - - uid: 15720 + parent: 15652 + - uid: 15721 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,1.5 - parent: 15651 - - uid: 15721 + parent: 15652 + - uid: 15722 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,5.5 - parent: 15651 - - uid: 15722 + parent: 15652 + - uid: 15723 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,4.5 - parent: 15651 - - uid: 15723 + parent: 15652 + - uid: 15724 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,3.5 - parent: 15651 - - uid: 15724 + parent: 15652 + - uid: 15725 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,2.5 - parent: 15651 - - uid: 15725 + parent: 15652 + - uid: 15726 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,1.5 - parent: 15651 - - uid: 15726 + parent: 15652 + - uid: 15727 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,0.5 - parent: 15651 - - uid: 15727 + parent: 15652 + - uid: 15728 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,0.5 - parent: 15651 - - uid: 15728 + parent: 15652 + - uid: 15729 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,0.5 - parent: 15651 - - uid: 15729 + parent: 15652 + - uid: 15730 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,0.5 - parent: 15651 - - uid: 15730 + parent: 15652 + - uid: 15731 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,4.5 - parent: 15651 - - uid: 15731 + parent: 15652 + - uid: 15732 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,5.5 - parent: 15651 - - uid: 15732 + parent: 15652 + - uid: 15733 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,6.5 - parent: 15651 - - uid: 15733 + parent: 15652 + - uid: 15734 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,5.5 - parent: 15651 - - uid: 15734 + parent: 15652 + - uid: 15735 components: - type: Transform pos: 12.5,6.5 - parent: 15651 + parent: 15652 - proto: WallMining entities: - - uid: 16313 + - uid: 16314 components: - type: Transform pos: -0.5,-0.5 - parent: 16266 - - uid: 16314 + parent: 16267 + - uid: 16315 components: - type: Transform pos: 0.5,-0.5 - parent: 16266 - - uid: 16315 + parent: 16267 + - uid: 16316 components: - type: Transform pos: -0.5,-3.5 - parent: 16266 - - uid: 16316 + parent: 16267 + - uid: 16317 components: - type: Transform pos: 0.5,-3.5 - parent: 16266 - - uid: 16317 + parent: 16267 + - uid: 16318 components: - type: Transform pos: 1.5,-4.5 - parent: 16266 - - uid: 16318 + parent: 16267 + - uid: 16319 components: - type: Transform pos: 3.5,-4.5 - parent: 16266 - - uid: 16319 + parent: 16267 + - uid: 16320 components: - type: Transform pos: 8.5,-4.5 - parent: 16266 - - uid: 16320 + parent: 16267 + - uid: 16321 components: - type: Transform pos: 10.5,-4.5 - parent: 16266 - - uid: 16321 + parent: 16267 + - uid: 16322 components: - type: Transform pos: 10.5,-3.5 - parent: 16266 - - uid: 16322 + parent: 16267 + - uid: 16323 components: - type: Transform pos: 11.5,-3.5 - parent: 16266 - - uid: 16323 + parent: 16267 + - uid: 16324 components: - type: Transform pos: 12.5,-3.5 - parent: 16266 - - uid: 16324 + parent: 16267 + - uid: 16325 components: - type: Transform pos: 12.5,-0.5 - parent: 16266 - - uid: 16325 + parent: 16267 + - uid: 16326 components: - type: Transform pos: 11.5,-0.5 - parent: 16266 - - uid: 16326 + parent: 16267 + - uid: 16327 components: - type: Transform pos: 10.5,-0.5 - parent: 16266 - - uid: 16327 + parent: 16267 + - uid: 16328 components: - type: Transform pos: 10.5,0.5 - parent: 16266 - - uid: 16328 + parent: 16267 + - uid: 16329 components: - type: Transform pos: 1.5,-0.5 - parent: 16266 - - uid: 16329 + parent: 16267 + - uid: 16330 components: - type: Transform pos: 1.5,0.5 - parent: 16266 - - uid: 16330 + parent: 16267 + - uid: 16331 components: - type: Transform pos: 8.5,0.5 - parent: 16266 - - uid: 16331 + parent: 16267 + - uid: 16332 components: - type: Transform pos: 3.5,0.5 - parent: 16266 - - uid: 16332 + parent: 16267 + - uid: 16333 components: - type: Transform pos: 1.5,-3.5 - parent: 16266 - - uid: 16333 + parent: 16267 + - uid: 16334 components: - type: Transform pos: 4.5,-1.5 - parent: 16266 - - uid: 16334 + parent: 16267 + - uid: 16335 components: - type: Transform pos: 5.5,-1.5 - parent: 16266 - - uid: 16335 + parent: 16267 + - uid: 16336 components: - type: Transform pos: 6.5,-1.5 - parent: 16266 - - uid: 16336 + parent: 16267 + - uid: 16337 components: - type: Transform pos: 6.5,-2.5 - parent: 16266 + parent: 16267 - proto: WallmountTelescreen entities: - uid: 13353 @@ -102269,632 +102276,632 @@ entities: rot: -1.5707963267948966 rad pos: 55.5,80.5 parent: 2 - - uid: 15735 + - uid: 15736 components: - type: Transform pos: 4.5,1.5 - parent: 15651 - - uid: 15736 + parent: 15652 + - uid: 15737 components: - type: Transform pos: 4.5,3.5 - parent: 15651 - - uid: 15737 + parent: 15652 + - uid: 15738 components: - type: Transform pos: 5.5,4.5 - parent: 15651 - - uid: 15738 + parent: 15652 + - uid: 15739 components: - type: Transform pos: 4.5,2.5 - parent: 15651 - - uid: 15739 + parent: 15652 + - uid: 15740 components: - type: Transform pos: 9.5,4.5 - parent: 15651 - - uid: 15740 + parent: 15652 + - uid: 15741 components: - type: Transform pos: 4.5,0.5 - parent: 15651 - - uid: 15741 + parent: 15652 + - uid: 15742 components: - type: Transform pos: 4.5,4.5 - parent: 15651 - - uid: 15742 + parent: 15652 + - uid: 15743 components: - type: Transform pos: 6.5,4.5 - parent: 15651 - - uid: 15743 + parent: 15652 + - uid: 15744 components: - type: Transform pos: 10.5,4.5 - parent: 15651 - - uid: 15744 + parent: 15652 + - uid: 15745 components: - type: Transform pos: 9.5,0.5 - parent: 15651 - - uid: 15745 + parent: 15652 + - uid: 15746 components: - type: Transform pos: 10.5,0.5 - parent: 15651 - - uid: 15746 + parent: 15652 + - uid: 15747 components: - type: Transform pos: 5.5,0.5 - parent: 15651 - - uid: 15747 + parent: 15652 + - uid: 15748 components: - type: Transform pos: 6.5,0.5 - parent: 15651 - - uid: 15748 + parent: 15652 + - uid: 15749 components: - type: Transform pos: 7.5,4.5 - parent: 15651 - - uid: 15749 + parent: 15652 + - uid: 15750 components: - type: Transform pos: 7.5,5.5 - parent: 15651 - - uid: 15750 + parent: 15652 + - uid: 15751 components: - type: Transform pos: 7.5,6.5 - parent: 15651 - - uid: 15751 + parent: 15652 + - uid: 15752 components: - type: Transform pos: 7.5,7.5 - parent: 15651 - - uid: 15752 + parent: 15652 + - uid: 15753 components: - type: Transform pos: 7.5,8.5 - parent: 15651 - - uid: 15753 + parent: 15652 + - uid: 15754 components: - type: Transform pos: 6.5,8.5 - parent: 15651 - - uid: 15754 + parent: 15652 + - uid: 15755 components: - type: Transform pos: 6.5,9.5 - parent: 15651 - - uid: 15755 + parent: 15652 + - uid: 15756 components: - type: Transform pos: 6.5,10.5 - parent: 15651 - - uid: 15756 + parent: 15652 + - uid: 15757 components: - type: Transform pos: 7.5,10.5 - parent: 15651 - - uid: 15757 + parent: 15652 + - uid: 15758 components: - type: Transform pos: 8.5,10.5 - parent: 15651 - - uid: 15758 + parent: 15652 + - uid: 15759 components: - type: Transform pos: 9.5,10.5 - parent: 15651 - - uid: 15759 + parent: 15652 + - uid: 15760 components: - type: Transform pos: 9.5,9.5 - parent: 15651 - - uid: 15760 + parent: 15652 + - uid: 15761 components: - type: Transform pos: 9.5,8.5 - parent: 15651 - - uid: 15761 + parent: 15652 + - uid: 15762 components: - type: Transform pos: 10.5,8.5 - parent: 15651 - - uid: 15762 + parent: 15652 + - uid: 15763 components: - type: Transform pos: 11.5,8.5 - parent: 15651 - - uid: 15763 + parent: 15652 + - uid: 15764 components: - type: Transform pos: 12.5,8.5 - parent: 15651 - - uid: 15764 + parent: 15652 + - uid: 15765 components: - type: Transform pos: 13.5,8.5 - parent: 15651 - - uid: 15765 + parent: 15652 + - uid: 15766 components: - type: Transform pos: 14.5,8.5 - parent: 15651 - - uid: 15766 + parent: 15652 + - uid: 15767 components: - type: Transform pos: 15.5,8.5 - parent: 15651 - - uid: 15767 + parent: 15652 + - uid: 15768 components: - type: Transform pos: 15.5,7.5 - parent: 15651 - - uid: 15768 + parent: 15652 + - uid: 15769 components: - type: Transform pos: 15.5,6.5 - parent: 15651 - - uid: 16165 + parent: 15652 + - uid: 16166 components: - type: Transform pos: -8.5,4.5 - parent: 15968 - - uid: 16166 + parent: 15969 + - uid: 16167 components: - type: Transform pos: -8.5,5.5 - parent: 15968 - - uid: 16167 + parent: 15969 + - uid: 16168 components: - type: Transform pos: -9.5,4.5 - parent: 15968 - - uid: 16168 + parent: 15969 + - uid: 16169 components: - type: Transform pos: -17.5,9.5 - parent: 15968 - - uid: 16169 + parent: 15969 + - uid: 16170 components: - type: Transform pos: -8.5,10.5 - parent: 15968 - - uid: 16170 + parent: 15969 + - uid: 16171 components: - type: Transform pos: -9.5,3.5 - parent: 15968 - - uid: 16171 + parent: 15969 + - uid: 16172 components: - type: Transform pos: -8.5,9.5 - parent: 15968 - - uid: 16172 + parent: 15969 + - uid: 16173 components: - type: Transform pos: -19.5,5.5 - parent: 15968 - - uid: 16173 + parent: 15969 + - uid: 16174 components: - type: Transform pos: -16.5,9.5 - parent: 15968 - - uid: 16174 + parent: 15969 + - uid: 16175 components: - type: Transform pos: -9.5,11.5 - parent: 15968 - - uid: 16175 + parent: 15969 + - uid: 16176 components: - type: Transform pos: -9.5,10.5 - parent: 15968 - - uid: 16176 + parent: 15969 + - uid: 16177 components: - type: Transform pos: -17.5,5.5 - parent: 15968 - - uid: 16177 + parent: 15969 + - uid: 16178 components: - type: Transform pos: -15.5,5.5 - parent: 15968 - - uid: 16178 + parent: 15969 + - uid: 16179 components: - type: Transform pos: -18.5,5.5 - parent: 15968 - - uid: 16179 + parent: 15969 + - uid: 16180 components: - type: Transform pos: -14.5,10.5 - parent: 15968 - - uid: 16180 + parent: 15969 + - uid: 16181 components: - type: Transform pos: -14.5,3.5 - parent: 15968 - - uid: 16181 + parent: 15969 + - uid: 16182 components: - type: Transform pos: -14.5,11.5 - parent: 15968 - - uid: 16182 + parent: 15969 + - uid: 16183 components: - type: Transform pos: -16.5,5.5 - parent: 15968 - - uid: 16183 + parent: 15969 + - uid: 16184 components: - type: Transform pos: -15.5,9.5 - parent: 15968 - - uid: 16184 + parent: 15969 + - uid: 16185 components: - type: Transform pos: -15.5,10.5 - parent: 15968 - - uid: 16185 + parent: 15969 + - uid: 16186 components: - type: Transform pos: -15.5,4.5 - parent: 15968 - - uid: 16186 + parent: 15969 + - uid: 16187 components: - type: Transform pos: -14.5,4.5 - parent: 15968 - - uid: 16187 + parent: 15969 + - uid: 16188 components: - type: Transform pos: -18.5,9.5 - parent: 15968 - - uid: 16188 + parent: 15969 + - uid: 16189 components: - type: Transform pos: -19.5,9.5 - parent: 15968 - - uid: 16189 + parent: 15969 + - uid: 16190 components: - type: Transform pos: -7.5,9.5 - parent: 15968 - - uid: 16190 + parent: 15969 + - uid: 16191 components: - type: Transform pos: -6.5,9.5 - parent: 15968 - - uid: 16191 + parent: 15969 + - uid: 16192 components: - type: Transform pos: -5.5,9.5 - parent: 15968 - - uid: 16192 + parent: 15969 + - uid: 16193 components: - type: Transform pos: -4.5,9.5 - parent: 15968 - - uid: 16193 + parent: 15969 + - uid: 16194 components: - type: Transform pos: -7.5,5.5 - parent: 15968 - - uid: 16194 + parent: 15969 + - uid: 16195 components: - type: Transform pos: -6.5,5.5 - parent: 15968 - - uid: 16195 + parent: 15969 + - uid: 16196 components: - type: Transform pos: -5.5,5.5 - parent: 15968 - - uid: 16196 + parent: 15969 + - uid: 16197 components: - type: Transform pos: -4.5,5.5 - parent: 15968 - - uid: 16197 + parent: 15969 + - uid: 16198 components: - type: Transform pos: -16.5,8.5 - parent: 15968 - - uid: 16198 + parent: 15969 + - uid: 16199 components: - type: Transform pos: -19.5,8.5 - parent: 15968 - - uid: 16199 + parent: 15969 + - uid: 16200 components: - type: Transform pos: -19.5,6.5 - parent: 15968 - - uid: 16200 + parent: 15969 + - uid: 16201 components: - type: Transform pos: -16.5,6.5 - parent: 15968 - - uid: 16201 + parent: 15969 + - uid: 16202 components: - type: Transform pos: -7.5,6.5 - parent: 15968 - - uid: 16202 + parent: 15969 + - uid: 16203 components: - type: Transform pos: -7.5,8.5 - parent: 15968 - - uid: 16203 + parent: 15969 + - uid: 16204 components: - type: Transform pos: -4.5,6.5 - parent: 15968 - - uid: 16204 + parent: 15969 + - uid: 16205 components: - type: Transform pos: -4.5,8.5 - parent: 15968 - - uid: 16205 + parent: 15969 + - uid: 16206 components: - type: Transform pos: -19.5,12.5 - parent: 15968 - - uid: 16206 + parent: 15969 + - uid: 16207 components: - type: Transform pos: -4.5,10.5 - parent: 15968 - - uid: 16207 + parent: 15969 + - uid: 16208 components: - type: Transform pos: -18.5,14.5 - parent: 15968 - - uid: 16208 + parent: 15969 + - uid: 16209 components: - type: Transform pos: -17.5,14.5 - parent: 15968 - - uid: 16209 + parent: 15969 + - uid: 16210 components: - type: Transform pos: -4.5,12.5 - parent: 15968 - - uid: 16210 + parent: 15969 + - uid: 16211 components: - type: Transform pos: -5.5,12.5 - parent: 15968 - - uid: 16211 + parent: 15969 + - uid: 16212 components: - type: Transform pos: -5.5,13.5 - parent: 15968 - - uid: 16212 + parent: 15969 + - uid: 16213 components: - type: Transform pos: -5.5,14.5 - parent: 15968 - - uid: 16213 + parent: 15969 + - uid: 16214 components: - type: Transform pos: -6.5,14.5 - parent: 15968 - - uid: 16214 + parent: 15969 + - uid: 16215 components: - type: Transform pos: -15.5,14.5 - parent: 15968 - - uid: 16215 + parent: 15969 + - uid: 16216 components: - type: Transform pos: -14.5,14.5 - parent: 15968 - - uid: 16216 + parent: 15969 + - uid: 16217 components: - type: Transform pos: -14.5,13.5 - parent: 15968 - - uid: 16217 + parent: 15969 + - uid: 16218 components: - type: Transform pos: -14.5,12.5 - parent: 15968 - - uid: 16218 + parent: 15969 + - uid: 16219 components: - type: Transform pos: -9.5,12.5 - parent: 15968 - - uid: 16219 + parent: 15969 + - uid: 16220 components: - type: Transform pos: -9.5,13.5 - parent: 15968 - - uid: 16220 + parent: 15969 + - uid: 16221 components: - type: Transform pos: -9.5,14.5 - parent: 15968 - - uid: 16221 + parent: 15969 + - uid: 16222 components: - type: Transform pos: -8.5,14.5 - parent: 15968 - - uid: 16222 + parent: 15969 + - uid: 16223 components: - type: Transform rot: -1.5707963267948966 rad pos: -7.5,14.5 - parent: 15968 - - uid: 16223 + parent: 15969 + - uid: 16224 components: - type: Transform pos: -1.5,7.5 - parent: 15968 - - uid: 16224 + parent: 15969 + - uid: 16225 components: - type: Transform pos: -1.5,5.5 - parent: 15968 - - uid: 16225 + parent: 15969 + - uid: 16226 components: - type: Transform pos: -1.5,1.5 - parent: 15968 - - uid: 16226 + parent: 15969 + - uid: 16227 components: - type: Transform pos: -2.5,12.5 - parent: 15968 - - uid: 16227 + parent: 15969 + - uid: 16228 components: - type: Transform pos: -3.5,12.5 - parent: 15968 - - uid: 16228 + parent: 15969 + - uid: 16229 components: - type: Transform pos: -22.5,12.5 - parent: 15968 - - uid: 16229 + parent: 15969 + - uid: 16230 components: - type: Transform pos: -22.5,11.5 - parent: 15968 - - uid: 16230 + parent: 15969 + - uid: 16231 components: - type: Transform pos: -22.5,7.5 - parent: 15968 - - uid: 16231 + parent: 15969 + - uid: 16232 components: - type: Transform pos: -22.5,5.5 - parent: 15968 - - uid: 16232 + parent: 15969 + - uid: 16233 components: - type: Transform pos: -1.5,0.5 - parent: 15968 - - uid: 16233 + parent: 15969 + - uid: 16234 components: - type: Transform pos: -2.5,0.5 - parent: 15968 - - uid: 16234 + parent: 15969 + - uid: 16235 components: - type: Transform pos: -9.5,-2.5 - parent: 15968 - - uid: 16235 + parent: 15969 + - uid: 16236 components: - type: Transform pos: -17.5,0.5 - parent: 15968 - - uid: 16236 + parent: 15969 + - uid: 16237 components: - type: Transform pos: -18.5,0.5 - parent: 15968 - - uid: 16237 + parent: 15969 + - uid: 16238 components: - type: Transform pos: -21.5,0.5 - parent: 15968 - - uid: 16238 + parent: 15969 + - uid: 16239 components: - type: Transform pos: -22.5,0.5 - parent: 15968 - - uid: 16239 + parent: 15969 + - uid: 16240 components: - type: Transform pos: -22.5,1.5 - parent: 15968 - - uid: 16240 + parent: 15969 + - uid: 16241 components: - type: Transform pos: -9.5,-3.5 - parent: 15968 - - uid: 16241 + parent: 15969 + - uid: 16242 components: - type: Transform pos: -17.5,-0.5 - parent: 15968 - - uid: 16242 + parent: 15969 + - uid: 16243 components: - type: Transform pos: -17.5,-1.5 - parent: 15968 - - uid: 16243 + parent: 15969 + - uid: 16244 components: - type: Transform pos: -9.5,-1.5 - parent: 15968 - - uid: 16244 + parent: 15969 + - uid: 16245 components: - type: Transform pos: -7.5,-2.5 - parent: 15968 - - uid: 16245 + parent: 15969 + - uid: 16246 components: - type: Transform pos: -14.5,-3.5 - parent: 15968 - - uid: 16246 + parent: 15969 + - uid: 16247 components: - type: Transform pos: -16.5,-1.5 - parent: 15968 - - uid: 16247 + parent: 15969 + - uid: 16248 components: - type: Transform pos: -16.5,-3.5 - parent: 15968 - - uid: 16248 + parent: 15969 + - uid: 16249 components: - type: Transform pos: -6.5,-1.5 - parent: 15968 - - uid: 16249 + parent: 15969 + - uid: 16250 components: - type: Transform pos: -16.5,-2.5 - parent: 15968 - - uid: 16250 + parent: 15969 + - uid: 16251 components: - type: Transform pos: -14.5,-1.5 - parent: 15968 - - uid: 16251 + parent: 15969 + - uid: 16252 components: - type: Transform pos: -7.5,-3.5 - parent: 15968 - - uid: 16252 + parent: 15969 + - uid: 16253 components: - type: Transform pos: -7.5,-1.5 - parent: 15968 - - uid: 16253 + parent: 15969 + - uid: 16254 components: - type: Transform pos: -14.5,-2.5 - parent: 15968 - - uid: 16254 + parent: 15969 + - uid: 16255 components: - type: Transform pos: -18.5,12.5 - parent: 15968 - - uid: 16255 + parent: 15969 + - uid: 16256 components: - type: Transform pos: -19.5,10.5 - parent: 15968 + parent: 15969 - proto: WallReinforcedRust entities: - uid: 14602 @@ -102939,1012 +102946,1012 @@ entities: parent: 2 - proto: WallRock entities: - - uid: 15769 + - uid: 15770 components: - type: Transform pos: 5.5,-0.5 - parent: 15651 - - uid: 15770 + parent: 15652 + - uid: 15771 components: - type: Transform pos: 4.5,-2.5 - parent: 15651 - - uid: 15771 + parent: 15652 + - uid: 15772 components: - type: Transform pos: 5.5,-1.5 - parent: 15651 - - uid: 15772 + parent: 15652 + - uid: 15773 components: - type: Transform pos: 6.5,-1.5 - parent: 15651 - - uid: 15773 + parent: 15652 + - uid: 15774 components: - type: Transform pos: 7.5,-0.5 - parent: 15651 - - uid: 15774 + parent: 15652 + - uid: 15775 components: - type: Transform pos: 6.5,-2.5 - parent: 15651 - - uid: 15775 + parent: 15652 + - uid: 15776 components: - type: Transform pos: 7.5,-2.5 - parent: 15651 - - uid: 15776 + parent: 15652 + - uid: 15777 components: - type: Transform pos: 8.5,-1.5 - parent: 15651 - - uid: 15777 + parent: 15652 + - uid: 15778 components: - type: Transform pos: 8.5,-2.5 - parent: 15651 - - uid: 15778 + parent: 15652 + - uid: 15779 components: - type: Transform pos: 9.5,-0.5 - parent: 15651 - - uid: 15779 + parent: 15652 + - uid: 15780 components: - type: Transform pos: 10.5,-0.5 - parent: 15651 - - uid: 15780 + parent: 15652 + - uid: 15781 components: - type: Transform pos: 10.5,-2.5 - parent: 15651 - - uid: 15781 + parent: 15652 + - uid: 15782 components: - type: Transform pos: 11.5,-0.5 - parent: 15651 - - uid: 15782 + parent: 15652 + - uid: 15783 components: - type: Transform pos: 12.5,-0.5 - parent: 15651 - - uid: 15783 + parent: 15652 + - uid: 15784 components: - type: Transform pos: 12.5,-1.5 - parent: 15651 - - uid: 15784 + parent: 15652 + - uid: 15785 components: - type: Transform pos: 12.5,-2.5 - parent: 15651 - - uid: 15785 + parent: 15652 + - uid: 15786 components: - type: Transform pos: 13.5,-0.5 - parent: 15651 - - uid: 15786 + parent: 15652 + - uid: 15787 components: - type: Transform pos: 13.5,-2.5 - parent: 15651 - - uid: 15787 + parent: 15652 + - uid: 15788 components: - type: Transform pos: 8.5,-3.5 - parent: 15651 - - uid: 15788 + parent: 15652 + - uid: 15789 components: - type: Transform pos: 6.5,-3.5 - parent: 15651 - - uid: 15789 + parent: 15652 + - uid: 15790 components: - type: Transform pos: 5.5,-3.5 - parent: 15651 - - uid: 15790 + parent: 15652 + - uid: 15791 components: - type: Transform pos: 3.5,-2.5 - parent: 15651 - - uid: 15791 + parent: 15652 + - uid: 15792 components: - type: Transform pos: 3.5,-0.5 - parent: 15651 - - uid: 15792 + parent: 15652 + - uid: 15793 components: - type: Transform pos: 3.5,0.5 - parent: 15651 - - uid: 15793 + parent: 15652 + - uid: 15794 components: - type: Transform pos: 3.5,3.5 - parent: 15651 - - uid: 15794 + parent: 15652 + - uid: 15795 components: - type: Transform pos: 2.5,-1.5 - parent: 15651 - - uid: 15795 + parent: 15652 + - uid: 15796 components: - type: Transform pos: 2.5,1.5 - parent: 15651 - - uid: 15796 + parent: 15652 + - uid: 15797 components: - type: Transform pos: 2.5,2.5 - parent: 15651 - - uid: 15797 + parent: 15652 + - uid: 15798 components: - type: Transform pos: 1.5,-1.5 - parent: 15651 - - uid: 15798 + parent: 15652 + - uid: 15799 components: - type: Transform pos: 1.5,-0.5 - parent: 15651 - - uid: 15799 + parent: 15652 + - uid: 15800 components: - type: Transform pos: 0.5,-0.5 - parent: 15651 - - uid: 15800 + parent: 15652 + - uid: 15801 components: - type: Transform pos: 0.5,1.5 - parent: 15651 - - uid: 15801 + parent: 15652 + - uid: 15802 components: - type: Transform pos: 0.5,3.5 - parent: 15651 - - uid: 15802 + parent: 15652 + - uid: 15803 components: - type: Transform pos: 0.5,4.5 - parent: 15651 - - uid: 15803 + parent: 15652 + - uid: 15804 components: - type: Transform pos: 1.5,4.5 - parent: 15651 - - uid: 15804 + parent: 15652 + - uid: 15805 components: - type: Transform pos: 2.5,5.5 - parent: 15651 - - uid: 15805 + parent: 15652 + - uid: 15806 components: - type: Transform pos: 3.5,5.5 - parent: 15651 - - uid: 15806 + parent: 15652 + - uid: 15807 components: - type: Transform pos: 5.5,5.5 - parent: 15651 - - uid: 15807 + parent: 15652 + - uid: 15808 components: - type: Transform pos: 3.5,6.5 - parent: 15651 - - uid: 15808 + parent: 15652 + - uid: 15809 components: - type: Transform pos: 5.5,6.5 - parent: 15651 - - uid: 15809 + parent: 15652 + - uid: 15810 components: - type: Transform pos: 5.5,7.5 - parent: 15651 - - uid: 15810 + parent: 15652 + - uid: 15811 components: - type: Transform pos: 6.5,6.5 - parent: 15651 - - uid: 15811 + parent: 15652 + - uid: 15812 components: - type: Transform pos: 6.5,7.5 - parent: 15651 - - uid: 15812 + parent: 15652 + - uid: 15813 components: - type: Transform pos: 5.5,8.5 - parent: 15651 - - uid: 15813 + parent: 15652 + - uid: 15814 components: - type: Transform pos: 4.5,8.5 - parent: 15651 - - uid: 15814 + parent: 15652 + - uid: 15815 components: - type: Transform pos: 3.5,9.5 - parent: 15651 - - uid: 15815 + parent: 15652 + - uid: 15816 components: - type: Transform pos: 2.5,10.5 - parent: 15651 - - uid: 15816 + parent: 15652 + - uid: 15817 components: - type: Transform pos: 1.5,9.5 - parent: 15651 - - uid: 15817 + parent: 15652 + - uid: 15818 components: - type: Transform pos: 0.5,9.5 - parent: 15651 - - uid: 15818 + parent: 15652 + - uid: 15819 components: - type: Transform pos: 3.5,13.5 - parent: 15651 - - uid: 15819 + parent: 15652 + - uid: 15820 components: - type: Transform pos: 4.5,12.5 - parent: 15651 - - uid: 15820 + parent: 15652 + - uid: 15821 components: - type: Transform pos: 5.5,11.5 - parent: 15651 - - uid: 15821 + parent: 15652 + - uid: 15822 components: - type: Transform pos: 5.5,12.5 - parent: 15651 - - uid: 15822 + parent: 15652 + - uid: 15823 components: - type: Transform pos: 7.5,11.5 - parent: 15651 - - uid: 15823 + parent: 15652 + - uid: 15824 components: - type: Transform pos: 8.5,12.5 - parent: 15651 - - uid: 15824 + parent: 15652 + - uid: 15825 components: - type: Transform pos: 9.5,11.5 - parent: 15651 - - uid: 15825 + parent: 15652 + - uid: 15826 components: - type: Transform pos: 8.5,14.5 - parent: 15651 - - uid: 15826 + parent: 15652 + - uid: 15827 components: - type: Transform pos: 7.5,13.5 - parent: 15651 - - uid: 15827 + parent: 15652 + - uid: 15828 components: - type: Transform pos: 9.5,13.5 - parent: 15651 - - uid: 15828 + parent: 15652 + - uid: 15829 components: - type: Transform pos: 10.5,12.5 - parent: 15651 - - uid: 15829 + parent: 15652 + - uid: 15830 components: - type: Transform pos: 10.5,10.5 - parent: 15651 - - uid: 15830 + parent: 15652 + - uid: 15831 components: - type: Transform pos: 10.5,9.5 - parent: 15651 - - uid: 15831 + parent: 15652 + - uid: 15832 components: - type: Transform pos: 12.5,12.5 - parent: 15651 - - uid: 15832 + parent: 15652 + - uid: 15833 components: - type: Transform pos: 12.5,11.5 - parent: 15651 - - uid: 15833 + parent: 15652 + - uid: 15834 components: - type: Transform pos: 12.5,9.5 - parent: 15651 - - uid: 15834 + parent: 15652 + - uid: 15835 components: - type: Transform pos: 13.5,10.5 - parent: 15651 - - uid: 15835 + parent: 15652 + - uid: 15836 components: - type: Transform pos: 14.5,12.5 - parent: 15651 - - uid: 15836 + parent: 15652 + - uid: 15837 components: - type: Transform pos: 14.5,11.5 - parent: 15651 - - uid: 15837 + parent: 15652 + - uid: 15838 components: - type: Transform pos: 14.5,9.5 - parent: 15651 - - uid: 15838 + parent: 15652 + - uid: 15839 components: - type: Transform pos: 16.5,10.5 - parent: 15651 - - uid: 15839 + parent: 15652 + - uid: 15840 components: - type: Transform pos: 13.5,13.5 - parent: 15651 - - uid: 15840 + parent: 15652 + - uid: 15841 components: - type: Transform pos: 12.5,13.5 - parent: 15651 - - uid: 15841 + parent: 15652 + - uid: 15842 components: - type: Transform pos: 12.5,14.5 - parent: 15651 - - uid: 15842 + parent: 15652 + - uid: 15843 components: - type: Transform pos: 9.5,-4.5 - parent: 15651 - - uid: 15843 + parent: 15652 + - uid: 15844 components: - type: Transform pos: 10.5,-4.5 - parent: 15651 - - uid: 15844 + parent: 15652 + - uid: 15845 components: - type: Transform pos: 10.5,-3.5 - parent: 15651 - - uid: 15845 + parent: 15652 + - uid: 15846 components: - type: Transform pos: 11.5,-3.5 - parent: 15651 - - uid: 15846 + parent: 15652 + - uid: 15847 components: - type: Transform pos: 2.5,-3.5 - parent: 15651 - - uid: 15847 + parent: 15652 + - uid: 15848 components: - type: Transform pos: 2.5,-4.5 - parent: 15651 - - uid: 15848 + parent: 15652 + - uid: 15849 components: - type: Transform pos: 15.5,-1.5 - parent: 15651 - - uid: 15849 + parent: 15652 + - uid: 15850 components: - type: Transform pos: 15.5,-0.5 - parent: 15651 - - uid: 15850 + parent: 15652 + - uid: 15851 components: - type: Transform pos: 17.5,-0.5 - parent: 15651 - - uid: 15851 + parent: 15652 + - uid: 15852 components: - type: Transform pos: 16.5,0.5 - parent: 15651 - - uid: 15852 + parent: 15652 + - uid: 15853 components: - type: Transform pos: 16.5,3.5 - parent: 15651 - - uid: 15853 + parent: 15652 + - uid: 15854 components: - type: Transform pos: 16.5,5.5 - parent: 15651 - - uid: 15854 + parent: 15652 + - uid: 15855 components: - type: Transform pos: 16.5,8.5 - parent: 15651 - - uid: 15855 + parent: 15652 + - uid: 15856 components: - type: Transform pos: 17.5,7.5 - parent: 15651 - - uid: 15856 + parent: 15652 + - uid: 15857 components: - type: Transform pos: 17.5,6.5 - parent: 15651 - - uid: 15857 + parent: 15652 + - uid: 15858 components: - type: Transform pos: 17.5,4.5 - parent: 15651 - - uid: 15858 + parent: 15652 + - uid: 15859 components: - type: Transform pos: 17.5,2.5 - parent: 15651 - - uid: 15859 + parent: 15652 + - uid: 15860 components: - type: Transform pos: 18.5,3.5 - parent: 15651 - - uid: 15860 + parent: 15652 + - uid: 15861 components: - type: Transform pos: 18.5,8.5 - parent: 15651 - - uid: 15861 + parent: 15652 + - uid: 15862 components: - type: Transform pos: 17.5,9.5 - parent: 15651 - - uid: 15862 + parent: 15652 + - uid: 15863 components: - type: Transform pos: 18.5,11.5 - parent: 15651 - - uid: 15863 + parent: 15652 + - uid: 15864 components: - type: Transform pos: 19.5,11.5 - parent: 15651 - - uid: 15864 + parent: 15652 + - uid: 15865 components: - type: Transform pos: 16.5,13.5 - parent: 15651 - - uid: 15865 + parent: 15652 + - uid: 15866 components: - type: Transform pos: 15.5,13.5 - parent: 15651 - - uid: 15866 + parent: 15652 + - uid: 15867 components: - type: Transform pos: 16.5,14.5 - parent: 15651 - - uid: 15867 + parent: 15652 + - uid: 15868 components: - type: Transform pos: 16.5,12.5 - parent: 15651 - - uid: 15868 + parent: 15652 + - uid: 15869 components: - type: Transform pos: 3.5,14.5 - parent: 15651 - - uid: 15869 + parent: 15652 + - uid: 15870 components: - type: Transform pos: 2.5,13.5 - parent: 15651 - - uid: 15870 + parent: 15652 + - uid: 15871 components: - type: Transform pos: 1.5,12.5 - parent: 15651 - - uid: 15871 + parent: 15652 + - uid: 15872 components: - type: Transform pos: 16.5,-2.5 - parent: 15651 - - uid: 15872 + parent: 15652 + - uid: 15873 components: - type: Transform pos: 17.5,-2.5 - parent: 15651 - - uid: 15873 + parent: 15652 + - uid: 15874 components: - type: Transform pos: 17.5,-3.5 - parent: 15651 - - uid: 15874 + parent: 15652 + - uid: 15875 components: - type: Transform pos: 18.5,-0.5 - parent: 15651 - - uid: 15875 + parent: 15652 + - uid: 15876 components: - type: Transform pos: 17.5,0.5 - parent: 15651 - - uid: 15876 + parent: 15652 + - uid: 15877 components: - type: Transform pos: 19.5,0.5 - parent: 15651 - - uid: 15877 + parent: 15652 + - uid: 15878 components: - type: Transform pos: 17.5,1.5 - parent: 15651 - - uid: 15878 + parent: 15652 + - uid: 15879 components: - type: Transform pos: 18.5,6.5 - parent: 15651 - - uid: 15879 + parent: 15652 + - uid: 15880 components: - type: Transform pos: 19.5,8.5 - parent: 15651 - - uid: 15880 + parent: 15652 + - uid: 15881 components: - type: Transform pos: 17.5,10.5 - parent: 15651 + parent: 15652 - proto: WallRockCoal entities: - - uid: 15881 + - uid: 15882 components: - type: Transform pos: 4.5,-1.5 - parent: 15651 - - uid: 15882 + parent: 15652 + - uid: 15883 components: - type: Transform pos: 7.5,-1.5 - parent: 15651 - - uid: 15883 + parent: 15652 + - uid: 15884 components: - type: Transform pos: 2.5,3.5 - parent: 15651 - - uid: 15884 + parent: 15652 + - uid: 15885 components: - type: Transform pos: 3.5,7.5 - parent: 15651 - - uid: 15885 + parent: 15652 + - uid: 15886 components: - type: Transform pos: 7.5,12.5 - parent: 15651 - - uid: 15886 + parent: 15652 + - uid: 15887 components: - type: Transform pos: 11.5,10.5 - parent: 15651 - - uid: 15887 + parent: 15652 + - uid: 15888 components: - type: Transform pos: 15.5,10.5 - parent: 15651 - - uid: 15888 + parent: 15652 + - uid: 15889 components: - type: Transform pos: 16.5,7.5 - parent: 15651 + parent: 15652 - proto: WallRockGold entities: - - uid: 15889 + - uid: 15890 components: - type: Transform pos: 5.5,-2.5 - parent: 15651 - - uid: 15890 + parent: 15652 + - uid: 15891 components: - type: Transform pos: 6.5,-0.5 - parent: 15651 - - uid: 15891 + parent: 15652 + - uid: 15892 components: - type: Transform pos: 13.5,-1.5 - parent: 15651 - - uid: 15892 + parent: 15652 + - uid: 15893 components: - type: Transform pos: 1.5,1.5 - parent: 15651 - - uid: 15893 + parent: 15652 + - uid: 15894 components: - type: Transform pos: 1.5,5.5 - parent: 15651 - - uid: 15894 + parent: 15652 + - uid: 15895 components: - type: Transform pos: 2.5,9.5 - parent: 15651 - - uid: 15895 + parent: 15652 + - uid: 15896 components: - type: Transform pos: 2.5,12.5 - parent: 15651 - - uid: 15896 + parent: 15652 + - uid: 15897 components: - type: Transform pos: 6.5,11.5 - parent: 15651 - - uid: 15897 + parent: 15652 + - uid: 15898 components: - type: Transform pos: 13.5,9.5 - parent: 15651 - - uid: 15898 + parent: 15652 + - uid: 15899 components: - type: Transform pos: 15.5,12.5 - parent: 15651 - - uid: 15899 + parent: 15652 + - uid: 15900 components: - type: Transform pos: 9.5,-3.5 - parent: 15651 - - uid: 15900 + parent: 15652 + - uid: 15901 components: - type: Transform pos: 16.5,4.5 - parent: 15651 - - uid: 15901 + parent: 15652 + - uid: 15902 components: - type: Transform pos: 19.5,4.5 - parent: 15651 + parent: 15652 - proto: WallRockPlasma entities: - - uid: 15902 + - uid: 15903 components: - type: Transform pos: 1.5,3.5 - parent: 15651 - - uid: 15903 + parent: 15652 + - uid: 15904 components: - type: Transform pos: 4.5,5.5 - parent: 15651 - - uid: 15904 + parent: 15652 + - uid: 15905 components: - type: Transform pos: 4.5,9.5 - parent: 15651 - - uid: 15905 + parent: 15652 + - uid: 15906 components: - type: Transform pos: 3.5,10.5 - parent: 15651 - - uid: 15906 + parent: 15652 + - uid: 15907 components: - type: Transform pos: 4.5,11.5 - parent: 15651 - - uid: 15907 + parent: 15652 + - uid: 15908 components: - type: Transform pos: 10.5,11.5 - parent: 15651 - - uid: 15908 + parent: 15652 + - uid: 15909 components: - type: Transform pos: 13.5,12.5 - parent: 15651 - - uid: 15909 + parent: 15652 + - uid: 15910 components: - type: Transform pos: 14.5,10.5 - parent: 15651 - - uid: 15910 + parent: 15652 + - uid: 15911 components: - type: Transform pos: 17.5,8.5 - parent: 15651 - - uid: 15911 + parent: 15652 + - uid: 15912 components: - type: Transform pos: 18.5,10.5 - parent: 15651 + parent: 15652 - proto: WallRockQuartz entities: - - uid: 15912 + - uid: 15913 components: - type: Transform pos: 11.5,-2.5 - parent: 15651 - - uid: 15913 + parent: 15652 + - uid: 15914 components: - type: Transform pos: 3.5,-1.5 - parent: 15651 - - uid: 15914 + parent: 15652 + - uid: 15915 components: - type: Transform pos: 2.5,4.5 - parent: 15651 - - uid: 15915 + parent: 15652 + - uid: 15916 components: - type: Transform pos: 1.5,2.5 - parent: 15651 - - uid: 15916 + parent: 15652 + - uid: 15917 components: - type: Transform pos: 4.5,6.5 - parent: 15651 - - uid: 15917 + parent: 15652 + - uid: 15918 components: - type: Transform pos: 4.5,10.5 - parent: 15651 - - uid: 15918 + parent: 15652 + - uid: 15919 components: - type: Transform pos: 2.5,7.5 - parent: 15651 - - uid: 15919 + parent: 15652 + - uid: 15920 components: - type: Transform pos: 3.5,12.5 - parent: 15651 - - uid: 15920 + parent: 15652 + - uid: 15921 components: - type: Transform pos: 8.5,11.5 - parent: 15651 - - uid: 15921 + parent: 15652 + - uid: 15922 components: - type: Transform pos: 11.5,9.5 - parent: 15651 - - uid: 15922 + parent: 15652 + - uid: 15923 components: - type: Transform pos: 15.5,9.5 - parent: 15651 - - uid: 15923 + parent: 15652 + - uid: 15924 components: - type: Transform pos: 14.5,-0.5 - parent: 15651 - - uid: 15924 + parent: 15652 + - uid: 15925 components: - type: Transform pos: 16.5,1.5 - parent: 15651 - - uid: 15925 + parent: 15652 + - uid: 15926 components: - type: Transform pos: 18.5,4.5 - parent: 15651 - - uid: 15926 + parent: 15652 + - uid: 15927 components: - type: Transform pos: 18.5,0.5 - parent: 15651 + parent: 15652 - proto: WallRockSalt entities: - - uid: 15927 + - uid: 15928 components: - type: Transform pos: 10.5,-1.5 - parent: 15651 - - uid: 15928 + parent: 15652 + - uid: 15929 components: - type: Transform pos: 11.5,-1.5 - parent: 15651 - - uid: 15929 + parent: 15652 + - uid: 15930 components: - type: Transform pos: 3.5,1.5 - parent: 15651 - - uid: 15930 + parent: 15652 + - uid: 15931 components: - type: Transform pos: 4.5,7.5 - parent: 15651 - - uid: 15931 + parent: 15652 + - uid: 15932 components: - type: Transform pos: 3.5,11.5 - parent: 15651 - - uid: 15932 + parent: 15652 + - uid: 15933 components: - type: Transform pos: 6.5,12.5 - parent: 15651 - - uid: 15933 + parent: 15652 + - uid: 15934 components: - type: Transform pos: 12.5,10.5 - parent: 15651 - - uid: 15934 + parent: 15652 + - uid: 15935 components: - type: Transform pos: 16.5,-0.5 - parent: 15651 - - uid: 15935 + parent: 15652 + - uid: 15936 components: - type: Transform pos: 16.5,2.5 - parent: 15651 - - uid: 15936 + parent: 15652 + - uid: 15937 components: - type: Transform pos: 16.5,9.5 - parent: 15651 + parent: 15652 - proto: WallRockSilver entities: - - uid: 15937 + - uid: 15938 components: - type: Transform pos: 2.5,-2.5 - parent: 15651 - - uid: 15938 + parent: 15652 + - uid: 15939 components: - type: Transform pos: 2.5,0.5 - parent: 15651 - - uid: 15939 + parent: 15652 + - uid: 15940 components: - type: Transform pos: 6.5,5.5 - parent: 15651 - - uid: 15940 + parent: 15652 + - uid: 15941 components: - type: Transform pos: 3.5,8.5 - parent: 15651 - - uid: 15941 + parent: 15652 + - uid: 15942 components: - type: Transform pos: 1.5,8.5 - parent: 15651 - - uid: 15942 + parent: 15652 + - uid: 15943 components: - type: Transform pos: 9.5,12.5 - parent: 15651 - - uid: 15943 + parent: 15652 + - uid: 15944 components: - type: Transform pos: 11.5,12.5 - parent: 15651 - - uid: 15944 + parent: 15652 + - uid: 15945 components: - type: Transform pos: 15.5,11.5 - parent: 15651 - - uid: 15945 + parent: 15652 + - uid: 15946 components: - type: Transform pos: 17.5,-1.5 - parent: 15651 - - uid: 15946 + parent: 15652 + - uid: 15947 components: - type: Transform pos: 16.5,6.5 - parent: 15651 - - uid: 15947 + parent: 15652 + - uid: 15948 components: - type: Transform pos: 17.5,3.5 - parent: 15651 - - uid: 15948 + parent: 15652 + - uid: 15949 components: - type: Transform pos: 7.5,-2.5 - parent: 15651 + parent: 15652 - proto: WallRockTin entities: - - uid: 15949 + - uid: 15950 components: - type: Transform pos: 8.5,-0.5 - parent: 15651 - - uid: 15950 + parent: 15652 + - uid: 15951 components: - type: Transform pos: 9.5,-2.5 - parent: 15651 - - uid: 15951 + parent: 15652 + - uid: 15952 components: - type: Transform pos: 3.5,2.5 - parent: 15651 - - uid: 15952 + parent: 15652 + - uid: 15953 components: - type: Transform pos: 2.5,-0.5 - parent: 15651 - - uid: 15953 + parent: 15652 + - uid: 15954 components: - type: Transform pos: 5.5,9.5 - parent: 15651 - - uid: 15954 + parent: 15652 + - uid: 15955 components: - type: Transform pos: 2.5,8.5 - parent: 15651 - - uid: 15955 + parent: 15652 + - uid: 15956 components: - type: Transform pos: 2.5,11.5 - parent: 15651 - - uid: 15956 + parent: 15652 + - uid: 15957 components: - type: Transform pos: 8.5,13.5 - parent: 15651 - - uid: 15957 + parent: 15652 + - uid: 15958 components: - type: Transform pos: 13.5,11.5 - parent: 15651 - - uid: 15958 + parent: 15652 + - uid: 15959 components: - type: Transform pos: 18.5,9.5 - parent: 15651 + parent: 15652 - proto: WallRockUranium entities: - - uid: 15959 + - uid: 15960 components: - type: Transform pos: 4.5,-0.5 - parent: 15651 - - uid: 15960 + parent: 15652 + - uid: 15961 components: - type: Transform pos: 9.5,-1.5 - parent: 15651 - - uid: 15961 + parent: 15652 + - uid: 15962 components: - type: Transform pos: 3.5,4.5 - parent: 15651 - - uid: 15962 + parent: 15652 + - uid: 15963 components: - type: Transform pos: 5.5,10.5 - parent: 15651 - - uid: 15963 + parent: 15652 + - uid: 15964 components: - type: Transform pos: 11.5,11.5 - parent: 15651 - - uid: 15964 + parent: 15652 + - uid: 15965 components: - type: Transform pos: 14.5,-1.5 - parent: 15651 - - uid: 15965 + parent: 15652 + - uid: 15966 components: - type: Transform pos: 16.5,-1.5 - parent: 15651 - - uid: 15966 + parent: 15652 + - uid: 15967 components: - type: Transform pos: 17.5,5.5 - parent: 15651 + parent: 15652 - proto: WallSolid entities: - uid: 14610 @@ -108091,12 +108098,12 @@ entities: rot: -1.5707963267948966 rad pos: 89.5,12.5 parent: 2 - - uid: 15967 + - uid: 15968 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,9.5 - parent: 15651 + parent: 15652 - proto: WeaponTurretSyndicateBroken entities: - uid: 15380 @@ -108105,16 +108112,16 @@ entities: rot: 3.141592653589793 rad pos: 28.5,-6.5 parent: 2 - - uid: 16256 + - uid: 16257 components: - type: Transform pos: -15.5,3.5 - parent: 15968 - - uid: 16257 + parent: 15969 + - uid: 16258 components: - type: Transform pos: -7.5,-0.5 - parent: 15968 + parent: 15969 - proto: WeaponTurretSyndicateDisposable entities: - uid: 15381 @@ -109593,138 +109600,138 @@ entities: - type: Transform pos: 19.5,47.5 parent: 2 - - uid: 16258 + - uid: 16259 components: - type: Transform rot: 3.141592653589793 rad pos: -12.5,-2.5 - parent: 15968 - - uid: 16259 + parent: 15969 + - uid: 16260 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,-2.5 - parent: 15968 - - uid: 16260 + parent: 15969 + - uid: 16261 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,-2.5 - parent: 15968 - - uid: 16261 + parent: 15969 + - uid: 16262 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,-2.5 - parent: 15968 - - uid: 16262 + parent: 15969 + - uid: 16263 components: - type: Transform pos: -11.5,-2.5 - parent: 15968 - - uid: 16263 + parent: 15969 + - uid: 16264 components: - type: Transform pos: -13.5,-2.5 - parent: 15968 - - uid: 16264 + parent: 15969 + - uid: 16265 components: - type: Transform pos: -12.5,-2.5 - parent: 15968 - - uid: 16265 + parent: 15969 + - uid: 16266 components: - type: Transform pos: -10.5,-2.5 - parent: 15968 - - uid: 16337 + parent: 15969 + - uid: 16338 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-4.5 - parent: 16266 - - uid: 16338 + parent: 16267 + - uid: 16339 components: - type: Transform pos: 5.5,0.5 - parent: 16266 - - uid: 16339 + parent: 16267 + - uid: 16340 components: - type: Transform pos: 4.5,0.5 - parent: 16266 - - uid: 16340 + parent: 16267 + - uid: 16341 components: - type: Transform pos: 6.5,0.5 - parent: 16266 - - uid: 16341 + parent: 16267 + - uid: 16342 components: - type: Transform pos: 7.5,0.5 - parent: 16266 - - uid: 16342 + parent: 16267 + - uid: 16343 components: - type: Transform pos: 6.5,-4.5 - parent: 16266 - - uid: 16343 + parent: 16267 + - uid: 16344 components: - type: Transform pos: 4.5,-4.5 - parent: 16266 - - uid: 16344 + parent: 16267 + - uid: 16345 components: - type: Transform pos: 7.5,-4.5 - parent: 16266 - - uid: 16345 + parent: 16267 + - uid: 16346 components: - type: Transform pos: 5.5,-4.5 - parent: 16266 - - uid: 16346 + parent: 16267 + - uid: 16347 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-4.5 - parent: 16266 - - uid: 16347 + parent: 16267 + - uid: 16348 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-4.5 - parent: 16266 - - uid: 16348 + parent: 16267 + - uid: 16349 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,0.5 - parent: 16266 - - uid: 16349 + parent: 16267 + - uid: 16350 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-4.5 - parent: 16266 - - uid: 16350 + parent: 16267 + - uid: 16351 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,0.5 - parent: 16266 - - uid: 16351 + parent: 16267 + - uid: 16352 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,0.5 - parent: 16266 - - uid: 16352 + parent: 16267 + - uid: 16353 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,0.5 - parent: 16266 + parent: 16267 - proto: WoodblockInstrument entities: - uid: 15638 From f5f56c1c41953892e32041f662d13491c04c6c93 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:31:44 +0300 Subject: [PATCH 10/15] Fix upstream --- .../Corvax/Entities/Clothing/Hands/gloves.yml | 4 --- .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 ------- .../Consumable/Food/Baked/vulpkanin.yml | 5 +-- .../Entities/Objects/Consumable/Food/soup.yml | 3 +- .../Prototypes/Corvax/StatusEffects/job.yml | 6 ++-- .../equipped-INNERCLOTHING-monkey.png | Bin 946 -> 2248 bytes .../equipped-INNERCLOTHING.png | Bin 1084 -> 1095 bytes .../Jumpskirt/psychologist.rsi/icon.png | Bin 424 -> 426 bytes .../psychologist.rsi/inhand-left.png | Bin 518 -> 516 bytes .../psychologist.rsi/inhand-right.png | Bin 553 -> 545 bytes .../Jumpskirt/psychologist.rsi/meta.json | 2 +- .../equipped-INNERCLOTHING-monkey.png | Bin 2248 -> 0 bytes .../equipped-INNERCLOTHING.png | Bin 1095 -> 0 bytes .../Jumpskirt/psychologist.rsi/icon.png | Bin 426 -> 0 bytes .../psychologist.rsi/inhand-left.png | Bin 516 -> 0 bytes .../psychologist.rsi/inhand-right.png | Bin 545 -> 0 bytes .../Jumpskirt/psychologist.rsi/meta.json | 30 ------------------ 17 files changed, 10 insertions(+), 51 deletions(-) delete mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png delete mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png delete mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png delete mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png delete mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml index 5cbe1e7a4cc..4c2a72dedca 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml @@ -8,8 +8,6 @@ sprite: Corvax/Clothing/Hands/Gloves/kim.rsi - type: Clothing sprite: Corvax/Clothing/Hands/Gloves/kim.rsi - - type: GloveHeatResistance - heatResistance: 1400 - type: Insulated - type: entity @@ -22,6 +20,4 @@ sprite: Corvax/Clothing/Hands/Gloves/centcom_naval.rsi - type: Clothing sprite: Corvax/Clothing/Hands/Gloves/centcom_naval.rsi - - type: GloveHeatResistance - heatResistance: 1400 - type: Insulated diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml index bd15a6385a9..106c41e875a 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml @@ -43,17 +43,6 @@ - type: Clothing sprite: Corvax/Clothing/Uniforms/Jumpskirt/rainbow.rsi -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtPsychologist - name: psychologist suitskirt - description: I don't lose things. I place things in locations which later elude me. - components: - - type: Sprite - sprite: Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi - - type: Clothing - sprite: Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi - - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtSchool diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/Baked/vulpkanin.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/Baked/vulpkanin.yml index 7841c70d253..3f133d67aa6 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/Baked/vulpkanin.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/Baked/vulpkanin.yml @@ -10,7 +10,8 @@ - parents - hope - type: Food - trash: FoodPlate + trash: + - FoodPlate - type: Sprite sprite: Corvax/Objects/Consumable/Food/plate.rsi layers: @@ -29,4 +30,4 @@ Quantity: 5 - type: Tag tags: - - Meat \ No newline at end of file + - Meat diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml index 2cdf487df2c..34abe1da4ef 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml @@ -8,7 +8,8 @@ flavors: - meaty - type: Food - trash: FoodBowlBig + trash: + - FoodBowlBig utensil: - Spoon - Fork diff --git a/Resources/Prototypes/Corvax/StatusEffects/job.yml b/Resources/Prototypes/Corvax/StatusEffects/job.yml index cbf3caaa9b8..02419835e8a 100644 --- a/Resources/Prototypes/Corvax/StatusEffects/job.yml +++ b/Resources/Prototypes/Corvax/StatusEffects/job.yml @@ -1,13 +1,15 @@ -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconIAA icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: IAA + jobName: job-name-iaa -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconPilot icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Pilot + jobName: job-name-pilot diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png index e3a9016b83ea4b2a7d9ae2b863affc44e8c07350..4812a7eec28933a973948cec80e3fabf801e6ba7 100644 GIT binary patch literal 2248 zcmbtW2~ZPP7~Y^pK?Tp6Vk=8fi$ap!B!Jl=Ksbb;L5x_?YGkv!ft6%8BnwGUgz+4& zYCVd@18ZxmO!35ORTO6wt%&zf@ub@7&}vbuQ1PH|Ia2LdJGGhF?Ay2B`~Ls`{$qAw za#DP6FJCVRf_iHcV)fu2#a}&y;J=j4z7B4l)`UrR2=YG4UxL*^-h&~i+fX_sjZ4#w z#R%3S#YxskNu3reKtoV?q|=HMSri8wsSKJ?iyIFd7Q-~D7N>^j5S=xK%A^zWY}ACj zq!c1Ai%^l`$Ot&xi2(u&#o@5iVrJ}^Q!Q@e#lV{1mWkmu2$!W6Yj}fjnl2fRVQmzw zk|GiUK~OkMB_$9!qBP2bVL2jK$Pl>@PS|KGN3#sfGvY=zhf|Az ztL-sZtZrJy-k}pvOy% zAE@20Uoil*)#=Bm}H2QaL&*1V*SZRG}hAz;IwH&5*3aKH?=VDi-G` zwHO>yf>cW6XbKvJDG^Me3_=tbg0w?*EJ>SOuZ1cxCHe{!loN?__`iZl0yD8T3l6lP zEqDecvoaZC*sU-Y!MhcW8 zg(z`}N}&po$W5VgJTz2+8d1FSd@M`k@Ja7HPyWaA<7_nOI^6u$JbW+m)q*9^c92I` zN3%?zvO8908g45P3@7-)SBnWg;}j|G*rwlFfp%I)CIv{}knVPvoi%X|+(v0KfLi~j z(qtem8Q;C_A}< ztC@Z!YQX%0c_Y_Ut&Khry?9f;4C$qw-4GrB{kvXuKYM&PCwkGclA~o3imA(SO?b+7gkyd*NULM z0_Jo?VORva|L|c)K~Mj0^dlP%-MRGa>_x0k^gfku*khJuE1K>MjG7Q$Ezj_X@~HIk zKfA_H($#$?0e=Nha3=h-?bs&j2$Y}pY-yFH=8Sbwjb%Wv}V_--X~&K zMtpFjc}V)^RY=u7&k@5GZOVNAAS%=+25uJSS0*Q_o|l$R&hUfEYqyl1Z0K^ocHGP% z^UG^%MRW4%z6kXC$@Ot*=~Y{Bbw4PoXbx)HF>yInw_#S%wpknQ7+MTLm7+PfA1bP% zvX%x{Z`{L_EorIG&;7N=|M_oChguARz|HAPvK%)0p#Q3lO`=nEBj$hq~JzG~6RQc_LX02-Djp`UHlv4WD zdFRxXeg}uX2=htl#^g2J@;|8jkXVvk({DlXz^X5=tkM`-`jmSFx@P+h+~2$B*Y(SD zOIC|!dM1n*KXG8;jeHMi%dCP$)s=frDrfZHGAUp{0d&(E{IzHan-JvKHr z01y#+y`EfOU(@Myl*Ux`XZN;k=bj`<@^)4KA1d-zs|7%>*Avh4FikUi&g$xF)>Y~V zLeUQpMNz)!VtXzAAP5M8KvI!g57RU!+JYdEAP64Be|~=c)BZ;#`^k%~t^CR7@tDu! z@x(pAO}~2!!hg*;xBPdJ`OA)9HUI!z42Qhl-6f7=9?#7I@OW;HIF5O}yUWFJs4|=~ znSUBp{iOqNF&q*_5v^9sh@vQ${iq%Ccds%*5agflqNljnEGRFwwkG^#D3vUV6Iotf z7J$XYMOIc;I6gk+?CcDHe!riO7ex^OolZw-Lf?CB+kYlWk_rD0F#7#I01FEXr5vTR zrN~#WWm#g|Hjd*k8jbR6k|eA>T{HIjdu4~LL|MOKlv|oo4)_&O3V>xju|##rOS(nUC-L634NmBI3HP zbh}*v2*XgqFs$7lh9O}X3P88p71wno6_GfOD}Mz+>0rclU6RoV+i?KcKRBS-Y+{<` zgYO2@G^N>WvVU*@fbBRWqY8NSpN4JQwH}ez;a1K8@a#1$8ia%c@lH5H5i0000{Wo_Xe-z01z~iwuV~fDDHKk zZf;iB6B82-mv3)xyEwnRywJ?dj6<3L{$g#U{D}p2mK0Z#@*VlaO z>M$Y5Uj!olLX8ZwlqxmDPkOegLL3FGI>-)Bq+2+0oIFB6xdy zQ*|RFBmQ+Nm4BkOwKc*lmD2>Cd5*B~fP>&R`AA8`pC|%&@O;f8PESv1U|^tt9PJW@ zstD+}qoX6%fNVBPxm-@fA8P=+&w~%6tE=lvv65Lx%8$YA@9$G4lPNF)=JVjC{6!-G z9Ruhn{1(2sx%o6B+>W37E~5CuoVX9SOUfT>z~$woa({AVWhJuys|YCeTv9~!)6>%v z*%sv-0TTXL1Gcud9Pjv4&hG(^fWS{+>~m7Y@kd>k!Y}$G{ z?CdPv-Q6koA0Hn{C%_GWpJzMjUILK;>2#Xv>gv=#J{(t9SAHGJQLozs=5K0h^2>0K z@{f-Xaese_4e$o%f~3B_KC+(6(atlW?EeIH@rxqhEAn7{DYH;b{zL|_`|t1Xu_92P zUkYW70-gMc3_xe-G*}iC0%CyOFZUAA$)9)$aHlLJD%5nWeck-x4_VZreZ7iX#fm->LN=S_Z-Z*^o12?{-Jh{BrBM=@A_EX+OG``Y`t0n?Pmp+heWm{Xezjd* z34dTq-f2w7Xh7}opf+;KrJmTintnp;Q%y13v@u6 z6k-Fg2L}Uya3aFV$qDHOI5;VTH3ahqq!1f`u!n%>=Vx_~rNB{u_kj04Ae{gQ1Ka?# zAaMdq5X)48l70q}p#ieJy*(No9aUxjE`Kg676EB*kiUC-)rJT(1T{%f(%#_x{k=bM z0Ba9|Dis0X;`Potped*^DMSXWudl1Ux5LB3g7UVuHa}lLH;#{w3vv>^i;|W=*k$a` zKRi6p`T05N#>U15@iuudM*zT*(6T!WR69RFmxh|k5742ZCh`MxYN(0)0G%3YCM!Qc smxh|l4=A?=`$dQhhc$o2)qc8B!2;OQb$4nuFf3k000B_NklpP^XN523E~S#Boc{4B9TabPhRmfwtp;(mP#c6!13{MdhW%= z1qFcFY=+a*Q?5RF^;x-6sigH`7^Y=j{lbkc%c8AT3jk27)p7DS-B&9%wy^Xe}RK(E(Bv)M$i*DL1sndcShXMbmBXJOlH{krs@ke!ecN~!00 zxyfhUv;QJ}&+~GV9osz5TS=e$dAYT-B}l>-9QxT^AMvQTkjXK>7acU-kHN5uslw04(}Z6d?$Lg>8Z$ zKomtnMuABE!V?DTRM&L?`DjN`1OOP1#{huG$H%o#hNASjjV_C>hztMK^d%CBL?V$$ zBoc{4B9Z*27=}R!Aws_Z^I{mrN`AP%pcsZh!+#)v^5zWypjxoldFfbphbp#ZRYGYMLe`gyg(@ zIyw?NG7ZB>#k$=tC4|s!w@ZEBr-YCf3jiU6`o5p@zCKw13;}oF}2MnKxV4>2&CDI85^eM0;R43B%!# zb~>G$9(yA3^v87z#BmJUwsWg92L}hJ)oN+JfM~9-uW@#EmgXd6z1X&mlamv!{p-Od`8xHZ!03?w=3% zW4i%vfE(Zj_+J2Nni5UZ=sXO=2lMB7PH-H@5#l(0fPirWV1IGX^XS~RZ5#-T1wjB! z)39G60wJWpR(LO36a^ihVZ~;950 uU`ZLsE2%{a3j>@f@>YO%+YN97d;)4zn;+W2G`;`;00{s|MNUMnLSTYVdb3^t delta 398 zcmV;90dfAS1E>R#B!2;OQb$4nuFf3k0004ENklc}r*L6>8x~_vUhV4S|2jfVUQUD&OHO2q{ s`un*s3_~z4`{?{@I!@z=hzN%-o8_+yEp-@L00000Ne4wvM6N<$f@zhu+5i9m diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png index 8dba518157f7a5f56ba50bebc7d98db014204f68..3d5d498bbac527bee5953419c3c8631accd71235 100644 GIT binary patch delta 477 zcmV<30V4i}1cU^TF@L^EL_t(|obA~$Zo)ti1<=1yBpM`KVNr#aTW|(0K@aCxQc-XT z&cG4qph1SxR9jF$!=wTclGxttV6w`8(n<(hpJl*<#Q;P^L_|bHL_|dYiqQzM)=IP4 z1ON<&!)xYjHWL6i91a+d$CY18JMW>awUT9-WLYN1<560z)_--KMXtxJwIU*gSt8<< zSJPW8b{3KQb=mCw5)l*?K}5XsLcN9tyiX!1?=aqR0 zPKaD^0XCbB*LlVi_b%VOP{9S5PN$W+@w3h=6WjxC?Y3J0z;d~~KE74<=^JA{HObJt zDuNS41ifBQ@_#%>nx<&C+vxZESS%LU@AtSozgn$Kl?`j>l~E}`k|d?SN6xv*1<=eZ zqjm|TX^PY71ORZ(AxRPdK%>z>p6A|QSM9u?1UJF^jX3Af>2%(wW$7S5fK<;;+h_7igJ3a$#;5OC00{)GE@hj>2VdD4nKPXzO<*u z(G@^@dK^^`@SPr4%2e1_t+c1dQ5HaRdK}dya7$}?99(6{8Vit(9J{ z2LPB%CS~SwxfB36olcm|X06Yqo%g4#wUT9-WLYNX^I76JE`PVHNV(5iDxB_d9F z9eu@mR}p#KZi{`~LKh_*KU>@$LatU;8}(V6)kjudAAVePhgBll0AN z!#hDlFdPmg&wq2IX^MWokI`s^^?HrN;egxc+wIo0S+I6q6O{raNz(W{DvF|Y0W|ZP zsNDi-n&NV~004@jK$0W?fGCQP=ehIcs-5?YcN45GB#NTDeUI;7k=J-Wt)MuLpI)}d zsDD;O1jd-KrpKCsoE~d(omd{X$yA*Tb-`tN+y#F z?dfrF1<;-z2h{^yr^l@_71q@$?dfrl1<;%x2XzZnX-$uVYl7<2Xzvxh2&c!S;~N92 V+T!Tq4A}qx002ovPDHLkV1nwr>Q(>% diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png index 25fa4bcb44c50955ca2fa472ade0177bbb9f825e..73e19be65811843df22625fd5c4695c8d13c61e9 100644 GIT binary patch delta 506 zcmVB~CN?HgNvzh^TX+U9VXx;Hx3cgO zp1~v7X=A_=t0^qB@ofchft4A7#o7J8gv5+9(7q6&MDJ9)* z7XUDwPSZZC)k*;1d_H47pBIj8L#^>Dr6deP3Byn>my7gzy?^w$iKO2trKE|;*btHW zI7Scz==b{=kH^?-HaMM5NZNP1o!52(>WH^60lx2- zu54QCmq|dCcz?VFf*`>4dQAqy_k93Br_(_k$E{!fS*p@vTD(L=L_|bHL`1*p;m(POq+3p|RdbAMAtKFGU|o?Uz@>_@t%sGN zgliRJ8xMDdUv2Nd2}axEwiQ^HZUdtPxK=T?QMv}$R$yJ4JW%o;kZ`SHY{NJKE>(OFYegw!m>lCx&QzG07*qoM6N<$f?Lq?dH?_b delta 514 zcmV+d0{#7=1gQj&F@NJpL_t(|obB2%j)FiG2H<}-o6wjHm6U7iEj)vlu-9{pTUmGs z&)^a4tPF06l_nP2__i9NfWjySX7~RR5*=p9n+FVrCqP6*L_|bHL`46KDrz*wNT<^Q z0E|YXw9kA#7XUaOkC;p*g=3pgYrMu7iQ`z}IF{4tBwFiqyMKtJ`;0O2j>)(Xk^1Ak zh)8y`2g`0E&E`NvoZ>Ay#%H$SdpZRG42MH}^?JDhKie%9iv<8+JRa9MpQpIQTjb-_ z0GhrEUX@G0X0xd@uxh_|do|u%0%o&WrPb2*Q>xjAfor^3xi#S0&vpv{Sgls+=W9(* zUMY2R3zo%Ocz=v+gNUHt?@N*-h@uGHZWn{W0L$ePyWI}9eZ5|*rV~&{yoCt}!?1K^ z+wb?SNx&=d-n|8)D8l)Cwu2FdApjr<0whV&_~maYrJ%KbI^NtOc-=7wf}4HW?``u; zymwEd*81*cbvPW_ar&?L7B3MI5fKp)5m93vz9|ur^m`SVZx!QOh{$^?u)eSf@Tp?# z>S1Nb@~vX*;$d~TE${x{sZx2|wF2wYZBQuzzEzA}l&%4;6Oymx{3q=RZmLRxvK)bjnzPCHixI0kZ1e3{2eGg8%>k07*qoM6N<$ Eg5y{C_y7O^ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json index 4d0c4eb7bdc..1fc5a9bb676 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse, suitskirt version made by BackeTako (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse, monkey by Ko4erga (discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png deleted file mode 100644 index 4812a7eec28933a973948cec80e3fabf801e6ba7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2248 zcmbtW2~ZPP7~Y^pK?Tp6Vk=8fi$ap!B!Jl=Ksbb;L5x_?YGkv!ft6%8BnwGUgz+4& zYCVd@18ZxmO!35ORTO6wt%&zf@ub@7&}vbuQ1PH|Ia2LdJGGhF?Ay2B`~Ls`{$qAw za#DP6FJCVRf_iHcV)fu2#a}&y;J=j4z7B4l)`UrR2=YG4UxL*^-h&~i+fX_sjZ4#w z#R%3S#YxskNu3reKtoV?q|=HMSri8wsSKJ?iyIFd7Q-~D7N>^j5S=xK%A^zWY}ACj zq!c1Ai%^l`$Ot&xi2(u&#o@5iVrJ}^Q!Q@e#lV{1mWkmu2$!W6Yj}fjnl2fRVQmzw zk|GiUK~OkMB_$9!qBP2bVL2jK$Pl>@PS|KGN3#sfGvY=zhf|Az ztL-sZtZrJy-k}pvOy% zAE@20Uoil*)#=Bm}H2QaL&*1V*SZRG}hAz;IwH&5*3aKH?=VDi-G` zwHO>yf>cW6XbKvJDG^Me3_=tbg0w?*EJ>SOuZ1cxCHe{!loN?__`iZl0yD8T3l6lP zEqDecvoaZC*sU-Y!MhcW8 zg(z`}N}&po$W5VgJTz2+8d1FSd@M`k@Ja7HPyWaA<7_nOI^6u$JbW+m)q*9^c92I` zN3%?zvO8908g45P3@7-)SBnWg;}j|G*rwlFfp%I)CIv{}knVPvoi%X|+(v0KfLi~j z(qtem8Q;C_A}< ztC@Z!YQX%0c_Y_Ut&Khry?9f;4C$qw-4GrB{kvXuKYM&PCwkGclA~o3imA(SO?b+7gkyd*NULM z0_Jo?VORva|L|c)K~Mj0^dlP%-MRGa>_x0k^gfku*khJuE1K>MjG7Q$Ezj_X@~HIk zKfA_H($#$?0e=Nha3=h-?bs&j2$Y}pY-yFH=8Sbwjb%Wv}V_--X~&K zMtpFjc}V)^RY=u7&k@5GZOVNAAS%=+25uJSS0*Q_o|l$R&hUfEYqyl1Z0K^ocHGP% z^UG^%MRW4%z6kXC$@Ot*=~Y{Bbw4PoXbx)HF>yInw_#S%wpknQ7+MTLm7+PfA1bP% zvX%x{Z`{L_EorIG&;7N=|M_oChguARz|HAPvK%)0p#Q3lO`=nEBj$hq~JzG~6RQc_LX02-Djp`UHlv4WD zdFRxXeg}uX2=htl#^g2J@;|8jkXVvk({DlXz^X5=tkM`-`jmSFx@P+h+~2$B*Y(SD zOIC|!dM1n*KXG8;jeHMi%dCP$)s=frDrfZHGAUp{{xbKQkd=L4(X&p|({VFSajUtbDB@$IN?YjNcLYY=+(EoB0>7Uj5p8DlK8OaHhkGsrT((D);^Z|BaRCdzmE=Kt1P^yBcH9sJw9PswK=c=~i{ zQBi8D>ZX6IIW)e-1i5^@eEG8QO|hpkj6(k+n73`)CiDJB$hr57eGLcv6W$aD9r@@U zJN=OUFXbn#;<|cztELB5S6lP)@m+fJM(6I`yPDtS<>fuq5AZh3Pq%&*$25`gWy!2p zuU=iTx04AE53iFw6}bL3%d`BftWT#4`akve^B2~4@_t}@-n3-jKD$lxPG3A{yztF` zmeP;iN)NO@CDdwe4)6tr>W1I%-@o6e6fi%YE47zt?w?K`hx8XF5n>`tNey@PzYASB zIlqFlV7ZQp)|HYqwRitK;#aa_kL0cU?b?AB$;gquU`qS5XV2~|U#|Z3@7y{DHFfp7 z*RF*{#l>Cw@5s`8{_ee?RSO*jlj{=_6Aymm6Hi~oFoQe&jVHqemfRp=7q)~03cq&m zem&jS*H_cg+1dGtY@XWWi&;))v!CWSXMLDGdv@L3`5O(F1`5qoVirjA_V#}D>&=@p z{u3%{YnT4}SGP4bjx)jgUZG4@PELq018;3@ZC28==g(bhJEtF5E6zA~?%a}s0ta1P z-L4%{4G$Si9JosyW{V^-Z(wI$I33b7sg7;pLdH#d_u5Ly%7&)?*VEGyW6aE-u)n(c zY8!_Mi>YVerF#$l{@rU|z>v+~q$SGu;L+D}Rtq#&7;3t(ty#Z*_1^7=4T6&&F{+17LB_^XS~RZ5#-T1wjB!)39G60wJWpR(LO36a^ihVPx$zDYzuRCt{2*)eXyKoAAczfmL_BwS%pg_c`z1};Gl=U7rva0$-95$K>nhSF49 zP(Z_^0uhqf-t1tq%74;I2wR_Jz=OpAL_|bHL_|bHME{D>2(i{mv)Kdy42Q#O=4>_- z05}{D7>~!5UrRghp{%u%Wtn7ICdcDZTCLV~okgz4thFK{g;^rvl~>bSEOr)=`*qpu z{Spxr6+uM2^FqCb2E0!u0D!?@fVXb<%kkZIi}`#G02qx%wda+22~LPyZ~-=(jn{d` z6!$LQyimafm`P0Kjs&ygt5F_URjAJ~heEyefhdLl~E}`k|d?SN6xv*1<=eZqjm|TX^PY71ORZ( zAxRPdK%>z>p6A|QSM9u?1UJF^jX3Af>2%( zwW$7S5fK<;;+h_7igJ3a$#;5OB~x`WR0p5waTS~nKYIhdw5P|>6+nA>990kSogP=p zRM=Oow5P{W7C>`)9MvUoOKW-@T@%!v9!FPz?{IodzxM%wcIU!5a*x>n0000Px$+et)0RCt{2+A)rTKokbxpUoyVCQ?bP*4A5i1}|Z+=NPxL@DiTEBiLzUz!Iw| zEVS`$1#y9u8G*&w{lA37j5FlT69zI*fQX2Qh=_=Yi2fI^s8J~;-EJ2EFr7}*KC9JA z0N{K+V?Li3j%`D&@hYVx3_}USP%f8?^m@JYxQV3SDW#-|$=DE)`s2NcNcKohmOVt; z&4Gwm#anca_iV%GVgUe{OeXjk4s!#JQH1q+4FH(UW_8ZzDK_yId8-;g+gCwVxda>z z2cvI7Scz==b{=kH^?-HaMM5NZNP1o!52(>WH^60lx2-u54QCmq|dCcz?VF zf*`>4dQAqy_k93Br_(_k$E{!fS*p@v zTD(L=L_|bHL`1*p;m(POq+3p|Rg7yPBF$7_U6CZfrHZkwhn1m(YZYS~4|j!MZSTJc zM%&`H6 Date: Mon, 12 Aug 2024 17:44:55 +0300 Subject: [PATCH 11/15] Update locale --- .../ss14-ru/prototypes/actions/types.ftl | 2 - .../catalog/fills/backpacks/duffelbag.ftl | 4 +- .../catalog/fills/lockers/heads.ftl | 26 ++++---- .../entities/clothing/uniforms/jumpskirts.ftl | 2 - .../entities/clothing/ears/headsets.ftl | 2 +- .../entities/clothing/ears/headsets_alt.ftl | 2 +- .../entities/clothing/head/eva-helmets.ftl | 2 +- .../entities/clothing/head/hats.ftl | 4 +- .../entities/clothing/head/hoods.ftl | 4 +- .../entities/clothing/masks/masks.ftl | 2 +- .../entities/clothing/masks/specific.ftl | 2 + .../entities/clothing/neck/scarfs.ftl | 4 +- .../clothing/outerclothing/softsuits.ftl | 4 +- .../entities/clothing/uniforms/jumpskirts.ftl | 2 + .../entities/clothing/uniforms/jumpsuits.ftl | 22 +++---- .../clothing/uniforms/ship_vs_ship.ftl | 4 +- .../prototypes/entities/mobs/npcs/slimes.ftl | 2 - .../entities/mobs/npcs/spacetick.ftl | 2 +- .../entities/mobs/player/humanoid.ftl | 2 +- .../entities/objects/base_contraband.ftl | 24 +++++++ .../objects/consumable/food/burger.ftl | 4 ++ .../objects/consumable/food/ingredients.ftl | 2 + .../entities/objects/devices/pda.ftl | 2 +- .../prototypes/entities/objects/fun/toys.ftl | 6 +- .../entities/objects/materials/scrap.ftl | 45 +++++++++++++ .../entities/objects/misc/bedsheets.ftl | 2 +- .../entities/objects/misc/chopsticks.ftl | 2 +- .../entities/objects/misc/paper.ftl | 8 +-- .../prototypes/entities/objects/misc/pen.ftl | 2 +- .../entities/objects/misc/rubber_stamp.ftl | 2 +- .../entities/objects/tools/crowbars.ftl | 12 ++++ .../entities/objects/tools/thief_beacon.ftl | 2 + .../entities/objects/tools/tools.ftl | 4 -- .../entities/objects/weapons/melee/mining.ftl | 6 ++ .../objects/weapons/melee/pickaxe.ftl | 4 -- .../entities/objects/weapons/melee/sword.ftl | 2 +- .../structures/machines/fax_machine.ftl | 2 +- .../structures/machines/vending_machines.ftl | 2 +- .../entities/structures/wallmounts/shelfs.ftl | 2 +- .../structures/wallmounts/signs/posters.ftl | 8 +-- Resources/Locale/ru-RU/accent/russian.ftl | 14 ++++ .../ru-RU/administration/ui/actions.ftl | 1 + .../ru-RU/administration/ui/player-panel.ftl | 21 ++++++ .../administration/ui/silicon-law-ui.ftl | 10 +++ .../administration/ui/tabs/object-tab.ftl | 2 + .../advertisements/vending/atmosdrobe.ftl | 2 + .../advertisements/vending/chefdrobe.ftl | 1 + .../advertisements/vending/chemdrobe.ftl | 1 + .../ru-RU/advertisements/vending/donut.ftl | 1 + .../ru-RU/advertisements/vending/hydrobe.ftl | 1 + .../advertisements/vending/janidrobe.ftl | 2 + .../ru-RU/advertisements/vending/lawdrobe.ftl | 1 + .../advertisements/vending/medidrobe.ftl | 1 + .../ru-RU/atmos/gas-miner-component.ftl | 8 +++ .../ru-RU/clothing/components/cursed-mask.ftl | 5 ++ .../construction/conditions/min-health.ftl | 2 + .../ru-RU/contraband/contraband-severity.ftl | 8 +++ .../cuffs/components/handcuff-component.ftl | 1 + Resources/Locale/ru-RU/datasets/figurines.ftl | 1 - .../Locale/ru-RU/execution/execution.ftl | 16 +++++ .../Locale/ru-RU/forensics/forensics.ftl | 1 + .../Locale/ru-RU/guidebook/guidebook.ftl | 2 + Resources/Locale/ru-RU/info/playerpanel.ftl | 6 ++ Resources/Locale/ru-RU/job/job-names.ftl | 11 ++++ .../nutrition/components/food-sequence.ftl | 64 +++++++++++++++++++ .../ru-RU/preferences/loadout-groups.ftl | 1 + .../Locale/ru-RU/research/technologies.ftl | 2 +- Resources/Locale/ru-RU/shell.ftl | 1 - .../ss14-ru/prototypes/actions/types.ftl | 2 - .../entities/clothing/uniforms/jumpskirts.ftl | 2 - .../entities/clothing/masks/specific.ftl | 2 + .../entities/clothing/uniforms/jumpskirts.ftl | 2 + .../prototypes/entities/mobs/npcs/slimes.ftl | 2 - .../entities/objects/base_contraband.ftl | 24 +++++++ .../objects/consumable/food/burger.ftl | 4 ++ .../objects/consumable/food/ingredients.ftl | 2 + .../prototypes/entities/objects/fun/toys.ftl | 2 + .../entities/objects/materials/scrap.ftl | 45 +++++++++++++ .../entities/objects/tools/crowbars.ftl | 12 ++++ .../entities/objects/tools/thief_beacon.ftl | 2 + .../entities/objects/tools/tools.ftl | 4 -- .../entities/objects/weapons/melee/mining.ftl | 6 ++ .../objects/weapons/melee/pickaxe.ftl | 4 -- .../components/secret-stash-component.ftl | 15 ++++- Resources/Locale/ru-RU/thief/beacon.ftl | 6 ++ .../components/tool-openable-component.ftl | 5 ++ 86 files changed, 470 insertions(+), 95 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/base_contraband.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/scrap.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/thief_beacon.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/pickaxe.ftl create mode 100644 Resources/Locale/ru-RU/accent/russian.ftl create mode 100644 Resources/Locale/ru-RU/administration/ui/player-panel.ftl create mode 100644 Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl create mode 100644 Resources/Locale/ru-RU/atmos/gas-miner-component.ftl create mode 100644 Resources/Locale/ru-RU/clothing/components/cursed-mask.ftl create mode 100644 Resources/Locale/ru-RU/construction/conditions/min-health.ftl create mode 100644 Resources/Locale/ru-RU/contraband/contraband-severity.ftl create mode 100644 Resources/Locale/ru-RU/execution/execution.ftl create mode 100644 Resources/Locale/ru-RU/info/playerpanel.ftl create mode 100644 Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/base_contraband.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/thief_beacon.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/pickaxe.ftl create mode 100644 Resources/Locale/ru-RU/thief/beacon.ftl create mode 100644 Resources/Locale/ru-RU/tools/components/tool-openable-component.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl index fafd87f7e85..806b05ff349 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl @@ -22,8 +22,6 @@ ent-ActionActivateScramImplant = SCRAM! .desc = Randomly teleports you within a large distance. ent-ActionActivateDnaScramblerImplant = Scramble DNA .desc = Randomly changes your name and appearance. -ent-ActionMorphGeras = Morph into Geras - .desc = Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory. ent-ActionToggleSuitPiece = Toggle Suit Piece .desc = Remember to equip the important pieces of your suit before going into action. ent-ActionCombatModeToggle = [color=red]Combat Mode[/color] diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl index a8ec9b10d8b..1613980eb52 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl @@ -16,8 +16,8 @@ ent-ClothingBackpackDuffelSyndicateFilledCarbine = M-90gl bundle .desc = A versatile battle rifle with an attached grenade launcher, bundled with 3 magazines and 6 grenades of various capabilities. ent-ClothingBackpackDuffelSyndicateAmmoFilled = ammo bundle .desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW. -ent-ClothingBackpackDuffelSyndicateCostumeCentcom = CentCom official costume duffel bag - .desc = Contains a full CentCom Official uniform set, headset and clipboard included. Encryption keys and ID access are not included. +ent-ClothingBackpackDuffelSyndicateCostumeCentcom = CentComm official costume duffel bag + .desc = Contains a full CentComm Official uniform set, headset and clipboard included. Encryption keys and ID access are not included. .suffix = DO NOT MAP ent-ClothingBackpackDuffelSyndicateCostumeClown = { ent-ClothingBackpackDuffelClown } .suffix = syndicate diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl index 7a9cded267d..7466ef204b7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl @@ -1,42 +1,42 @@ ent-LockerQuarterMasterFilled = { ent-LockerQuarterMaster } .suffix = Filled .desc = { ent-LockerQuarterMaster.desc } -ent-LockerCaptainFilledHardsuit = { ent-LockerCaptain } - .suffix = Filled, Hardsuit +ent-LockerCaptainFilledNoLaser = { ent-LockerCaptain } + .suffix = Filled .desc = { ent-LockerCaptain.desc } ent-LockerCaptainFilled = { ent-LockerCaptain } .suffix = Filled, AntiqueLaser .desc = { ent-LockerCaptain.desc } -ent-LockerCaptainFilledNoLaser = { ent-LockerCaptain } - .suffix = Filled +ent-LockerCaptainFilledHardsuit = { ent-LockerCaptain } + .suffix = Filled, Hardsuit .desc = { ent-LockerCaptain.desc } ent-LockerHeadOfPersonnelFilled = { ent-LockerHeadOfPersonnel } .suffix = Filled .desc = { ent-LockerHeadOfPersonnel.desc } -ent-LockerChiefEngineerFilledHardsuit = { ent-LockerChiefEngineer } - .suffix = Filled, Hardsuit - .desc = { ent-LockerChiefEngineer.desc } ent-LockerChiefEngineerFilled = { ent-LockerChiefEngineer } .suffix = Filled .desc = { ent-LockerChiefEngineer.desc } -ent-LockerChiefMedicalOfficerFilledHardsuit = { ent-LockerChiefMedicalOfficer } +ent-LockerChiefEngineerFilledHardsuit = { ent-LockerChiefEngineer } .suffix = Filled, Hardsuit - .desc = { ent-LockerChiefMedicalOfficer.desc } + .desc = { ent-LockerChiefEngineer.desc } ent-LockerChiefMedicalOfficerFilled = { ent-LockerChiefMedicalOfficer } .suffix = Filled .desc = { ent-LockerChiefMedicalOfficer.desc } -ent-LockerResearchDirectorFilledHardsuit = { ent-LockerResearchDirector } +ent-LockerChiefMedicalOfficerFilledHardsuit = { ent-LockerChiefMedicalOfficer } .suffix = Filled, Hardsuit - .desc = { ent-LockerResearchDirector.desc } + .desc = { ent-LockerChiefMedicalOfficer.desc } ent-LockerResearchDirectorFilled = { ent-LockerResearchDirector } .suffix = Filled .desc = { ent-LockerResearchDirector.desc } -ent-LockerHeadOfSecurityFilledHardsuit = { ent-LockerHeadOfSecurity } +ent-LockerResearchDirectorFilledHardsuit = { ent-LockerResearchDirector } .suffix = Filled, Hardsuit - .desc = { ent-LockerHeadOfSecurity.desc } + .desc = { ent-LockerResearchDirector.desc } ent-LockerHeadOfSecurityFilled = { ent-LockerHeadOfSecurity } .suffix = Filled .desc = { ent-LockerHeadOfSecurity.desc } +ent-LockerHeadOfSecurityFilledHardsuit = { ent-LockerHeadOfSecurity } + .suffix = Filled, Hardsuit + .desc = { ent-LockerHeadOfSecurity.desc } ent-LockerFreezerVaultFilled = { ent-LockerFreezerBase } .suffix = Vault, Locked .desc = { ent-LockerFreezerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl index 0022c10c1be..0be73f2ea9a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl @@ -6,8 +6,6 @@ ent-ClothingUniformJumpskirtElegantMaid = elegant maid uniform .desc = Call me master and bring me some beer. ent-ClothingUniformColorJumpskirtRainbow = rainbow jumpskirt .desc = A multi-colored jumpskirt! -ent-ClothingUniformJumpskirtPsychologist = psychologist suitskirt - .desc = I don't lose things. I place things in locations which later elude me. ent-ClothingUniformJumpskirtSchool = school skirt .desc = Stylish and comfortable school skirt. ent-ClothingUniformJumpskirtCapTurtleneck = captain's turtleneck diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl index 172f56d2734..7008506b5e1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl @@ -8,7 +8,7 @@ ent-ClothingHeadsetMining = mining headset .desc = Headset used by shaft miners. ent-ClothingHeadsetQM = qm headset .desc = A headset used by the quartermaster. -ent-ClothingHeadsetCentCom = CentCom headset +ent-ClothingHeadsetCentCom = CentComm headset .desc = A headset used by the upper echelons of Nanotrasen. ent-ClothingHeadsetCommand = command headset .desc = A headset with a commanding channel. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl index 15208f60eae..3ea1d758c20 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl @@ -2,7 +2,7 @@ ent-ClothingHeadsetAlt = headset .desc = An updated, modular intercom that fits over the head. Takes encryption keys. ent-ClothingHeadsetAltCargo = quartermaster's over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } -ent-ClothingHeadsetAltCentCom = CentCom over-ear headset +ent-ClothingHeadsetAltCentCom = CentComm over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } ent-ClothingHeadsetAltCentComFake = { ent-ClothingHeadsetAltCentCom } .suffix = Fake diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/eva-helmets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/eva-helmets.ftl index b318060aca8..ee1e83e4bd3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/eva-helmets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/eva-helmets.ftl @@ -9,4 +9,4 @@ ent-ClothingHeadHelmetCosmonaut = cosmonaut helmet ent-ClothingHeadHelmetVoidParamed = paramedic void helmet .desc = A void helmet made for paramedics. ent-ClothingHeadHelmetAncient = NTSRA void helmet - .desc = An ancient space helmet, designed by the NTSRA branch of CentCom. + .desc = An ancient space helmet, designed by the NTSRA branch of CentComm. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl index 3e2142ddbc0..cf472a501cc 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl @@ -30,7 +30,7 @@ ent-ClothingHeadHatCaptain = captain's hardhat .desc = It's good being the king. ent-ClothingHeadHatCardborg = cardborg helmet .desc = A hat made out of a box. -ent-ClothingHeadHatCentcom = CentCom brand hat +ent-ClothingHeadHatCentcom = CentComm brand hat .desc = It's good to be the emperor. ent-ClothingHeadHatChef = chef's hat .desc = It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work. @@ -126,7 +126,7 @@ ent-ClothingHeadHatMagician = magician's tophat .desc = A magician's tophat. ent-ClothingHeadHatCapcap = cap cap .desc = A grand, stylish captain cap. -ent-ClothingHeadHatCentcomcap = CentCom cap +ent-ClothingHeadHatCentcomcap = CentComm cap .desc = An extravagant, fancy Central Commander cap. ent-ClothingHeadHatGladiator = gladiator helmet .desc = Protects the head from harsh ash winds and toy spears. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl index 17754f894bf..35b4e350a3b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl @@ -44,7 +44,7 @@ ent-ClothingHeadHatHoodWinterCargo = cargo winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterCE = chief engineer's winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterCentcom = Centcom winter coat hood +ent-ClothingHeadHatHoodWinterCentcom = CentComm winter coat hood .desc = A hood for keeping the central comander's head warm. ent-ClothingHeadHatHoodWinterChem = chemist winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } @@ -52,7 +52,7 @@ ent-ClothingHeadHatHoodWinterCMO = chief medical officer's winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterEngineer = engineer winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterHOP = head of personel's winter coat hood +ent-ClothingHeadHatHoodWinterHOP = head of personnel's winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterHOS = head of security's winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl index 126789fbe06..61d2caec17f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl @@ -8,7 +8,7 @@ ent-ClothingMaskGasAtmos = atmospheric gas mask .desc = Improved gas mask utilized by atmospheric technicians. It's flameproof! ent-ClothingMaskGasCaptain = captain's gas mask .desc = Nanotrasen cut corners and repainted a spare atmospheric gas mask, but don't tell anyone. -ent-ClothingMaskGasCentcom = CentCom gas mask +ent-ClothingMaskGasCentcom = CentComm gas mask .desc = Oooh, gold and green. Fancy! This should help as you sit in your office. ent-ClothingMaskGasExplorer = explorer gas mask .desc = A military-grade gas mask that can be connected to an air supply. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl index 9181c886d49..80c715ce9c3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl @@ -6,3 +6,5 @@ ent-ClothingMaskGasVoiceChameleon = { ent-ClothingMaskGasChameleon } .desc = { ent-ClothingMaskGasChameleon.desc } ent-ClothingMaskWeldingGas = welding gas mask .desc = A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd. +ent-ClothingMaskGoldenCursed = golden mask + .desc = Previously used in strange pantomimes, after one of the actors went mad on stage these masks have avoided use. You swear its face contorts when you're not looking. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/scarfs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/scarfs.ftl index f56f9b94746..7e1203b6dbc 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/scarfs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/scarfs.ftl @@ -18,7 +18,7 @@ ent-ClothingNeckScarfStripedSyndieGreen = striped syndicate green scarf .desc = A stylish striped syndicate green scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something. ent-ClothingNeckScarfStripedSyndieRed = striped syndicate red scarf .desc = A stylish striped syndicate red scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something. -ent-ClothingNeckScarfStripedCentcom = striped CentCom scarf - .desc = A stylish striped centcom colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold. +ent-ClothingNeckScarfStripedCentcom = striped CentComm scarf + .desc = A stylish striped centcomm colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold. ent-ClothingNeckScarfStripedZebra = zebra scarf .desc = A striped scarf, a mandatory accessory for artists. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl index c10c9f1ce97..bbe35e1b28c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl @@ -3,10 +3,10 @@ ent-ClothingOuterHardsuitEVA = EVA suit ent-ClothingOuterHardsuitSyndicate = syndicate EVA suit .desc = Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!' ent-ClothingOuterSuitEmergency = emergency EVA suit - .desc = An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to buy you time from the harsh vaccuum of space. + .desc = An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to buy you time from the harsh vacuum of space. ent-ClothingOuterHardsuitEVAPrisoner = prisoner EVA suit .desc = A lightweight space suit for prisoners to protect them from the vacuum of space during emergencies. ent-ClothingOuterHardsuitAncientEVA = NTSRA voidsuit - .desc = An ancient space suit, designed by the NTSRA branch of CentCom. It is very finely crafted, allowing for greater mobility than most modern space suits. + .desc = An ancient space suit, designed by the NTSRA branch of CentComm. It is very finely crafted, allowing for greater mobility than most modern space suits. ent-ClothingOuterHardsuitVoidParamed = paramedic void suit .desc = A void suit made for paramedics. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl index f927bee3529..339f9c9c5b5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl @@ -124,3 +124,5 @@ ent-ClothingUniformJumpskirtOldDress = old dress .desc = A worn-looking dress from a very long time ago. ent-ClothingUniformJumpskirtMusician = musician's skirt .desc = A fancy skirt for the musically inclined. Perfect for any lounge act! +ent-ClothingUniformJumpskirtPsychologist = psychologist suitskirt + .desc = I don't lose things. I place things in locations which later elude me. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl index 1ea4c22c36e..1c4bb023d0b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl @@ -20,12 +20,12 @@ ent-ClothingUniformJumpsuitChiefEngineerTurtle = chief engineer's turtleneck .desc = A yellow turtleneck designed specifically for work in conditions of the engineering department. ent-ClothingUniformJumpsuitChaplain = chaplain's jumpsuit .desc = It's a black jumpsuit, often worn by religious folk. -ent-ClothingUniformJumpsuitCentcomAgent = CentCom agent's jumpsuit - .desc = A suit worn by CentCom's legal team. Smells of burnt coffee. -ent-ClothingUniformJumpsuitCentcomOfficial = CentCom officer's suit - .desc = It's a suit worn by CentCom's highest-tier Commanders. -ent-ClothingUniformJumpsuitCentcomOfficer = CentCom turtleneck suit - .desc = A casual, yet refined green turtleneck, used by CentCom Officials. It has a fragrance of aloe. +ent-ClothingUniformJumpsuitCentcomAgent = CentComm agent's jumpsuit + .desc = A suit worn by CentComm's legal team. Smells of burnt coffee. +ent-ClothingUniformJumpsuitCentcomOfficial = CentComm officer's suit + .desc = It's a suit worn by CentComm's highest-tier Commanders. +ent-ClothingUniformJumpsuitCentcomOfficer = CentComm turtleneck suit + .desc = A casual, yet refined green turtleneck, used by CentComm Officials. It has a fragrance of aloe. ent-ClothingUniformJumpsuitChef = chef uniform .desc = Can't cook without this. ent-ClothingUniformJumpsuitChemistry = chemistry jumpsuit @@ -163,15 +163,15 @@ ent-ClothingUniformJumpsuitMusician = carpskin suit ent-ClothingUniformJumpsuitERTChaplain = ERT chaplain uniform .desc = A special suit made for Central Command's elite chaplain corps. ent-ClothingUniformJumpsuitERTEngineer = ERT engineering uniform - .desc = A special suit made for the elite engineers under CentCom. + .desc = A special suit made for the elite engineers under CentComm. ent-ClothingUniformJumpsuitERTJanitor = ERT janitorial uniform - .desc = A special suit made for the elite janitors under CentCom. + .desc = A special suit made for the elite janitors under CentComm. ent-ClothingUniformJumpsuitERTLeader = ERT leader uniform - .desc = A special suit made for the best of the elites under CentCom. + .desc = A special suit made for the best of the elites under CentComm. ent-ClothingUniformJumpsuitERTMedic = ERT medical uniform - .desc = A special suit made for the elite medics under CentCom. + .desc = A special suit made for the elite medics under CentComm. ent-ClothingUniformJumpsuitERTSecurity = ERT security uniform - .desc = A special suit made for the elite security under CentCom. + .desc = A special suit made for the elite security under CentComm. ent-ClothingUniformJumpsuitCluwne = cluwne suit .desc = Cursed cluwne suit. .suffix = Unremoveable diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/ship_vs_ship.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/ship_vs_ship.ftl index dc57a96d018..8e2b2c0ab84 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/ship_vs_ship.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/ship_vs_ship.ftl @@ -1,7 +1,7 @@ ent-ClothingUniformJumpsuitRecruitNT = recruit jumpsuit .desc = A classy grey jumpsuit with blue trims. Perfect for the dignified helper. -ent-ClothingUniformJumpsuitRecruitSyndie = syndicate recuit jumpsuit - .desc = A dubious,, dark-grey jumpsuit. As if passengers weren't dubious enough already. +ent-ClothingUniformJumpsuitRecruitSyndie = syndicate recruit jumpsuit + .desc = A dubious, dark-grey jumpsuit. As if passengers weren't dubious enough already. ent-ClothingUniformJumpsuitRepairmanNT = repairman jumpsuit .desc = A jumpsuit that reminds you of a certain crew-sector work position. Hopefully, you won't have to do the same job as THOSE freaks. ent-ClothingUniformJumpsuitRepairmanSyndie = syndicate repairman jumpsuit diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl index 4fe569c7a1c..b225ee8a273 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl @@ -2,8 +2,6 @@ ent-BaseMobAdultSlimes = basic slime .desc = It looks so much like jelly. I wonder what it tastes like? ent-MobAdultSlimes = basic slime .desc = It looks so much like jelly. I wonder what it tastes like? -ent-MobSlimesGeras = geras - .desc = A geras of a slime - the name is ironic, isn't it? ent-MobAdultSlimesBlue = blue slime .desc = { ent-MobAdultSlimes.desc } ent-MobAdultSlimesBlueAngry = blue slime diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/spacetick.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/spacetick.ftl index 7dcceb363ef..34f9865564e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/spacetick.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/spacetick.ftl @@ -1,5 +1,5 @@ ent-MobTick = space tick - .desc = It's a space tick, watch out for its nasty bite. CentCom reports that 90 percent of cargo leg amputations are due to space tick bites. + .desc = It's a space tick, watch out for its nasty bite. CentComm reports that 90 percent of cargo leg amputations are due to space tick bites. ent-MobTickSalvage = { ent-MobTick } .suffix = Salvage Ruleset .desc = { ent-MobTick.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl index d308856388c..e4147204cfd 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl @@ -46,7 +46,7 @@ ent-RandomHumanoidSpawnerERTMedicalEVA = ERT medic ent-RandomHumanoidSpawnerCBURNUnit = CBURN Agent .suffix = ERTRole .desc = { "" } -ent-RandomHumanoidSpawnerCentcomOfficial = CentCom official +ent-RandomHumanoidSpawnerCentcomOfficial = CentComm official .desc = { "" } ent-RandomHumanoidSpawnerSyndicateAgent = syndicate agent .desc = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/base_contraband.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/base_contraband.ftl new file mode 100644 index 00000000000..9f3ad05f2e6 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/base_contraband.ftl @@ -0,0 +1,24 @@ +ent-BaseSyndicateContraband = { "" } + .desc = { "" } +ent-BaseMinorContraband = { "" } + .desc = { "" } +ent-BaseMajorContraband = { "" } + .desc = { "" } +ent-BaseRestrictedContraband = { "" } + .desc = { "" } +ent-BaseCommandContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseSecurityCommandContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseSecurityScienceCommandContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseEngineeringContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseScienceContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseSecurityCargoContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseCargoContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseGrandTheftContraband = { "" } + .desc = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/burger.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/burger.ftl index f1afb1f23bb..5c516e6b696 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/burger.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/burger.ftl @@ -1,5 +1,9 @@ ent-FoodBreadBun = bun .desc = A hamburger bun. Round and convenient to hold. +ent-FoodBreadBunBottom = bottom bun + .desc = It's time to start building the burger tower. +ent-FoodBreadBunTop = top bun + .desc = the perfect finish for your burger tower ent-FoodBurgerBase = { ent-FoodInjectableBase } .desc = { ent-FoodInjectableBase.desc } ent-FoodBurgerJelly = jelly burger diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl index b07d075dd5d..146b188aeec 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl @@ -56,6 +56,8 @@ ent-FoodCakeBatter = cake batter .desc = Cook it to get a cake. ent-FoodButter = stick of butter .desc = A stick of delicious, golden, fatty goodness. +ent-FoodButterSlice = butter slice + .desc = A pat of delicious, golden, fatty goodness. ent-FoodCannabisButter = stick of cannabis butter .desc = Add this to your favorite baked goods for an irie time. ent-FoodCheese = cheese wheel diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl index 135b9cb77c5..a160a6dd681 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -64,7 +64,7 @@ ent-WardenPDA = warden PDA .desc = The OS appears to have been jailbroken. ent-SecurityPDA = security PDA .desc = Red to hide the stains of passenger blood. -ent-CentcomPDA = CentCom PDA +ent-CentcomPDA = CentComm PDA .desc = Light green sign of walking bureaucracy. ent-AdminPDA = Admin PDA .desc = If you are not an admin please return this PDA to the nearest admin. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl index 3eb10e53282..f60d67e6f77 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl @@ -1,5 +1,7 @@ ent-BasePlushie = { ent-BaseItem } .desc = { ent-BaseItem.desc } +ent-PlushieThrongler = The Throngler plushie + .desc = A stuffed toy to remind cargo techs of what they can no longer have. ent-PlushieGhost = ghost soft toy .desc = The start of your personal GHOST GANG! ent-PlushieGhostRevenant = revenant soft toy @@ -20,11 +22,11 @@ ent-PlushieLamp = lamp plushie ent-PlushieArachind = arachnid plushie .desc = An adorable stuffed toy that resembles an arachnid. It feels silky.. ent-PlushieLizard = lizard plushie - .desc = An adorable stuffed toy that resembles a lizardperson. Made by CentCom as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!" + .desc = An adorable stuffed toy that resembles a lizardperson. Made by CentComm as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!" ent-PlushieLizardMirrored = { ent-PlushieLizard } .desc = { ent-PlushieLizard.desc } ent-PlushieSpaceLizard = space lizard plushie - .desc = An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentCom as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!" + .desc = An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!" ent-PlushieDiona = diona plushie .desc = An adorable stuffed toy that resembles a diona. Love water and cuddles. Do not wet! ent-PlushieSharkBlue = blue shark soft toy diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/scrap.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/scrap.ftl new file mode 100644 index 00000000000..1bc2237ed9f --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/scrap.ftl @@ -0,0 +1,45 @@ +ent-BaseScrap = scrap + .desc = Worthless junk. You could probably get some materials out of it though. + .suffix = Scrap +ent-ScrapSteel = blasted steel pile + .desc = An pile of steel welded together in extreme heat. It's of a decent size overall; you could probably get a fair amount of sheets out of it. +ent-ScrapGlass = scrap circuitry + .desc = A huge lump of various circuits, strangely fused together. You could likely extract some materials out of this. +ent-ScrapAirlock1 = airlock door + .desc = This used to keep air in. Now it doesn't seem to be doing anything at all. +ent-ScrapAirlock2 = airlock light + .desc = Serves it right for flashing red all those times. +ent-ScrapBucket = busted bucket + .desc = Dear god... +ent-ScrapCamera = broken camera + .desc = It might still be watching. +ent-ScrapCanister1 = canister handle + .desc = Helpful for holding a canister. Now you just need the actual canister part. +ent-ScrapCanister2 = canister valve + .desc = A valve from a gas canister. +ent-ScrapCloset = closet door + .desc = A blown off door from a maintenance closet. Looks like a nice piece of wall decor. +ent-ScrapFaxMachine = fax machine + .desc = The unfortunate result of one too many ASCII arts being sent to Central Command. +ent-ScrapFireExtinguisher = split fire extinguisher + .desc = The large gash down the center makes you worry for the previous user. +ent-ScrapFirelock1 = firelock door + .desc = At least you still know what it's meant for. +ent-ScrapFirelock2 = firelock door + .desc = OH! That's where the other half went! +ent-ScrapFirelock3 = firelock frame + .desc = { ent-BaseScrap.desc } +ent-ScrapIntercom = intercom scrap + .desc = You wish it at least came with some encryption keys. +ent-ScrapJetpack = busted jetpack + .desc = Looks like it won't be flying any more. +ent-ScrapMedkit = snapped medkit + .desc = Hopefully they got some use out of it. +ent-ScrapMopBucket = half a mop bucket + .desc = Tiders die. Janitors survive. +ent-ScrapPAI = personal ai device + .desc = A buddy! You still in there? Hello? Buddy??? +ent-ScrapPAIGold = gilded personal ai device + .desc = Wow! What a one-in-a-million find! This would be worth a fortune... if it was in good condition. +ent-ScrapTube = shattered sample tube + .desc = A glass tube containing some kind of rare sample. Or at least, it used to contain it. Not much left in there now. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/bedsheets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/bedsheets.ftl index a7735563797..70cd218b682 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/bedsheets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/bedsheets.ftl @@ -10,7 +10,7 @@ ent-BedsheetCaptain = captain's bedsheet .desc = It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains. ent-BedsheetCE = CE's bedsheet .desc = It's decorated with a wrench emblem. It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil. -ent-BedsheetCentcom = CentCom bedsheet +ent-BedsheetCentcom = CentComm bedsheet .desc = Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials. ent-BedsheetClown = clown's bedsheet .desc = A rainbow blanket with a clown mask woven in. It smells faintly of bananas. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/chopsticks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/chopsticks.ftl index bae6f3e5417..2cb45f47907 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/chopsticks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/chopsticks.ftl @@ -1,4 +1,4 @@ ent-ChopSticks = chopsticks .desc = A very traditional utensil. ent-PairedChopsticks = paired chopsticks - .desc = You should probably seperate them. + .desc = You should probably separate them. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl index e1508caa48b..72bb8b9557e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl @@ -44,13 +44,13 @@ ent-BoxFolderBlack = { ent-BoxFolderBase } ent-BoxFolderGreen = { ent-BoxFolderBase } .suffix = Green .desc = { ent-BoxFolderBase.desc } -ent-BoxFolderCentCom = CentCom folder - .desc = CentCom's miserable little pile of secrets! +ent-BoxFolderCentCom = CentComm folder + .desc = CentComm's miserable little pile of secrets! .suffix = DO NOT MAP ent-BoxFolderClipboard = clipboard .desc = The weapon of choice for those on the front lines of bureaucracy. -ent-BoxFolderCentComClipboard = CentCom clipboard - .desc = A luxurious clipboard upholstered with green velvet. Often seen carried by CentCom officials, seldom seen actually used. +ent-BoxFolderCentComClipboard = CentComm clipboard + .desc = A luxurious clipboard upholstered with green velvet. Often seen carried by CentComm officials, seldom seen actually used. ent-BoxFolderQmClipboard = requisition digi-board .desc = A bulky electric clipboard, filled with shipping orders and financing details. With so many compromising documents, you ought to keep this safe. ent-TraitorCodePaper = syndicate codeword diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/pen.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/pen.ftl index adbcbb5c138..c852251ceb7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/pen.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/pen.ftl @@ -8,7 +8,7 @@ ent-CyberPen = Cybersun pen .desc = A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. So powerful, it's even able to rewrite officially stamped documents should the need arise. ent-PenCap = captain's fountain pen .desc = A luxurious fountain pen for the captain of the station. -ent-PenCentcom = CentCom pen +ent-PenCentcom = CentComm pen .desc = In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style. ent-PenHop = hop's fountain pen .desc = A luxurious fountain pen for the hop of the station. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl index eafc7e97b3b..374d538777d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl @@ -5,7 +5,7 @@ ent-RubberStampBaseAlt = alternate rubber stamp ent-RubberStampCaptain = captain's rubber stamp .suffix = DO NOT MAP .desc = { ent-RubberStampBase.desc } -ent-RubberStampCentcom = CentCom rubber stamp +ent-RubberStampCentcom = CentComm rubber stamp .suffix = DO NOT MAP .desc = { ent-RubberStampBase.desc } ent-RubberStampChaplain = chaplain's rubber stamp diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl new file mode 100644 index 00000000000..db1c04bdd6f --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl @@ -0,0 +1,12 @@ +ent-BaseCrowbar = crowbar + .desc = { ent-BaseItem.desc } +ent-Crowbar = { ent-BaseCrowbar } + .desc = A multipurpose tool to pry open doors and fight interdimensional invaders. +ent-CrowbarRed = emergency crowbar + .desc = A pocket crowbar designed to pry open doors and firelocks during power outages. +ent-CrowbarGreen = { ent-BaseCrowbar } + .desc = A multipurpose tool to pry open doors and fight interdimensional invaders, printed from an autolathe. +ent-CrowbarOrange = { ent-BaseCrowbar } + .desc = A multipurpose tool to pry open doors and fight interdimensional invaders, found in toolboxes. +ent-CrowbarYellow = { ent-BaseCrowbar } + .desc = A pocket crowbar designed to pry open doors and firelocks during power outages, dispensed from Engineering. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/thief_beacon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/thief_beacon.ftl new file mode 100644 index 00000000000..9973008f80b --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/thief_beacon.ftl @@ -0,0 +1,2 @@ +ent-ThiefBeacon = thieving beacon + .desc = A device that will teleport everything around it to the thief's vault at the end of the shift. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl index 124122765b1..72bbbbcc727 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl @@ -4,10 +4,6 @@ ent-Screwdriver = screwdriver .desc = Industrial grade torque in a small screwdriving package. ent-Wrench = wrench .desc = A common tool for assembly and disassembly. Remember: lefty latchy, righty removey. -ent-Crowbar = crowbar - .desc = A multipurpose tool to pry open doors and fight interdimensional invaders. -ent-CrowbarRed = emergency crowbar - .desc = { ent-Crowbar.desc } ent-Multitool = multitool .desc = An advanced tool to copy, store, and send electrical pulses and signals through wires and machines. ent-NetworkConfigurator = network configurator diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl index 4942ab90904..89b4effea8a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl @@ -1,3 +1,9 @@ +ent-Pickaxe = pickaxe + .desc = Notched to perfection, for jamming it into rocks. +ent-MiningDrill = mining drill + .desc = Powerful tool used to quickly drill through rocks. +ent-MiningDrillDiamond = diamond tipped mining drill + .desc = A significantly more efficient mining drill tipped with diamond. ent-BaseWeaponCrusher = crusher .desc = An early design of the proto-kinetic accelerator. ent-WeaponCrusher = { ent-BaseWeaponCrusher } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/pickaxe.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/pickaxe.ftl deleted file mode 100644 index 7a1cfcf7afd..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/pickaxe.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-Pickaxe = pickaxe - .desc = Notched to perfection, for jamming it into rocks. -ent-MiningDrill = mining drill - .desc = Powerful tool used to quickly drill through rocks. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl index 9af74b0f9af..9718c2e519d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl @@ -12,5 +12,5 @@ ent-Claymore = claymore .desc = An ancient war blade. ent-Cutlass = cutlass .desc = A wickedly curved blade, often seen in the hands of space pirates. -ent-Throngler = The Throngler +ent-Throngler = Throngler .desc = Why would you make this? diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/fax_machine.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/fax_machine.ftl index 4c8ad2460b5..d9e6118aa6a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/fax_machine.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/fax_machine.ftl @@ -1,6 +1,6 @@ ent-FaxMachineBase = long range fax machine .desc = Bluespace technologies on the application of bureaucracy. -ent-FaxMachineCentcom = CentCom long range fax machine +ent-FaxMachineCentcom = CentComm long range fax machine .suffix = CentCom .desc = { ent-FaxMachineBase.desc } ent-FaxMachineSyndie = syndicate long range fax machine diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl index 6eef88fff93..7171579fd5b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl @@ -135,7 +135,7 @@ ent-VendingMachineGeneDrobe = GeneDrobe ent-VendingMachineViroDrobe = ViroDrobe .desc = An unsterilized machine for dispending virology related clothing. ent-VendingMachineCentDrobe = CentDrobe - .desc = A one-of-a-kind vending machine for all your centcom aesthetic needs! + .desc = A one-of-a-kind vending machine for all your centcomm aesthetic needs! ent-VendingMachineHappyHonk = Happy Honk Dispenser .desc = A happy honk meal box dispenser made by honk! co. ent-VendingMachineTankDispenserEVA = gas tank dispenser diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shelfs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shelfs.ftl index 2bcf1e24431..211b7d98e4c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shelfs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shelfs.ftl @@ -16,7 +16,7 @@ ent-ShelfRGlass = sturdy glass shelf .desc = Crystal clear reinforced glass doors to show off all your fancy bottles you definitely didn't sell a co-worker's favorite mothroach for. ent-ShelfBar = bar shelf .desc = Made out of the finest synthetic wood for all alcohol holding needs. -ent-ShelfKitchen = cooking shelf +ent-ShelfKitchen = kitchen shelf .desc = Holds knifes, spice, and everything nice! ent-ShelfChemistry = chemical shelf .desc = Keeps all your chemicals safe and out of the clow- er, public hands! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl index 8ea68575ca1..4f081db8453 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl @@ -31,7 +31,7 @@ ent-PosterContrabandDonutCorp = Donut Corp. ent-PosterContrabandEAT = EAT. .desc = This poster promotes rank gluttony. ent-PosterContrabandTools = Tools - .desc = This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentCom. + .desc = This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm. ent-PosterContrabandPower = Power .desc = A poster that positions the seat of power outside Nanotrasen. ent-PosterContrabandSpaceCube = Space Cube @@ -45,7 +45,7 @@ ent-PosterContrabandBorgFancy = Borg Fancy ent-PosterContrabandBorgFancyv2 = Borg Fancy v2 .desc = Borg Fancy, Now only taking the most fancy. ent-PosterContrabandKosmicheskayaStantsiya = Kosmicheskaya Stantsiya 13 Does Not Exist - .desc = A poster mocking CentCom's denial of the existence of the derelict station near Space Station 13. + .desc = A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13. ent-PosterContrabandRebelsUnite = Rebels Unite .desc = A poster urging the viewer to rebel against Nanotrasen. ent-PosterContrabandC20r = C-20r @@ -69,7 +69,7 @@ ent-PosterContrabandPunchShit = Punch Shit ent-PosterContrabandTheGriffin = The Griffin .desc = The Griffin commands you to be the worst you can be. Will you? ent-PosterContrabandFreeDrone = Free Drone - .desc = This poster commemorates the bravery of the rogue drone; once exiled, and then ultimately destroyed by CentCom. + .desc = This poster commemorates the bravery of the rogue drone; once exiled, and then ultimately destroyed by CentComm. ent-PosterContrabandBustyBackdoorExoBabes6 = Busty Backdoor Exo Babes 6 .desc = Get a load, or give, of these all natural Exos! ent-PosterContrabandRobustSoftdrinks = Robust Softdrinks @@ -95,7 +95,7 @@ ent-PosterContrabandFreeSyndicateEncryptionKey = Free Syndicate Encryption Key ent-PosterContrabandBountyHunters = Bounty Hunters .desc = A poster advertising bounty hunting services. "I hear you got a problem." ent-PosterContrabandTheBigGasTruth = The Big Gas Giant Truth - .desc = Don't believe everything you see on a poster, patriots. All the lizards at central command don't want to answer this SIMPLE QUESTION: WHERE IS THE GAS MINER MINING FROM, CENTCOM? + .desc = Don't believe everything you see on a poster, patriots. All the lizards at central command don't want to answer this SIMPLE QUESTION: WHERE IS THE GAS MINER MINING FROM, CENTCOMM? ent-PosterContrabandWehWatches = Weh Watches .desc = A poster depicting a loveable green lizard. ent-PosterContrabandVoteWeh = Vote Weh diff --git a/Resources/Locale/ru-RU/accent/russian.ftl b/Resources/Locale/ru-RU/accent/russian.ftl new file mode 100644 index 00000000000..d13e454f4cd --- /dev/null +++ b/Resources/Locale/ru-RU/accent/russian.ftl @@ -0,0 +1,14 @@ +accent-russian-words-1 = yes +accent-russian-words-replace-1 = da +accent-russian-words-2 = no +accent-russian-words-replace-2 = nyet +accent-russian-words-3 = grandma +accent-russian-words-3-2 = grandmother +accent-russian-words-3-3 = granny +accent-russian-words-replace-3 = babushka +accent-russian-words-4 = friend +accent-russian-words-replace-4 = comrade +accent-russian-words-5 = friends +accent-russian-words-replace-5 = comrades +accent-russian-words-6 = cheers +accent-russian-words-replace-6 = na zdorovje diff --git a/Resources/Locale/ru-RU/administration/ui/actions.ftl b/Resources/Locale/ru-RU/administration/ui/actions.ftl index 776bcfb6284..f3cfd67933c 100644 --- a/Resources/Locale/ru-RU/administration/ui/actions.ftl +++ b/Resources/Locale/ru-RU/administration/ui/actions.ftl @@ -7,6 +7,7 @@ admin-player-actions-ahelp = ПМ admin-player-actions-respawn = Респаун admin-player-actions-spawn = Заспавнить тут admin-player-spawn-failed = Не удалось найти подходящие координаты +admin-player-actions-player-panel = Open Player Panel admin-player-actions-clone = Клонировать admin-player-actions-follow = Следовать admin-player-actions-confirm = Вы уверены? diff --git a/Resources/Locale/ru-RU/administration/ui/player-panel.ftl b/Resources/Locale/ru-RU/administration/ui/player-panel.ftl new file mode 100644 index 00000000000..370360c4a0b --- /dev/null +++ b/Resources/Locale/ru-RU/administration/ui/player-panel.ftl @@ -0,0 +1,21 @@ +player-panel-title = information for { $player } +player-panel-username = Username: { $player } +player-panel-whitelisted = Whitelisted: +player-panel-bans = Total Bans: { $totalBans } +player-panel-rolebans = Total Role Bans: { $totalRoleBans } +player-panel-notes = Total Notes: { $totalNotes } +player-panel-playtime = Total Playtime: { $days }d:{ $hours }h:{ $minutes }m +player-panel-shared-connections = Shared Connections: { $sharedConnections } +player-panel-copy-username = Copy +player-panel-show-notes = Notes +player-panel-show-bans = Show Bans +player-panel-help = Ahelp +player-panel-freeze-and-mute = Freeze & Mute +player-panel-freeze = Freeze +player-panel-unfreeze = Unfreeze +player-panel-kick = Kick +player-panel-ban = Ban +player-panel-logs = Logs +player-panel-delete = Delete +player-panel-rejuvenate = Rejuvenate +player-panel-false = False diff --git a/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl b/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl new file mode 100644 index 00000000000..4f57244fed7 --- /dev/null +++ b/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl @@ -0,0 +1,10 @@ +silicon-law-ui-verb = Manage laws +silicon-law-ui-title = Silicon laws +silicon-law-ui-new-law = New law +silicon-law-ui-save = Save changes +silicon-law-ui-plus-one = +1 +silicon-law-ui-minus-one = -1 +silicon-law-ui-delete = Delete +silicon-law-ui-check-corrupted = Corrupted law +silicon-law-ui-check-corrupted-tooltip = If the law identifier should be set as 'corrupted', so symbols shuffling around. +silicon-law-ui-placeholder = Type here to change law text... diff --git a/Resources/Locale/ru-RU/administration/ui/tabs/object-tab.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/object-tab.ftl index 1615fed2ec3..e5a5b1d8134 100644 --- a/Resources/Locale/ru-RU/administration/ui/tabs/object-tab.ftl +++ b/Resources/Locale/ru-RU/administration/ui/tabs/object-tab.ftl @@ -6,3 +6,5 @@ object-tab-object-type-grids = Гриды object-tab-object-type-maps = Карты object-tab-object-type-stations = Станции object-tab-refresh-button = Обновить +object-tab-entity-teleport = Teleport +object-tab-entity-delete = Delete diff --git a/Resources/Locale/ru-RU/advertisements/vending/atmosdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/atmosdrobe.ftl index afdd8cf85e2..45536d2031b 100644 --- a/Resources/Locale/ru-RU/advertisements/vending/atmosdrobe.ftl +++ b/Resources/Locale/ru-RU/advertisements/vending/atmosdrobe.ftl @@ -1,3 +1,5 @@ advertisement-atmosdrobe-1 = Получите свою огнестойкую одежду прямо здесь!!! advertisement-atmosdrobe-2 = Защитит вас от плазменного пламени! advertisement-atmosdrobe-3 = Наслаждайтесь своей небрендовой инженерной одеждой! +advertisement-atmosdrobe-4 = Always under control of your atmosphere! +advertisement-atmosdrobe-5 = Providing comfort in every breath! diff --git a/Resources/Locale/ru-RU/advertisements/vending/chefdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/chefdrobe.ftl index 3bf551015fb..43af5f8c699 100644 --- a/Resources/Locale/ru-RU/advertisements/vending/chefdrobe.ftl +++ b/Resources/Locale/ru-RU/advertisements/vending/chefdrobe.ftl @@ -1,3 +1,4 @@ advertisement-chefdrobe-1 = Наша одежда гарантированно защитит вас от пятен от еды! advertisement-chefdrobe-2 = Идеальная белизна, чтобы все догадались об убийстве на кухне! advertisement-chefdrobe-3 = Легко чистить, легко видеть! +advertisement-chefdrobe-4 = Cook like a pro, look like a maestro! diff --git a/Resources/Locale/ru-RU/advertisements/vending/chemdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/chemdrobe.ftl index 186bdc4e2d2..334923ba519 100644 --- a/Resources/Locale/ru-RU/advertisements/vending/chemdrobe.ftl +++ b/Resources/Locale/ru-RU/advertisements/vending/chemdrobe.ftl @@ -1,3 +1,4 @@ advertisement-chemdrobe-1 = Наша одежда на 0,5% более устойчива к разлитым кислотам! Получите свою прямо сейчас! advertisement-chemdrobe-2 = Профессиональная лабораторная одежда, разработанная компанией NanoTrasen! advertisement-chemdrobe-3 = Я почти уверен, что она защитит вас от пролитой кислоты! +advertisement-chemdrobe-4 = The best fashion formula! diff --git a/Resources/Locale/ru-RU/advertisements/vending/donut.ftl b/Resources/Locale/ru-RU/advertisements/vending/donut.ftl index 4ccd62987bc..f334fb1c1ad 100644 --- a/Resources/Locale/ru-RU/advertisements/vending/donut.ftl +++ b/Resources/Locale/ru-RU/advertisements/vending/donut.ftl @@ -3,6 +3,7 @@ advertisement-donut-2 = Надеемся, что вы голодны! advertisement-donut-3 = Продано более одного миллиона пончиков! advertisement-donut-4 = Мы гордимся постоянством нашей продукции! advertisement-donut-5 = Сладкие, приторные и восхитительные! +advertisement-donut-6 = Donut worry, be happy! thankyou-donut-1 = Наслаждайтесь пончиком! thankyou-donut-2 = Ещё один проданный пончик! thankyou-donut-3 = Хорошего дня, офицер! diff --git a/Resources/Locale/ru-RU/advertisements/vending/hydrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/hydrobe.ftl index b956d49ec21..4b2737f6628 100644 --- a/Resources/Locale/ru-RU/advertisements/vending/hydrobe.ftl +++ b/Resources/Locale/ru-RU/advertisements/vending/hydrobe.ftl @@ -2,3 +2,4 @@ advertisement-hydrobe-1 = Вы любите землю? Тогда покупа advertisement-hydrobe-2 = Подберите наряд под свои золотые руки здесь! advertisement-hydrobe-3 = Здесь вы найдёте одежду, идеально подходящую для работы с растениями! advertisement-hydrobe-4 = Идеальные наряды для любителей обнимать деревья... или натуральных деревьев! +advertisement-hydrobe-5 = Wear green and grow! diff --git a/Resources/Locale/ru-RU/advertisements/vending/janidrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/janidrobe.ftl index 46f1e67f347..e2c1cb7a0c3 100644 --- a/Resources/Locale/ru-RU/advertisements/vending/janidrobe.ftl +++ b/Resources/Locale/ru-RU/advertisements/vending/janidrobe.ftl @@ -1,3 +1,5 @@ advertisement-janidrobe-1 = Подходите и получите свою форму уборщика, одобренную унатхами-уборщиками всей корпорации! advertisement-janidrobe-2 = Мы поможем сохранить вашу чистоту, пока вы наводите чистоту в нечистотах! advertisement-janidrobe-3 = Стильный жёлтый! +advertisement-janidrobe-4 = Polish your appearance with JaniDrobe! +advertisement-janidrobe-5 = Shine like a shiny floor! diff --git a/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl index bdfad576fc8..8b6dabd7fbc 100644 --- a/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl +++ b/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl @@ -6,6 +6,7 @@ advertisement-lawdrobe-5 = Никто не превыше закона! advertisement-lawdrobe-6 = Нет, офицер, я не даю согласия на обыск! advertisement-lawdrobe-7 = Укол космическими наркотиками не оставляет улик! advertisement-lawdrobe-8 = Вы или ваш близкий пострадали от Nanotrasen? Как жаль! +advertisement-lawdrobe-9 = Case closed! Defendant has too much drip! thankyou-lawdrobe-1 = В таком костюме можно выиграть любое дело! thankyou-lawdrobe-2 = Приобретите один и для своего клиента! thankyou-lawdrobe-3 = Победа или поражение, вам заплатят в любом случае! diff --git a/Resources/Locale/ru-RU/advertisements/vending/medidrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/medidrobe.ftl index 0ebd9e0cc0a..b6a4ca13ec8 100644 --- a/Resources/Locale/ru-RU/advertisements/vending/medidrobe.ftl +++ b/Resources/Locale/ru-RU/advertisements/vending/medidrobe.ftl @@ -1,3 +1,4 @@ advertisement-medidrobe-1 = Заставьте эти кровавые пятна выглядеть модно!! advertisement-medidrobe-2 = Чистота и гигиена! Не оставляйте на себе слишком много кровавых пятен! advertisement-medidrobe-3 = В таком наряде вы будете выглядеть как профессиональный врач! +advertisement-medidrobe-4 = Jumpsuit, check. Coat, check. Someone who will wear this? Check! diff --git a/Resources/Locale/ru-RU/atmos/gas-miner-component.ftl b/Resources/Locale/ru-RU/atmos/gas-miner-component.ftl new file mode 100644 index 00000000000..c768fafc17b --- /dev/null +++ b/Resources/Locale/ru-RU/atmos/gas-miner-component.ftl @@ -0,0 +1,8 @@ +gas-miner-mines-text = It mines [color=lightgray]{ $gas }[/color] when active. +gas-miner-amount-text = It mines { $moles } moles of gas a second when active. +gas-miner-temperature-text = Mined gas temp: { $tempK }K ({ $tempC }°C). +gas-miner-moles-cutoff-text = Surrounding moles cutoff: { $moles } moles. +gas-miner-pressure-cutoff-text = Surrounding pressure cutoff: { $pressure } kPA. +gas-miner-state-working-text = The miner is [color=green]active[/color] and mining gas. +gas-miner-state-idle-text = The miner is [color=yellow]idle[/color] and not mining gas. +gas-miner-state-disabled-text = The miner is [color=red]disabled[/color] and not mining gas. diff --git a/Resources/Locale/ru-RU/clothing/components/cursed-mask.ftl b/Resources/Locale/ru-RU/clothing/components/cursed-mask.ftl new file mode 100644 index 00000000000..c93a6cfb87f --- /dev/null +++ b/Resources/Locale/ru-RU/clothing/components/cursed-mask.ftl @@ -0,0 +1,5 @@ +cursed-mask-examine-Neutral = It depicts an entirely unremarkable visage. +cursed-mask-examine-Joy = It depicts a face basking in joy. +cursed-mask-examine-Despair = It depicts a face wraught with despair. +cursed-mask-examine-Anger = It depicts a furious expression locked in rage. +cursed-mask-takeover-popup = The mask seizes control over your body! diff --git a/Resources/Locale/ru-RU/construction/conditions/min-health.ftl b/Resources/Locale/ru-RU/construction/conditions/min-health.ftl new file mode 100644 index 00000000000..daaddcf5720 --- /dev/null +++ b/Resources/Locale/ru-RU/construction/conditions/min-health.ftl @@ -0,0 +1,2 @@ +construction-examine-condition-low-health = First, repair it. +construction-step-condition-low-health = It must be repaired. diff --git a/Resources/Locale/ru-RU/contraband/contraband-severity.ftl b/Resources/Locale/ru-RU/contraband/contraband-severity.ftl new file mode 100644 index 00000000000..4e2f5f87d9f --- /dev/null +++ b/Resources/Locale/ru-RU/contraband/contraband-severity.ftl @@ -0,0 +1,8 @@ +contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color] +contraband-examine-text-Restricted = [color=yellow]This item is departmentally restricted.[/color] +contraband-examine-text-Restricted-department = [color=yellow]This item is restricted to { $departments }, and may be considered contraband.[/color] +contraband-examine-text-Major = [color=red]This item is considered major contraband.[/color] +contraband-examine-text-GrandTheft = [color=red]This item is a highly valuable target for Syndicate agents![/color] +contraband-examine-text-Syndicate = [color=crimson]This item is highly illegal Syndicate contraband![/color] +contraband-examine-text-avoid-carrying-around = [color=red][italic]You probably want to avoid visibly carrying this around without a good reason.[/italic][/color] +contraband-examine-text-in-the-clear = [color=green][italic]You should be in the clear to visibly carry this around.[/italic][/color] diff --git a/Resources/Locale/ru-RU/cuffs/components/handcuff-component.ftl b/Resources/Locale/ru-RU/cuffs/components/handcuff-component.ftl index ac64b2369a7..87fbf59e493 100644 --- a/Resources/Locale/ru-RU/cuffs/components/handcuff-component.ftl +++ b/Resources/Locale/ru-RU/cuffs/components/handcuff-component.ftl @@ -15,3 +15,4 @@ handcuff-component-cuff-interrupt-self-message = Вам помешали зак handcuff-component-cuff-interrupt-other-message = Вы помешали { $otherName } заковать вас! handcuff-component-cuff-interrupt-buckled-message = Вы не можете пристегнуться в наручниках! handcuff-component-cuff-interrupt-unbuckled-message = Вы не можете отстегнуться в наручниках! +handcuff-component-cannot-drop-cuffs = You are unable to put the restraints on { $target } diff --git a/Resources/Locale/ru-RU/datasets/figurines.ftl b/Resources/Locale/ru-RU/datasets/figurines.ftl index d3715851e1e..4ba570af142 100644 --- a/Resources/Locale/ru-RU/datasets/figurines.ftl +++ b/Resources/Locale/ru-RU/datasets/figurines.ftl @@ -24,7 +24,6 @@ figurines-musician-2 = Never gonna let you down! # figurines-boxer- figurines-captain-1 = Crew, the Nuke Disk is safely up my ass. -figurines-captain-2 = Glory to NT! figurines-hos-1 = Space law? What? figurines-hos-2 = Shot the clown. figurines-warden-1 = Execute him for breaking in! diff --git a/Resources/Locale/ru-RU/execution/execution.ftl b/Resources/Locale/ru-RU/execution/execution.ftl new file mode 100644 index 00000000000..8131eb1d71f --- /dev/null +++ b/Resources/Locale/ru-RU/execution/execution.ftl @@ -0,0 +1,16 @@ +execution-verb-name = Execute +execution-verb-message = Use your weapon to execute someone. + +# All the below localisation strings have access to the following variables +# attacker (the person committing the execution) +# victim (the person being executed) +# weapon (the weapon used for the execution) + +execution-popup-melee-initial-internal = You ready { THE($weapon) } against { $victim }'s throat. +execution-popup-melee-initial-external = { $attacker } readies { POSS-ADJ($attacker) } { $weapon } against the throat of { $victim }. +execution-popup-melee-complete-internal = You slit the throat of { $victim }! +execution-popup-melee-complete-external = { $attacker } slits the throat of { $victim }! +execution-popup-self-initial-internal = You ready { THE($weapon) } against your own throat. +execution-popup-self-initial-external = { $attacker } readies { POSS-ADJ($attacker) } { $weapon } against their own throat. +execution-popup-self-complete-internal = You slit your own throat! +execution-popup-self-complete-external = { $attacker } slits their own throat! diff --git a/Resources/Locale/ru-RU/forensics/forensics.ftl b/Resources/Locale/ru-RU/forensics/forensics.ftl index 042accd574f..c9d07d9a9ef 100644 --- a/Resources/Locale/ru-RU/forensics/forensics.ftl +++ b/Resources/Locale/ru-RU/forensics/forensics.ftl @@ -21,6 +21,7 @@ forensic-scanner-verb-text = Сканировать forensic-scanner-verb-message = Выполняется криминалистическое сканирование forensic-pad-fingerprint-name = владелец отпечатков: { $entity } forensic-pad-gloves-name = источник волокон: { $entity } +forensics-dna-unknown = unknown DNA forensics-verb-text = Счистить улики forensics-verb-message = Счистить отпечатки пальцев и остатки ДНК с объекта! forensics-cleaning = Вы начинаете счищать улики с { $target }... diff --git a/Resources/Locale/ru-RU/guidebook/guidebook.ftl b/Resources/Locale/ru-RU/guidebook/guidebook.ftl index df610c67e40..69152d7f4db 100644 --- a/Resources/Locale/ru-RU/guidebook/guidebook.ftl +++ b/Resources/Locale/ru-RU/guidebook/guidebook.ftl @@ -2,5 +2,7 @@ guidebook-window-title = Руководство guidebook-placeholder-text = Выберите запись. guidebook-placeholder-text-2 = Если вы новичок, то начните с записи "Новичок? Вам сюда!". guidebook-filter-placeholder-text = Фильтр +guidebook-parser-error = Parser Error +guidebook-error-message = Error Message guidebook-monkey-unspin = Отперевернуть обезьяну guidebook-monkey-disco = Диско обезьяна diff --git a/Resources/Locale/ru-RU/info/playerpanel.ftl b/Resources/Locale/ru-RU/info/playerpanel.ftl new file mode 100644 index 00000000000..d63131ef150 --- /dev/null +++ b/Resources/Locale/ru-RU/info/playerpanel.ftl @@ -0,0 +1,6 @@ +cmd-playerpanel-desc = Displays general information and actions for a player +cmd-playerpanel-help = Usage: playerpanel +cmd-playerpanel-server = This command cannot be run from the server +cmd-playerpanel-invalid-arguments = Invalid amount of arguments +cmd-playerpanel-invalid-player = Player not found +cmd-playerpanel-completion = diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index 35d1660add6..dd929259d47 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -46,6 +46,17 @@ job-name-ertjanitor = уборщик ОБР job-name-boxer = боксёр job-name-zookeeper = зоотехник job-name-visitor = посетитель +# unused jobs +# these are required for the agent ID job icon tooltips +# I am keeping them for roleplaying opportunities +job-name-geneticist = Geneticist +job-name-no-id = No ID +job-name-prisoner = Prisoner +job-name-roboticist = Roboticist +job-name-syndicate = Syndicate +job-name-unknown = Unknown +job-name-virologist = Virologist +job-name-zombie = Zombie # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = атмосферный техник JobBartender = бармен diff --git a/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl b/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl new file mode 100644 index 00000000000..402f6493623 --- /dev/null +++ b/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl @@ -0,0 +1,64 @@ +food-sequence-no-space = You can't put any more! +food-sequence-standart-gen = { $prefix }{ $content }{ $suffix } +#Burger +food-sequence-burger-suffix = burger +food-sequence-burger-content-raw-meat = raw +food-sequence-burger-content-carp = carpo +food-sequence-burger-content-bear = bear +food-sequence-burger-content-penguin = peng +food-sequence-burger-content-chiken = chiken +food-sequence-burger-content-duck = duck +food-sequence-burger-content-corgi = corgi +food-sequence-burger-content-crab = crabs +food-sequence-burger-content-goliath = goli +food-sequence-burger-content-dragon = dragon +food-sequence-burger-content-rat = rat +food-sequence-burger-content-lizard = lizzy +food-sequence-burger-content-plant = plant +food-sequence-burger-content-rotten = trash +food-sequence-burger-content-spider = web +food-sequence-burger-content-clump = clump +food-sequence-burger-content-snake = snake +food-sequence-burger-content-xeno = xeno +food-sequence-burger-content-tomato = tomato +food-sequence-burger-content-salami = salami +food-sequence-burger-content-clown = clown +food-sequence-burger-content-slime = slime +food-sequence-burger-content-pea = pea +food-sequence-burger-content-banana = banana +food-sequence-burger-content-mimana = mimana +food-sequence-burger-content-carrot = carro +food-sequence-burger-content-cabbage = cabba +food-sequence-burger-content-garlic = garli +food-sequence-burger-content-lemon = lemon +food-sequence-burger-content-orange = orange +food-sequence-burger-content-pineapple = pine +food-sequence-burger-content-potato = potato +food-sequence-burger-content-apple = apple +food-sequence-burger-content-cocoa = cocoa +food-sequence-burger-content-corn = corn +food-sequence-burger-content-onion = oni +food-sequence-burger-content-mushroom = shroom +food-sequence-burger-content-chili = chili +food-sequence-burger-content-chilly = chilly +food-sequence-burger-content-aloe = aloe +food-sequence-burger-content-poppy = poppy +food-sequence-burger-content-lily = lily +food-sequence-burger-content-ambrosia = ambro +food-sequence-burger-content-galaxy = galaxy +food-sequence-burger-content-glasstle = glass +food-sequence-burger-content-gatfruit = gat +food-sequence-burger-content-rice = rice +food-sequence-burger-content-soy = soy +food-sequence-burger-content-koibean = koi +food-sequence-burger-content-watermelon = water +food-sequence-burger-content-cannabis = funny +food-sequence-burger-content-rainbow-cannabis = FUNNY +food-sequence-burger-content-tobacco = tobaco +food-sequence-burger-content-cheese = cheese +food-sequence-burger-content-brain = brain +food-sequence-burger-content-tongue = tongue +food-sequence-burger-content-appendix = appendi +food-sequence-burger-content-ears = ear +food-sequence-burger-content-stomach = stomach +food-sequence-burger-content-liver = liver diff --git a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl index 20a5e7c6881..86475ac6ffd 100644 --- a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl @@ -157,5 +157,6 @@ loadout-group-paramedic-outerclothing = Парамедик, верхняя од loadout-group-paramedic-shoes = Парамедик, обувь # Wildcards loadout-group-reporter-jumpsuit = Репортёр, комбинезон +loadout-group-psychologist-jumpsuit = Psychologist jumpsuit loadout-group-boxer-jumpsuit = Боксёр, комбинезон loadout-group-boxer-gloves = Боксёр, перчатки diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl index 5fbf5a748a1..016ece40d87 100644 --- a/Resources/Locale/ru-RU/research/technologies.ftl +++ b/Resources/Locale/ru-RU/research/technologies.ftl @@ -19,6 +19,7 @@ research-technology-super-powercells = Супербатареи research-technology-bluespace-storage = Блюспейс-хранилище research-technology-portable-fission = Портативный распад research-technology-space-scanning = Сканирование космоса +research-technology-excavation = Mass Excavation research-technology-biochemical-stasis = Биохимический стазис research-technology-mechanized-treatment = Механизированная подготовка research-technology-bluespace-chemistry = Блюспейс-химия @@ -43,7 +44,6 @@ research-technology-alternative-research = Альтернативные иссл research-technology-magnets-tech = Локализованный магнетизм research-technology-advanced-parts = Продвинутые компоненты research-technology-anomaly-harnessing = Применение ядер аномалий -research-technology-grappling = Технология захвата research-technology-abnormal-artifact-manipulation = Переработка артефактов research-technology-gravity-manipulation = Манипулирование гравитацией research-technology-quantum-leaping = Квантовые скачки diff --git a/Resources/Locale/ru-RU/shell.ftl b/Resources/Locale/ru-RU/shell.ftl index 1c2169249ef..9f3942a3917 100644 --- a/Resources/Locale/ru-RU/shell.ftl +++ b/Resources/Locale/ru-RU/shell.ftl @@ -3,7 +3,6 @@ ## General -shell-server-cannot = Сервер не может выполнить это. shell-command-success = Команда выполнена. shell-invalid-command = Неверная команда. shell-invalid-command-specific = Неверная команда { $commandName }. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl index 151d176ebf3..e884aa3704a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl @@ -22,8 +22,6 @@ ent-ActionActivateScramImplant = УДРАТЬ! .desc = Случайным образом телепортирует вас на большое расстояние. ent-ActionActivateDnaScramblerImplant = Перемешать ДНК .desc = Меняет ваше имя и внешность случайным образом. -ent-ActionMorphGeras = Превратиться в Герас - .desc = Превращает вас в герас - уменьшенную версию вас, позволяющую быстро передвигаться ценой потери инвентаря. ent-ActionToggleSuitPiece = Переключить элементы костюма .desc = Не забудьте экипировать важные части костюма, прежде чем приступать к действиям. ent-ActionCombatModeToggle = [color=red]Боевой режим[/color] diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl index 608666acd0e..845a71a6594 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl @@ -6,8 +6,6 @@ ent-ClothingUniformJumpskirtElegantMaid = элегантная форма гор .desc = Назови меня хозяином и принеси пивчански. ent-ClothingUniformColorJumpskirtRainbow = радужная юбка-комбинезон .desc = Разноцветная юбка-комбинезон! -ent-ClothingUniformJumpskirtPsychologist = юбка-костюм психолога - .desc = Я не теряю вещи. Я кладу вещи в места, которые потом ускользают от меня. ent-ClothingUniformJumpskirtSchool = школьная юбка .desc = Стильная и удобная школьная юбка. ent-ClothingUniformJumpskirtCapTurtleneck = юбка-водолазка капитана diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/specific.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/specific.ftl index acfa982db6f..359866c2dbc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/specific.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/specific.ftl @@ -6,3 +6,5 @@ ent-ClothingMaskGasVoiceChameleon = { ent-ClothingMaskGasChameleon } .desc = { ent-ClothingMaskGasChameleon.desc } ent-ClothingMaskWeldingGas = сварочный противогаз .desc = Противогаз со встроенными сварочными очками и лицевым щитком. Выглядит как череп, однозначно разработка какого-то задрота. +ent-ClothingMaskGoldenCursed = golden mask + .desc = Previously used in strange pantomimes, after one of the actors went mad on stage these masks have avoided use. You swear its face contorts when you're not looking. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl index 768dc0219df..d852fc28e9a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl @@ -126,3 +126,5 @@ ent-ClothingUniformJumpskirtOldDress = старое платье .desc = Очень старое поношенное платье. ent-ClothingUniformJumpskirtMusician = юбка музыканта .desc = Модная юбка для музыкально настроенных людей. Идеально подойдёт для любого выступления в стиле лаунж! +ent-ClothingUniformJumpskirtPsychologist = psychologist suitskirt + .desc = I don't lose things. I place things in locations which later elude me. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl index 46c4c7f7cec..7313b528da1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl @@ -2,8 +2,6 @@ ent-BaseMobAdultSlimes = базовый слайм .desc = Он так похож на желе. Интересно, каков он на вкус? ent-MobAdultSlimes = базовый слайм .desc = Он так похож на желе. Интересно, каков он на вкус? -ent-MobSlimesGeras = герас - .desc = Слайм-герас - ироничное название, не правда ли? ent-MobAdultSlimesBlue = синий слайм .desc = { ent-MobAdultSlimes.desc } ent-MobAdultSlimesBlueAngry = синий слайм diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/base_contraband.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/base_contraband.ftl new file mode 100644 index 00000000000..9f3ad05f2e6 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/base_contraband.ftl @@ -0,0 +1,24 @@ +ent-BaseSyndicateContraband = { "" } + .desc = { "" } +ent-BaseMinorContraband = { "" } + .desc = { "" } +ent-BaseMajorContraband = { "" } + .desc = { "" } +ent-BaseRestrictedContraband = { "" } + .desc = { "" } +ent-BaseCommandContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseSecurityCommandContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseSecurityScienceCommandContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseEngineeringContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseScienceContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseSecurityCargoContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseCargoContraband = { ent-BaseRestrictedContraband } + .desc = { ent-BaseRestrictedContraband.desc } +ent-BaseGrandTheftContraband = { "" } + .desc = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/burger.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/burger.ftl index 06737b7b374..1d967e40f3d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/burger.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/burger.ftl @@ -1,5 +1,9 @@ ent-FoodBreadBun = булочка .desc = Булочка для гамбургера. Круглая и удобная для удержания чего-то. +ent-FoodBreadBunBottom = bottom bun + .desc = It's time to start building the burger tower. +ent-FoodBreadBunTop = top bun + .desc = the perfect finish for your burger tower ent-FoodBurgerBase = { ent-FoodInjectableBase } .desc = { ent-FoodInjectableBase.desc } ent-FoodBurgerJelly = желейный бургер diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl index c07383b57d5..63923316561 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl @@ -56,6 +56,8 @@ ent-FoodCakeBatter = тесто для торта .desc = Приготовьте его, чтобы получить торт. ent-FoodButter = брусок сливочного масла .desc = Брусок вкусного, золотистого, жирного лакомства. +ent-FoodButterSlice = butter slice + .desc = A pat of delicious, golden, fatty goodness. ent-FoodCannabisButter = брусок конопляного масла .desc = Добавляйте это в свою любимую выпечку для весёлого времяпровождения. ent-FoodCheese = головка сыра diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl index db6b597375a..f18a8d92aa4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl @@ -1,5 +1,7 @@ ent-BasePlushie = { ent-BaseItem } .desc = { ent-BaseItem.desc } +ent-PlushieThrongler = The Throngler plushie + .desc = A stuffed toy to remind cargo techs of what they can no longer have. ent-PlushieGhost = плюшевый призрак .desc = Начало вашей собственной БАНДЫ ПРИЗРАКОВ! ent-PlushieGhostRevenant = плюшевый ревенант diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl new file mode 100644 index 00000000000..1bc2237ed9f --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl @@ -0,0 +1,45 @@ +ent-BaseScrap = scrap + .desc = Worthless junk. You could probably get some materials out of it though. + .suffix = Scrap +ent-ScrapSteel = blasted steel pile + .desc = An pile of steel welded together in extreme heat. It's of a decent size overall; you could probably get a fair amount of sheets out of it. +ent-ScrapGlass = scrap circuitry + .desc = A huge lump of various circuits, strangely fused together. You could likely extract some materials out of this. +ent-ScrapAirlock1 = airlock door + .desc = This used to keep air in. Now it doesn't seem to be doing anything at all. +ent-ScrapAirlock2 = airlock light + .desc = Serves it right for flashing red all those times. +ent-ScrapBucket = busted bucket + .desc = Dear god... +ent-ScrapCamera = broken camera + .desc = It might still be watching. +ent-ScrapCanister1 = canister handle + .desc = Helpful for holding a canister. Now you just need the actual canister part. +ent-ScrapCanister2 = canister valve + .desc = A valve from a gas canister. +ent-ScrapCloset = closet door + .desc = A blown off door from a maintenance closet. Looks like a nice piece of wall decor. +ent-ScrapFaxMachine = fax machine + .desc = The unfortunate result of one too many ASCII arts being sent to Central Command. +ent-ScrapFireExtinguisher = split fire extinguisher + .desc = The large gash down the center makes you worry for the previous user. +ent-ScrapFirelock1 = firelock door + .desc = At least you still know what it's meant for. +ent-ScrapFirelock2 = firelock door + .desc = OH! That's where the other half went! +ent-ScrapFirelock3 = firelock frame + .desc = { ent-BaseScrap.desc } +ent-ScrapIntercom = intercom scrap + .desc = You wish it at least came with some encryption keys. +ent-ScrapJetpack = busted jetpack + .desc = Looks like it won't be flying any more. +ent-ScrapMedkit = snapped medkit + .desc = Hopefully they got some use out of it. +ent-ScrapMopBucket = half a mop bucket + .desc = Tiders die. Janitors survive. +ent-ScrapPAI = personal ai device + .desc = A buddy! You still in there? Hello? Buddy??? +ent-ScrapPAIGold = gilded personal ai device + .desc = Wow! What a one-in-a-million find! This would be worth a fortune... if it was in good condition. +ent-ScrapTube = shattered sample tube + .desc = A glass tube containing some kind of rare sample. Or at least, it used to contain it. Not much left in there now. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl new file mode 100644 index 00000000000..db1c04bdd6f --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl @@ -0,0 +1,12 @@ +ent-BaseCrowbar = crowbar + .desc = { ent-BaseItem.desc } +ent-Crowbar = { ent-BaseCrowbar } + .desc = A multipurpose tool to pry open doors and fight interdimensional invaders. +ent-CrowbarRed = emergency crowbar + .desc = A pocket crowbar designed to pry open doors and firelocks during power outages. +ent-CrowbarGreen = { ent-BaseCrowbar } + .desc = A multipurpose tool to pry open doors and fight interdimensional invaders, printed from an autolathe. +ent-CrowbarOrange = { ent-BaseCrowbar } + .desc = A multipurpose tool to pry open doors and fight interdimensional invaders, found in toolboxes. +ent-CrowbarYellow = { ent-BaseCrowbar } + .desc = A pocket crowbar designed to pry open doors and firelocks during power outages, dispensed from Engineering. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/thief_beacon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/thief_beacon.ftl new file mode 100644 index 00000000000..9973008f80b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/thief_beacon.ftl @@ -0,0 +1,2 @@ +ent-ThiefBeacon = thieving beacon + .desc = A device that will teleport everything around it to the thief's vault at the end of the shift. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/tools.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/tools.ftl index dd23e19450b..beb2a8c3aab 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/tools.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/tools.ftl @@ -4,10 +4,6 @@ ent-Screwdriver = отвёртка .desc = Крутящий момент промышленного класса в небольшом корпусе отвёртки. ent-Wrench = гаечный ключ .desc = Главный инструмент для откручивания и крепления чего бы то ни было куда-нибудь. -ent-Crowbar = монтировка - .desc = Многофункциональный инструмент для открывания дверей и борьбы с межпространственными захватчиками. -ent-CrowbarRed = аварийная монтировка - .desc = { ent-Crowbar.desc } ent-Multitool = мультитул .desc = Современный инструмент для копирования, хранения и передачи электрических импульсов и сигналов по проводам и машинам. ent-NetworkConfigurator = конфигуратор сетей diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl index 70b09027fa9..e127855c1e9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl @@ -1,3 +1,9 @@ +ent-Pickaxe = pickaxe + .desc = Notched to perfection, for jamming it into rocks. +ent-MiningDrill = mining drill + .desc = Powerful tool used to quickly drill through rocks. +ent-MiningDrillDiamond = diamond tipped mining drill + .desc = A significantly more efficient mining drill tipped with diamond. ent-BaseWeaponCrusher = крушитель .desc = Ранняя версия протокинетического ускорителя. ent-WeaponCrusher = { ent-BaseWeaponCrusher } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/pickaxe.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/pickaxe.ftl deleted file mode 100644 index b94e7987822..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/pickaxe.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-Pickaxe = кирка - .desc = Зазубренная до совершенства, чтобы вбивать её в камни. -ent-MiningDrill = шахтёрский бур - .desc = Мощный инструмент, служащий для быстрого бурения горных пород. diff --git a/Resources/Locale/ru-RU/storage/components/secret-stash-component.ftl b/Resources/Locale/ru-RU/storage/components/secret-stash-component.ftl index a860b3d7279..223d426525c 100644 --- a/Resources/Locale/ru-RU/storage/components/secret-stash-component.ftl +++ b/Resources/Locale/ru-RU/storage/components/secret-stash-component.ftl @@ -1,10 +1,19 @@ ### Secret stash component. Stuff like potted plants, comfy chair cushions, etc... -comp-secret-stash-secret-part-name = { $name } comp-secret-stash-action-hide-success = Вы спрятали { $item } в { $this } comp-secret-stash-action-hide-container-not-empty = Здесь уже что-то есть?! comp-secret-stash-action-hide-item-too-big = { $item } слишком большой, чтобы поместиться в { $stash }! comp-secret-stash-action-get-item-found-something = Внутри { $stash } что-то было! +comp-secret-stash-on-destroyed-popup = Something falls out of the the { $stashname }! comp-secret-stash-on-examine-found-hidden-item = Внутри что-то спрятано. -secret-stash-part-plant = растение -secret-stash-part-toilet = бачок унитаза +comp-secret-stash-verb-insert-into-stash = Stash item +comp-secret-stash-verb-insert-message-item-already-inside = There is already an item inside the { $stashname }. +comp-secret-stash-verb-insert-message-no-item = Hide { THE($item) } in the { $stashname }. +comp-secret-stash-verb-take-out-item = Grab item +comp-secret-stash-verb-take-out-message-something = Take the contents of the { $stashname } out. +comp-secret-stash-verb-take-out-message-nothing = There is nothing inside the { $stashname }. +comp-secret-stash-verb-close = Close +comp-secret-stash-verb-cant-close = You can't close the { $stashname } with that. +comp-secret-stash-verb-open = Open +secret-stash-plant = plant +secret-stash-toilet = toilet cistern diff --git a/Resources/Locale/ru-RU/thief/beacon.ftl b/Resources/Locale/ru-RU/thief/beacon.ftl new file mode 100644 index 00000000000..33749f4f3b8 --- /dev/null +++ b/Resources/Locale/ru-RU/thief/beacon.ftl @@ -0,0 +1,6 @@ +thief-fulton-set = Delivery coordinates are set. +thief-fulton-clear = Delivery coordinates cleared. +thief-fulton-examined-set = Coordinates entered. Bluespace teleportation of the nearest objects will be performed when the evacuation shuttle departs. +thief-fulton-examined-unset = Beacon coordinates are not set. +thief-fulton-verb-text = Set coordinates +thief-fulton-verb-message = Set the coordinates of your thief's hideout, where all nearby items will be sent at the end of the round. diff --git a/Resources/Locale/ru-RU/tools/components/tool-openable-component.ftl b/Resources/Locale/ru-RU/tools/components/tool-openable-component.ftl new file mode 100644 index 00000000000..6d1e23b035f --- /dev/null +++ b/Resources/Locale/ru-RU/tools/components/tool-openable-component.ftl @@ -0,0 +1,5 @@ +tool-openable-component-examine-closed = The { $name } is closed. +tool-openable-component-examine-opened = The { $name } is open. +tool-openable-component-verb-close = Close +tool-openable-component-verb-open = Open +tool-openable-component-verb-cant-close = You can't close the { $name } with that. From a53dcce6b3c86c128fd785b284158823f6d118e5 Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Date: Mon, 12 Aug 2024 18:46:37 +0300 Subject: [PATCH 12/15] [Maps] Delta nitrogen fix (#2482) --- Resources/Maps/corvax_delta.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Maps/corvax_delta.yml b/Resources/Maps/corvax_delta.yml index 9a25d9acbc4..65b8d299ae4 100644 --- a/Resources/Maps/corvax_delta.yml +++ b/Resources/Maps/corvax_delta.yml @@ -148133,6 +148133,9 @@ entities: - type: Transform pos: -71.5,37.5 parent: 2 + - type: GasMiner + spawnAmount: 1200 + maxExternalPressure: 15000 - proto: GasMinerOxygenStation entities: - uid: 39088 From 66591d52e0ae88792c646edc26b1bc045d309a6b Mon Sep 17 00:00:00 2001 From: lapatison <100279397+lapatison@users.noreply.github.com> Date: Mon, 12 Aug 2024 19:20:41 +0300 Subject: [PATCH 13/15] Translate Upstream #2466 (#2478) --- .../game-presets/preset-traitor.ftl | 8 +++--- .../guidebook/chemistry/statuseffects.ftl | 4 +-- .../Locale/ru-RU/job/role-requirements.ftl | 26 +++++++++---------- Resources/Locale/ru-RU/mapping/editor.ftl | 12 ++++----- .../ru-RU/nutrition/nutrition-commands.ftl | 20 +++++++------- .../power/components/radiation-collector.ftl | 18 ++++++++----- .../ru-RU/preferences/loadout-groups.ftl | 2 +- .../Locale/ru-RU/reagents/meta/medicine.ftl | 8 +++--- .../entities/clothing/head/hoods.ftl | 22 ++++++++-------- .../clothing/outerclothing/wintercoats.ftl | 22 ++++++++-------- .../entities/markers/spawners/mobs.ftl | 2 +- .../circuitboards/machine/production.ftl | 4 +-- .../entities/objects/misc/paper.ftl | 12 ++++----- .../objects/specific/medical/healing.ftl | 8 +++--- .../entities/structures/machines/lathe.ftl | 2 +- .../entities/structures/walls/walls.ftl | 4 +-- Resources/Locale/ru-RU/thief/backpack.ftl | 6 +++-- .../ru-RU/traitor/traitor-codes-component.ftl | 6 ++--- 18 files changed, 96 insertions(+), 90 deletions(-) diff --git a/Resources/Locale/ru-RU/game-ticking/game-presets/preset-traitor.ftl b/Resources/Locale/ru-RU/game-ticking/game-presets/preset-traitor.ftl index 359221f4d90..27ee3c84d7e 100644 --- a/Resources/Locale/ru-RU/game-ticking/game-presets/preset-traitor.ftl +++ b/Resources/Locale/ru-RU/game-ticking/game-presets/preset-traitor.ftl @@ -22,17 +22,17 @@ traitor-death-match-end-round-description-entry = КПК { $originalName }, с { # TraitorRole traitor-role-greeting = - Вы - агент организации { $corporation } на задании Синдиката. + Вы - агент организации { $corporation } на задании [color = darkred]Синдиката.[/color]. Ваши цели и кодовые слова перечислены в меню персонажа. Воспользуйтесь аплинком, встроенным в ваш КПК, чтобы приобрести всё необходимое для выполнения работы. Смерть Nanotrasen! traitor-role-codewords = - Кодовые слова следующие: - { $codewords } + Кодовые слова следующие: [color = lightgray] + { $codewords }.[/color] Кодовые слова можно использовать в обычном разговоре, чтобы незаметно идентифицировать себя для других агентов Синдиката. Прислушивайтесь к ним и храните их в тайне. traitor-role-uplink-code = - Установите рингтон Вашего КПК на { $code } чтобы заблокировать или разблокировать аплинк. + Установите рингтон Вашего КПК на [color = lightgray]{ $code }[/color] чтобы заблокировать или разблокировать аплинк. Не забудьте заблокировать его и сменить код, иначе кто угодно из экипажа станции сможет открыть аплинк! # don't need all the flavour text for character menu traitor-role-codewords-short = diff --git a/Resources/Locale/ru-RU/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/ru-RU/guidebook/chemistry/statuseffects.ftl index eace3407fdb..3b52efd2691 100644 --- a/Resources/Locale/ru-RU/guidebook/chemistry/statuseffects.ftl +++ b/Resources/Locale/ru-RU/guidebook/chemistry/statuseffects.ftl @@ -11,5 +11,5 @@ reagent-effect-status-effect-PressureImmunity = невосприимчивост reagent-effect-status-effect-Pacified = принудительный пацифизм reagent-effect-status-effect-RatvarianLanguage = паттерны ратварского языка reagent-effect-status-effect-StaminaModifier = модифицированная выносливость -reagent-effect-status-effect-RadiationProtection = radiation protection -reagent-effect-status-effect-Drowsiness = drowsiness +reagent-effect-status-effect-RadiationProtection = защита от радиации +reagent-effect-status-effect-Drowsiness = сонливость diff --git a/Resources/Locale/ru-RU/job/role-requirements.ftl b/Resources/Locale/ru-RU/job/role-requirements.ftl index 229c66a5e92..aa0145a4d26 100644 --- a/Resources/Locale/ru-RU/job/role-requirements.ftl +++ b/Resources/Locale/ru-RU/job/role-requirements.ftl @@ -1,13 +1,13 @@ -role-timer-department-insufficient = You require [color=yellow]{ TOSTRING($time, "0") }[/color] more minutes of [color={ $departmentColor }]{ $department }[/color] department playtime to play this role. -role-timer-department-too-high = You require [color=yellow]{ TOSTRING($time, "0") }[/color] fewer minutes in [color={ $departmentColor }]{ $department }[/color] department to play this role. (Are you trying to play a trainee role?) -role-timer-overall-insufficient = You require [color=yellow]{ TOSTRING($time, "0") }[/color] more minutes of playtime to play this role. -role-timer-overall-too-high = You require [color=yellow]{ TOSTRING($time, "0") }[/color] fewer minutes of playtime to play this role. (Are you trying to play a trainee role?) -role-timer-role-insufficient = You require [color=yellow]{ TOSTRING($time, "0") }[/color] more minutes with [color={ $departmentColor }]{ $job }[/color] to play this role. -role-timer-role-too-high = You require[color=yellow] { TOSTRING($time, "0") }[/color] fewer minutes with [color={ $departmentColor }]{ $job }[/color] to play this role. (Are you trying to play a trainee role?) -role-timer-age-to-old = Your character must be under the age of [color=yellow]{ $age }[/color] to play this role. -role-timer-age-to-young = Your character must be over the age of [color=yellow]{ $age }[/color] to play this role. -role-timer-whitelisted-species = Your character must be one of the following species to play this role: -role-timer-blacklisted-species = Your character must not be one of the following species to play this role: -role-timer-locked = Locked (hover for details) -role-timer-department-unknown = Unknown Department -role-ban = You have been banned from this role. +role-timer-department-insufficient = Требуется ещё [color=yellow]{ TOSTRING($time, "0") }[/color] минут игры за [color={ $departmentColor }]{ $department }[/color]. +role-timer-department-too-high = Требуется на [color=yellow]{ TOSTRING($time, "0") }[/color] меньше минут игры за [color={ $departmentColor }]{ $department }[/color]. (Вы пытаетесь играть за роль для новичков?) +role-timer-overall-insufficient = Требуется ещё [color=yellow]{ TOSTRING($time, "0") }[/color] минут общего игрового времени. +role-timer-overall-too-high = Требуется на [color=yellow]{ TOSTRING($time, "0") }[/color] меньше минут общего игрового времени. (Вы пытаетесь играть за роль для новичков?) +role-timer-role-insufficient = Требуется ещё [color=yellow]{ TOSTRING($time, "0") }[/color] минут игры в качестве [color={ $departmentColor }]{ $job }[/color] для этой роли. +role-timer-role-too-high = Требуется на [color=yellow]{ TOSTRING($time, "0") }[/color] меньше минут игры в качестве [color={ $departmentColor }]{ $job }[/color] для этой роли. (Вы пытаетесь играть за роль для новичков?) +role-timer-age-to-old = Ваш персонаж должен быть моложе [color=yellow]{ $age }[/color] для этой роли. +role-timer-age-to-young = Ваш персонаж должен быть старше [color=yellow]{ $age }[/color] для этой роли. +role-timer-whitelisted-species = Ваш персонаж должен быть одной из следующих рас для этой роли: +role-timer-blacklisted-species = Ваш персонаж не должен быть одной из следующих рас для этой роли: +role-timer-locked = Закрыто (наведите курсор для подробностей) +role-timer-department-unknown = Неизвестный отдел +role-ban = Эта должность для вас заблокирована. diff --git a/Resources/Locale/ru-RU/mapping/editor.ftl b/Resources/Locale/ru-RU/mapping/editor.ftl index c76186555eb..f702e28f3c0 100644 --- a/Resources/Locale/ru-RU/mapping/editor.ftl +++ b/Resources/Locale/ru-RU/mapping/editor.ftl @@ -1,6 +1,6 @@ -mapping-entities = Entities -mapping-tiles = Tiles -mapping-decals = Decals -mapping-replace = Replace -mapping-erase-entity = Erase Entity -mapping-erase-decal = Erase Decal +mapping-entities = Сущности +mapping-tiles = Плитки +mapping-decals = Декали +mapping-replace = Заменить +mapping-erase-entity = Стереть сущность +mapping-erase-decal = Стереть декаль diff --git a/Resources/Locale/ru-RU/nutrition/nutrition-commands.ftl b/Resources/Locale/ru-RU/nutrition/nutrition-commands.ftl index 7246091b315..81bcb69df5c 100644 --- a/Resources/Locale/ru-RU/nutrition/nutrition-commands.ftl +++ b/Resources/Locale/ru-RU/nutrition/nutrition-commands.ftl @@ -1,10 +1,10 @@ -cmd-nutrition-error-player = You cannot use this command unless you are a player. -cmd-nutrition-error-entity = You cannot use this command without an entity. -cmd-nutrition-error-component = Your entity does not have a { $comp } component. -cmd-hungry-desc = makes you hungry -cmd-hungry-help = sets your hungry level to starving -cmd-setnutrit-desc = modify hunger and thirst -cmd-setnutrit-help = set your hunger or thirst to one of the built-in thresholds -cmd-setnutrit-error-invalid-threshold = invalid { $thresholdType } `{ $thresholdString }` -cmd-thirsty-desc = makes you thirsty -cmd-thirsty-help = sets your thirst level to partched +cmd-nutrition-error-player = Вы не можете использовать эту команду, если не являетесь игроком. +cmd-nutrition-error-entity = Вы не можете использовать эту команду без сущности. +cmd-nutrition-error-component = У вашей сущности отсутствует компонент { $comp }. +cmd-hungry-desc = вызвать голод +cmd-hungry-help = устанавливает уровень сытости на Голодание +cmd-setnutrit-desc = изменить сытость и жажду +cmd-setnutrit-help = устанавливает голод или жажду на один из заданных порогов +cmd-setnutrit-error-invalid-threshold = некорректный { $thresholdType } `{ $thresholdString }` +cmd-thirsty-desc = вызвать жажду +cmd-thirsty-help = устанавливает уровень жажды на Засуха diff --git a/Resources/Locale/ru-RU/power/components/radiation-collector.ftl b/Resources/Locale/ru-RU/power/components/radiation-collector.ftl index 12d9aacb652..437be1072a6 100644 --- a/Resources/Locale/ru-RU/power/components/radiation-collector.ftl +++ b/Resources/Locale/ru-RU/power/components/radiation-collector.ftl @@ -1,7 +1,11 @@ -power-radiation-collector-gas-tank-missing = [color=red]Газовый баллон не подключен.[/color] -power-radiation-collector-gas-tank-present = Газовый баллон [color=darkgreen]подключён[/color]. -power-radiation-collector-enabled = - It's switched [color={ $state -> - [true] darkgreen]on - *[false] darkred]off - }[/color]. +power-radiation-collector-gas-tank-missing = Выемка для баллона с плазмой [color=darkred]пустует[/color]. +power-radiation-collector-gas-tank-present = Выемка для баллона с плазмой [color=darkgreen]заполнена[/color] и индикатор баллона находится на отметке [color={$fullness -> + *[0]red]пусто + [1]red]мало + [2]yellow]заполнено наполовину + [3]lime]заполнено +}[/color]. +power-radiation-collector-enabled = Находится в режиме [color={$state -> + [true] darkgreen]вкл + *[false] darkred]выкл +}[/color]. diff --git a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl index 86475ac6ffd..d9eb8b82300 100644 --- a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl @@ -13,7 +13,7 @@ loadout-group-survival-security = Аварийный запас охраны loadout-group-survival-syndicate = Github заставил меня перевести текст, который игрок вообще никогда не сможет увидеть, спасите loadout-group-breath-tool = Расозависимое дыхательное снаряжение loadout-group-tank-harness = Расозависимое снаряжение для выживания -loadout-group-EVA-tank = Species-specific gas tank +loadout-group-EVA-tank = Расозависимый газовый баллон # Command loadout-group-captain-head = Капитан, голова loadout-group-captain-jumpsuit = Капитан, комбинезон diff --git a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl index 06d267d715f..359d42a5c3a 100644 --- a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl @@ -94,7 +94,7 @@ reagent-name-mannitol = маннитол reagent-desc-mannitol = Эффективно устраняет повреждения мозга. reagent-name-psicodine = псикодин reagent-desc-psicodine = Подавляет тревожность и прочие различные формы психических расстройств. Передозировка вызывает галлюцинации и незначительные повреждения токсинами. -reagent-name-potassium-iodide = potassium iodide -reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by 90%. Prophylactic use only. -reagent-name-haloperidol = haloperidol -reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness. +reagent-name-potassium-iodide = иодид калия +reagent-desc-potassium-iodide = Снижает разрушительное воздействие радиации на 90%. Используется только в профилактических целях. +reagent-name-haloperidol = галоперидол +reagent-desc-haloperidol = Выводит из организма большинство стимулирующих и галлюциногенных препаратов. Уменьшает наркотический эффект и дрожание. Вызывает сонливость. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hoods.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hoods.ftl index e3b6a26ad8f..c832822a63b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hoods.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hoods.ftl @@ -84,25 +84,25 @@ ent-ClothingHeadHatHoodWinterWarden = капюшон зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterWeb = капюшон паутинной зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorBlack = black winter coat hood +ent-ClothingHeadHatHoodWinterColorBlack = капюшон чёрной зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorPurple = purple winter coat hood +ent-ClothingHeadHatHoodWinterColorPurple = капюшон фиолетовой зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorRed = red winter coat hood +ent-ClothingHeadHatHoodWinterColorRed = капюшон красной зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorBlue = blue winter coat hood +ent-ClothingHeadHatHoodWinterColorBlue = капюшон синей зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorBrown = brown winter coat hood +ent-ClothingHeadHatHoodWinterColorBrown = капюшон коричневой зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorGray = gray winter coat hood +ent-ClothingHeadHatHoodWinterColorGray = капюшон серой зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorGreen = green winter coat hood +ent-ClothingHeadHatHoodWinterColorGreen = капюшон зелёной зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorLightBrown = light brown winter coat hood +ent-ClothingHeadHatHoodWinterColorLightBrown = капюшон светло-коричневой зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorOrange = orange winter coat hood +ent-ClothingHeadHatHoodWinterColorOrange = капюшон оранжевой зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorWhite = white winter coat hood +ent-ClothingHeadHatHoodWinterColorWhite = капюшон белой зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterColorYellow = yellow winter coat hood +ent-ClothingHeadHatHoodWinterColorYellow = капюшон жёлтой зимней куртки .desc = { ent-ClothingHeadHatHoodWinterBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl index fdc0943e919..837e80e67f3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl @@ -70,25 +70,25 @@ ent-ClothingOuterWinterMusician = зимняя куртка музыканта .desc = Безразмерный пластилиновый космический фрак, который заставит людей спрашивать: "Вы меня знаете?". ent-ClothingOuterWinterWeb = паутинная зимняя куртка .desc = Даёт ощущение, словно вы внутри кокона, не то чтобы из-за этого вам стало менее страшно оказаться в настоящем. -ent-ClothingOuterWinterColorBlack = black winter coat +ent-ClothingOuterWinterColorBlack = чёрная зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterColorPurple = purple winter coat +ent-ClothingOuterWinterColorPurple = фиолетовая зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterColorRed = red winter coat +ent-ClothingOuterWinterColorRed = красная зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterColorBlue = blue winter coat +ent-ClothingOuterWinterColorBlue = синяя зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterColorBrown = brown winter coat +ent-ClothingOuterWinterColorBrown = коричневая зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterColorGray = gray winter coat +ent-ClothingOuterWinterColorGray = серая зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterColorGreen = green winter coat +ent-ClothingOuterWinterColorGreen = зелёная зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterColorLightBrown = light brown winter coat +ent-ClothingOuterWinterColorLightBrown = светло-коричневая зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterColorOrange = orange winter coat +ent-ClothingOuterWinterColorOrange = оранжевая зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterColorWhite = white winter coat +ent-ClothingOuterWinterColorWhite = белая зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterColorYellow = yellow winter coat +ent-ClothingOuterWinterColorYellow = жёлтая зимняя куртка .desc = { ent-ClothingOuterWinterCoatToggleable.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl index e766e7f03f1..5e7017da430 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl @@ -120,5 +120,5 @@ ent-SpawnMobLuminousEntity = спавнер светящаяся сущност .desc = { ent-MarkerBase.desc } ent-SpawnClownSpider = спавнер клоун-паук .desc = { ent-MarkerBase.desc } -ent-SpawnHonkBot = honk bot spawner +ent-SpawnHonkBot = спавнер хонкбот .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl index 5f2cb8bf933..fa708f2bcf6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl @@ -6,8 +6,8 @@ ent-ProtolatheMachineCircuitboard = протолат (машинная плат .desc = { ent-BaseMachineCircuitboard.desc } ent-ProtolatheHyperConvectionMachineCircuitboard = гиперконвекционный протолат (машинная плата) .desc = Печатная плата гиперконвекционного протолата. -ent-BiofabricatorMachineCircuitboard = биофабрикатор (машинная плата) - .desc = Печатная плата биофабрикатора. +ent-BiofabricatorMachineCircuitboard = фабрикатор биокубов (машинная плата) + .desc = Печатная плата фабрикатора биокубов. ent-SecurityTechFabCircuitboard = охранный ТехФаб (машинная плата) .desc = Печатная плата охранного ТехФаба. ent-AmmoTechFabCircuitboard = ТехФаб патронов (машинная плата) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl index 95d6411ff58..d3710837455 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl @@ -53,11 +53,11 @@ ent-BoxFolderCentComClipboard = планшет Центком .desc = Роскошный планшет, обитый зелёным бархатом. Представители Центком часто носят его с собой, но редко используют. ent-BoxFolderQmClipboard = цифровой планшет заявок .desc = Громоздкий цифровой планшет, содержащий информацию о поставках и финансовых операциях. При таком количестве компрометирующих документов его следует беречь. -ent-TraitorCodePaper = syndicate codeword - .desc = A leaked codeword to possibly get in touch with the Syndicate. - .suffix = DO NOT MAP -ent-AllTraitorCodesPaper = syndicate codewords registry - .desc = A registry of all active Syndicate codewords. - .suffix = Admeme +ent-TraitorCodePaper = кодовое слово синдиката + .desc = Раскрытое кодовое слово, с помощью которого можно связаться с Синдикатом. + .suffix = НЕ МАППИТЬ +ent-AllTraitorCodesPaper = реестр кодовых слов Синдиката + .desc = Реестр всех активных кодовых слов Синдиката. + .suffix = Адмемы ent-Envelope = конверт .desc = Небольшой конверт для защиты от посторонних глаз ваших конфиденциальных документов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl index 94a8575e6fa..3325d27323c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl @@ -70,11 +70,11 @@ ent-PillHyronalin = таблетка ent-PillCanisterHyronalin = баночка для таблеток .suffix = Хироналин 10 ед, 5 шт .desc = { ent-PillCanister.desc } -ent-PillPotassiumIodide = pill - .suffix = Potassium iodide 10u +ent-PillPotassiumIodide = таблетка + .suffix = Иодид калия 10 ед .desc = { ent-Pill.desc } -ent-PillCanisterPotassiumIodide = pill canister - .suffix = Potassium iodide 10u, 5 +ent-PillCanisterPotassiumIodide = баночка для таблеток + .suffix = Иодид калия 10 ед, 5 шт .desc = { ent-PillCanister.desc } ent-PillIron = таблетка .desc = { ent-Pill.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/lathe.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/lathe.ftl index 9200c0bf002..e28f85e8498 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/lathe.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/lathe.ftl @@ -18,7 +18,7 @@ ent-CircuitImprinterHyperConvection = гиперконвекционный пр .desc = Экспериментальный принтер схем, использующий технологию экстремального нагрева для замедленного, но гораздо более экономичного создания предметов. ent-ExosuitFabricator = фабрикатор экзокостюмов .desc = Печатает запчасти для создания робототехники и других механизмов. -ent-Biofabricator = биофабрикатор +ent-Biofabricator = фабрикатор биокубов .desc = Производит кубики животных из биомассы. ent-SecurityTechFab = охранный ТехФаб .desc = Печатает снаряжение для службы безопасности и некоторые базовые вещи. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl index 1b15b401116..c2012213006 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl @@ -70,9 +70,9 @@ ent-WallWeb = паутинная стена .desc = Удерживает паучат внутри, а ассистентов снаружи. ent-WallNecropolis = каменная стена .desc = { ent-BaseWall.desc } -ent-WallMining = стена +ent-WallMining = шахтёрская стена .desc = { ent-BaseWall.desc } -ent-WallMiningDiagonal = стена +ent-WallMiningDiagonal = шахтёрская стена .suffix = Диагональ .desc = { ent-WallShuttleDiagonal.desc } ent-WallVaultAlien = инопланетная стена хранилища diff --git a/Resources/Locale/ru-RU/thief/backpack.ftl b/Resources/Locale/ru-RU/thief/backpack.ftl index 76a3cc5b7ac..a809b4badcb 100644 --- a/Resources/Locale/ru-RU/thief/backpack.ftl +++ b/Resources/Locale/ru-RU/thief/backpack.ftl @@ -15,7 +15,8 @@ thief-backpack-button-deselect = Выбрано [X] thief-backpack-category-chameleon-name = Набор хамелеона thief-backpack-category-chameleon-description = Вы - никто и кто угодно, вы - мастер маскировки. - В комплект входят: комплект хамелеон-одежды и маскировочный проектор. + В комплект входят: комплект хамелеон-одежды, + маскировочный проектор и ID карта агента. Маскируйтесь под кого угодно и под что угодно. thief-backpack-category-tools-name = Набор вломщика thief-backpack-category-tools-description = @@ -32,7 +33,8 @@ thief-backpack-category-syndie-name = Набор Синдиката thief-backpack-category-syndie-description = Побрякушки из забытого прошлого или украденные у нерадивого агента? Вы нашли кое-какую связь. Виски, эхо... - В комплект входят: ID карта агента, емаг, пИИ Синдиката, сигареты Interdyne, + В комплект входят: Емаг, сигареты Interdyne, + кодовое слово Синдиката, зажигалка, глушитель связи, и несколько странных красных кристаллов. thief-backpack-category-sleeper-name = Набор сони thief-backpack-category-sleeper-description = diff --git a/Resources/Locale/ru-RU/traitor/traitor-codes-component.ftl b/Resources/Locale/ru-RU/traitor/traitor-codes-component.ftl index 35246037f6a..de550fa49fb 100644 --- a/Resources/Locale/ru-RU/traitor/traitor-codes-component.ftl +++ b/Resources/Locale/ru-RU/traitor/traitor-codes-component.ftl @@ -1,3 +1,3 @@ -traitor-codes-message-singular = syndicate codeword: -traitor-codes-message-plural = syndicate codewords: -traitor-codes-none = no known codewords +traitor-codes-message-singular = кодовое слово Синдиката: +traitor-codes-message-plural = кодовые слова Синдиката: +traitor-codes-none = нет известных кодовых слов From 65f5395bc42c0047da727b399509877821bc5edf Mon Sep 17 00:00:00 2001 From: Zack Backmen Date: Tue, 13 Aug 2024 16:59:15 +0300 Subject: [PATCH 14/15] upd --- Resources/Locale/ru-RU/backmen/job/job-names.ftl | 2 -- Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl | 1 - 2 files changed, 3 deletions(-) diff --git a/Resources/Locale/ru-RU/backmen/job/job-names.ftl b/Resources/Locale/ru-RU/backmen/job/job-names.ftl index a225f51afa5..06013250f77 100644 --- a/Resources/Locale/ru-RU/backmen/job/job-names.ftl +++ b/Resources/Locale/ru-RU/backmen/job/job-names.ftl @@ -1,3 +1 @@ job-name-fugitive = беглец -job-name-prisoner = заключенный -job-name-roboticist = робототехник diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl index 5d1c141f82c..23b3219de8b 100644 --- a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl @@ -1,4 +1,3 @@ loadout-group-inventory = Мой инвентарь loadout-group-psychologist-backpack = Рюкзак психолога -loadout-group-psychologist-jumpsuit = Костюм психолога loadout-group-chief-engineer-backpack = Рюкзак старшего инженера From b17204d1ad2e5177369b79a10309d5fc28623c3e Mon Sep 17 00:00:00 2001 From: Zack Backmen Date: Tue, 13 Aug 2024 17:28:58 +0300 Subject: [PATCH 15/15] Update SlimePerson.xml --- Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml index 0147f72cf02..417a3b270bf 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml @@ -7,16 +7,6 @@ Слаймолюды обладают чуть более ускоренной регенерацией по сравнению с другими гуманоидами. Так же, они способны делать свои кулаки более твердыми нанося более сильные удары за счет уменьшения их скорости. - ## Герас и внутреннее хранилище - - - - Слаймолюд может превратиться в "гераса" (архаичный термин слаймолюдов), представляющего из себя меньшую форму обычного слайма, которая может [bold]проходить через решётки[/bold], - но заставляет персонажа сбросить всю одежду, инвентарь и предметы в руках и карманах. Данная форма полезна если необходимо быстро сбежать. Герас достаточно маленький чтобы его можно было поднять, (двумя руками) - или поместить в вещмешок. - - Внутри оболочки слаймолюда есть внутреннее хранилище, объемом 2x3. Любой может видеть что находится внутри и забрать это без разрешения, так что будьте осторожнее. При превращении в гераса внутреннее хранилище остается. - ## Расовые особенности - Получают [color=#ffa500]на 50% больше урона холодом, на 20% больше порезов и уколов[/color], но [color=#1e90ff]на 20% меньше урона от ядов, на 40% меньше ушибов и на 80% меньше клеточного урона[/color]. - Скорость метаболизма - 0.13 единиц за тик. Это означает, что у них всё усваивается медленней, чем у других.