From 4be980ed54bacf67710bfa863268e3d7fd9f9339 Mon Sep 17 00:00:00 2001
From: Hero010h <163765999+Hero010h@users.noreply.github.com>
Date: Tue, 24 Dec 2024 23:42:08 +0300
Subject: [PATCH 01/22] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D1=82=D1=8C=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D0=B5=20=D1=88=D0=BA=D0=B0=D1=84=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Structures/Storage/SenorsLockers.yml      |  77 ++++++++++++++++++
 .../senor_lockers.rsi/brigadier_door.png      | Bin 0 -> 470 bytes
 .../senor_lockers.rsi/brigadier_locker.png    | Bin 0 -> 393 bytes
 .../senor_lockers.rsi/brigadier_open.png      | Bin 0 -> 345 bytes
 .../senor_lockers.rsi/cargo_hunt_door.png     | Bin 0 -> 441 bytes
 .../senor_lockers.rsi/cargo_hunt_locker.png   | Bin 0 -> 396 bytes
 .../senor_lockers.rsi/cargo_hunt_open.png     | Bin 0 -> 390 bytes
 .../senor_lockers.rsi/head_cleaner_door.png   | Bin 0 -> 454 bytes
 .../senor_lockers.rsi/head_cleaner_locker.png | Bin 0 -> 396 bytes
 .../senor_lockers.rsi/head_cleaner_open.png   | Bin 0 -> 259 bytes
 .../senor_lockers.rsi/lead_res_door.png       | Bin 0 -> 452 bytes
 .../senor_lockers.rsi/lead_res_locker.png     | Bin 0 -> 373 bytes
 .../senor_lockers.rsi/lead_res_open.png       | Bin 0 -> 438 bytes
 .../Storage/senor_lockers.rsi/meta.json       |  65 +++++++++++++++
 .../senor_lockers.rsi/mofficer_door.png       | Bin 0 -> 472 bytes
 .../senor_lockers.rsi/mofficer_locker.png     | Bin 0 -> 438 bytes
 .../senor_lockers.rsi/mofficer_open.png       | Bin 0 -> 373 bytes
 .../Storage/senor_lockers.rsi/vet_door.png    | Bin 0 -> 517 bytes
 .../Storage/senor_lockers.rsi/vet_locker.png  | Bin 0 -> 534 bytes
 .../Storage/senor_lockers.rsi/vet_open.png    | Bin 0 -> 394 bytes
 20 files changed, 142 insertions(+)
 create mode 100644 Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_door.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_locker.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_open.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_door.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_locker.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_open.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_door.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_locker.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_open.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_door.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_locker.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_open.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_door.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_locker.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_open.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_door.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_locker.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_open.png

diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
new file mode 100644
index 0000000000..d5c66c229d
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
@@ -0,0 +1,77 @@
+- type: entity
+  id: LockerVeteran
+  parent: LockerBaseSecure
+  name: veteran's locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: vet_locker
+    stateDoorOpen: vet_open
+    stateDoorClosed: vet_door
+  - type: AccessReader
+    access: [ [ "ChiefEngineer" ] ]
+
+- type: entity
+  id: LockerBrigadier
+  parent: LockerBaseSecure
+  name: brigadier's locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: brigadier_locker
+    stateDoorOpen: brigadier_open
+    stateDoorClosed: brigadier_door
+  - type: AccessReader
+    access: [ [ "ChiefEngineer" ] ]
+
+- type: entity
+  id: LockerMedicalOfficer
+  parent: LockerBaseSecure
+  name: medical officer's locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: mofficer_locker
+    stateDoorOpen: mofficer_open
+    stateDoorClosed: mofficer_door
+  - type: AccessReader
+    access: [ [ "Medical" ] ]
+
+- type: entity
+  id: LockerCargoHunter
+  parent: LockerBaseSecure
+  name: cargo hunter's locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: cargo_hunt_locker
+    stateDoorOpen: cargo_hunt_open
+    stateDoorClosed: cargo_hunt_door
+  - type: AccessReader
+    access: [ [ "ChiefEngineer" ] ]
+
+- type: entity
+  id: LockerLeadResearcher
+  parent: LockerBaseSecure
+  name: lead researcher's locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: lead_res_locker
+    stateDoorOpen: lead_res_open
+    stateDoorClosed: lead_res_door
+  - type: AccessReader
+    access: [ [ "Research" ] ]
+
+- type: entity
+  id: LockerHeadCleaner
+  parent: LockerBaseSecure
+  name: head cleaner's locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: head_cleaner_locker
+    stateDoorOpen: head_cleaner_open
+    stateDoorClosed: head_cleaner_door
+  - type: AccessReader
+    access: [ [ "ChiefEngineer" ] ]
\ No newline at end of file
diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..78a6b907ee1850878b02d00a8ff647b5ecacfcf8
GIT binary patch
literal 470
zcmV;{0V)28P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004lNkl<ZSP5fb
z7zLvtFd70QJp>qu4S?y>r~h|xabZw7KOe5;j$tC4jm-G);RA!IsVPxr6Qu}b_^n&F
z{@=fUA8e2Qoiz*>RYH*ML}4o`Dl(|4sS#y13yMxWoV|PZGAJo2VW>bCyLay%14u2g
zfM^HcGI0KUM3jKk*xTFVQi@faVh1E9qNW2-2#^9OcEHFC0puJ&_YjacJr5qmFHDob
ziSFyyuW&I?7X2#e3Fi}Hkd+2N79)fA@883@_b#7hc+X+M5D*aXf5V0i1j_;@xK09$
z$B!SwRUn4~NDw5KoSY1%FTMT+rirl}q?c$1fE2?3C<M?Q0h1$@Cd&cXENN(Hz$Q#k
zjI1<(?)z0Mm%=T|(_&{p=EEg$Fi3U)dIAL11sgYQgBuSj2?GuuWVm*{4K9X{L9zot
zh9TF6bT0?ceKT4YjD`TI4G{D+L{cs|2+UsLTz45>0!;yx1uMTPqnk%EpI~KyZel~Y
z!+)4q!^#6B>xbzbG&BGzBZy1qWU`e2000hUSV?A0O#mtY000O800000007cclK=n!
M07*qoM6N<$f>{Evn*aa+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_locker.png
new file mode 100644
index 0000000000000000000000000000000000000000..81d4739edf5647884b7a8af6f6d8c2a2279c45fe
GIT binary patch
literal 393
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFq(O~IEF-Uz75;R)odWJS1eOd
zrsVp{rOlHcxLa`6wHJ&3U$}U6cKX4U@fSP`ieA~@@O^RVTNKYi*2>1N2p*5PNxP?i
zzANc$QWU-5w|iiTd+trW^Ti#}&K{MYE&5Jw(utbOcj&3u8`f!#mrZQ;C_Cz;9yk0T
z!w|weN9uT?$7PdS@642f#V?CQu(c(gI2^~r`e2uys^=%APuId7BV@B1?HPaDbbl!R
zmCeH%aNTrk?(ZVI?b)4AY}I`^PS|-gGrj1jx&J;PKYm*3`(1l1>RC54ZDwlL6lhaa
z++VP?xS>CJ$w$io5!MoQ2_MGupA}fyxEHKiRVeBZbkwX_vw>|vNXxd|#d|i~-6C>g
z6HlG-l>kjvM*)XDCwx~Z2XQ^n&rXPPov|!)`mXt3Cot6<y;d6gGI74=7Ix*IPCBKr
ltJ#48$(I`8nda-upao=e05J$$3Z4w2JYD@<);T3K0RW7xnfL$z

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a78a54a705b1200b152d656e8bb4c6c96d00cb1
GIT binary patch
literal 345
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFtT~NIEF-UzMXE!*P<ZcTDW<;
zf!VY+>xf%byzd`2=IHKiS<3rSX1DcZ9?6JJN7dqW3=I1mD(2hsxg?(omC@i!DO=$6
z@pxg)%WtWXlOBJWQU6%0?V`(P8}`qU*@;Z^G#^yXi*ty*Zs*3L)1Y?k!ea}c+uJzq
zU7r)j@HOZ5GxiwO2M;^vC)_XJH+$K|vllE17QD7<vwW`S&1kLg)8A5|Rzv#T!-h3}
zGB19|&3bVDKx5{t2L~hsLLBc@9<}CP(5rs^DATplvq#N!5+vI8Fx6eW_|mhkC1XWg
zK|tG6gHvS^o_;CX`>q!D+*5ASy1?h5y5KuUJS&TcMAg+vMOB*`Bs%`^UnuChKjTw+
nI$P*>Gho2*rABzB`T8<w0ofct3<8&eCxa+YS3j3^P6<r_hs=xg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2739242e01b5f4b73780cb3323d5a9ce275392f
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004INkl<ZSP5fb
z7zLvtFd70QJp>qu4S@1UjsLP@Tnu4Oa&RrH_C12LVGJgqi4R|XW9VFdgDA6EU>XV0
zAj==W`o_?^;s!&QgB-)E1DKY>%mAq+77*=#`!60durLW@n2T;1$dMqm!~&unfXl!W
z*YBf9Nehdk@Ck7!c7TPZB8nZL5FiCm?10e_pfm)C%B!F_Ee;p`k1ZE~<ibjpf+!SV
zY-~)F*(9d{P#FLNu(IIJojWigl4&Mlb-aB42d)%mF-+jXg$oSf;o%I(G)#^VO|%0D
z8APr;Sq?ys2AIW_m6b3iNi<Oj1!Q83o8W(3rQE3(k{Fim-@l(Ivq?^bAe)dYBT!u+
zEA|oY08mNz^zBPHpAdsA2Ot|tX*oc#14iqD(Gb9uHIWl4J~l~-5R|>boCFx2zQ4_2
zt<S))YTpNZW)mexv;&sxdJisG?DSRs!%SYX>poG14NU!@qyfT{aqRICLTdm301jnX
jNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjfKE0`c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_locker.png
new file mode 100644
index 0000000000000000000000000000000000000000..107d9577941045074767175a9c218783fb077cf0
GIT binary patch
literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFj{)LIEF-UCMQTF9Pn84SMS)P
z|DB=SLEE3d@m_RB%}ek^k!7JCTVP#Tn*qD!4(l-43YK(b<GA`iCqKM+YQ9M3V9T09
zg&T|c5){pDJUy~Q!lfb8A*_jeovWBe8*jlT<L1i@W|k#}i)0oo{m}pL#8dNxy*W8&
z3XIKUD!I}Z8#`2eo8u~e^oj6X?tg#PHN}k#42^`Qa(8es&e*-w_1}RR6)%_PcbJ!%
zi1)M|$l$o3!_sq=<zrgt43&?PVk?{{hzD{V;yK`E&nh;{|Ng!sYORWHn*|PR;B03&
zEA!!zt~8%^U~A?xhLG%n&un)Xm#8|)1>T8soY)w0SHsD|!daW;+`X#)!}3qKCyTIp
z1s&PSzV43ts=3T%rk;EPGJTl|8LEd4Uzle2(~~b)Jy4M$E2%kZ=aPg8^As5wM02fw
nUHBIq3k*xX)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4fp@5Un

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..7430d7dce207aa1882170f46faba01bf3369e923
GIT binary patch
literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003qNkl<ZSPAWy
zy$*sf6onCqi;D&mFm5Kg8wcay6X;|3h`xb?aq<D2jgUxmaWNR>R!`F+VNfo0pb7NS
zHupQ6{)m=UmCAw20mBZ|viOT>_o240Hpk3y>X>h1Ck>-S%XweRmk7|Fi+pe>SsJ+8
zpCw~7Xv>%*5CSN%3Oz)j)pI=#-bYR;fO-f_C5Re{01>j^Gyw#r;=4C?FaVkWfJ=7(
z^PlAa`k=Vz`ac}NTfu?xkaz2WN44fanP7;p5tyoN$D7FgZ$gA{;N;9qumw{H=)`Mt
z0^)F+3&-)CJLreb%tgozRrPAy5a7~}Vkp8vgx>_TbJm&z09OvE4z!we&Ka<@T|i*E
zXezKEFV{P(0J#PT=)XV1NCcH2qL0&8EE*VYLI8ls&-p(94Af66V_`qwrk}w8000hU
kSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f>zw1W&i*H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..e85906d18c2d012b256ccb8f6065775e94a231b4
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004VNkl<ZSP5fb
z7zLvtFd70QJp>qu4S-<vfd3kT8eru<P3OS$mO3M>+HbtS!Lat`2BOSn!D<2)L6GHd
znBFk_`2LgO#f#Tq6;FOX#Zbw?$<6?CD25~!0iqpn<J%1e9%f!FMxY9T9C+jJ4OBrq
zJSIGHbdef$z<`GU(TNZ_L2T&PLFQ7#CfNZ2g;y9r4uH`h+Z)w?qd9_uVeKU}Ask$i
z9e~Z8OP7eW4U1;7902k?GB|PV8bcdUpbCg#G_pKCHpz()6#N682C(@E<a=@e$x(pK
z_t%hY4gj)|`AAY&nIt;^WC|<|z#PMG7>i=~(;L7_>ia$vF<cyy9iYOh$RHu{5^Nrb
zjSlYozR$p~%E!P!WX2%b0h=FeW4Jc^FWBC@KsGwil-5KS!pkSw0lo@e3@)iBz=rO5
zXn|okC<I6WBs*X<1O_w&zWn{nAS)rm;O`EJ=hZjmF`^r!hUOqL)bKwD)7&C@SO5T7
wK6jtg9w2T2000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f^{~t!2kdN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_locker.png
new file mode 100644
index 0000000000000000000000000000000000000000..49da0889929672fdce932a4c46526bc972d5136a
GIT binary patch
literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFj{)LIEF-UCMQTF9Pn84ch{d=
z|2spugUWwC4qbF6P4QU3gr{y^Zal9RWhFeFW%&BQm#?ah5nJ!q)OI&MlsjCXBy+Ik
zDvK3YpH;&O6NWCqfIszrzlh3M3JEPr_{B4Y|CxfI!q(^S<~j=<JgahwaRJMYKTo)J
zXns%I+;}s5U4C2lLSu(2z4`mQ^m-1eYprf5IvD@2USifqPJ{XsB`s|sQ6__KmK2sm
zpFLmN)!%<SrR?4Jtm&eF1TW*HO^U+8UzvM;sVSuwDcxXx$1rJ8!_=u$IqWAcOUY<u
zFg7;Myr=B+wW0k$gLT6ammg0~3M(;9ZEWmpT#?3hLuZnVf~KbD6y~^lwT@G)CMZpk
zIdJ~G|CEFJk{#s-8kRRQmNR$;7QDXWyJ%5^h^vdG!;9qthj;hC_b{B!xFp?!fkEe$
oP0v;F1WjOA@})+2ruq6ZXaU(AKnwzxf+vG0Pgg&ebxsLQ05Hj%`v3p{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..586a109186481cc60ec9058bf79faf4f3bb2366c
GIT binary patch
literal 259
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4W2HJArYL(2@<S}6%8&qHwZ>E
zy!e#;-(76~pO0E$r6;mZq;6gi&1Q7M|FZbeJ*U;zE&8zXWFn(vTi(OT^Zg%|o!H=g
z_~w>`23ZCpiJL)D5iO^E)MA9b2+5Zo$l&N{V>l?V<KtU4-(nR<_6t|a7CcN~zi?~%
z4;w=ZCx-dlnY!juOh9|3n3(05KA0&M)&2kU-PmaQvYZ{v6Lj}}{b1&+>uNSfFnWK(
yG+Duv(~da|evFFj#{B7rfNtkYjqptK^<~fkvN?bl1TF<n22q}_elF{r5}E*4wOdjE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bbc2353af0c8b708de3c414f98144513f51c433
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004TNkl<ZSP5fb
z7zLvtFd70QJp>qu4S<DhOa6N}doXmxO@nJGTa*Q7BQtjF-N6uF6+@KSEXW%1u|bx<
zdGm(h`^`TL*BH(-XfYUq`PlS;)DjDrh*b#k6$oT+jRIQ^qCw!@-FGM$BnDFpViN*H
zhX5{v4xT@VA{D3{h{7ktq1XZThW3Q)z$;I&14d>Dz!D%RZ0Q~XQ@xkL;}qnOz>q+O
zYp1Tk#XxK>AS4zLoehx<L=FLv_}fo!F)*@vd~Bi<;j1^V;O2lr0of7z&+lVcd0;t1
zxI-kv=^LjQOf}5lY6&sO4gut-AY=(Xd9oaU%|MXv$pJ)10kYxfzE_vlflE6YIx#$Z
zg@`V=1P%tt4nU53keQ&mz}4IlZoH7P5W}{;+u(dc43ZrHG7vct(!Cr&_t9uwF!DkG
zmIYx65mXmY0!YdQpzQUA?>XE)QnDLd6B>i4mMgLzOCG2HF#ho``$*Og(>rKr00=vY
uY158QegFUf4rN$LW=%~1DgXcg2mk;800000(o>TF0000<MNUMnLSTZoE3PsC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_locker.png
new file mode 100644
index 0000000000000000000000000000000000000000..029a4ac5b675b6ec1190c2c580db01a64374df49
GIT binary patch
literal 373
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFe-VvIEF-UCMQTF9Pn84w=*yE
ze`hFnka_)eokeHVyaZ1a>B{o5>8I<rY2M_1@b1LSSq$mQ#@pWBJy!7c6z?LLgDq<c
z6>co%OHees;alP>c`nB0@PVV}Sg$iZN@iBry1>MNN8uFXeu;V`ov3{hIrn;(mp^#6
z&-w$)Ik)tNF9OURMGUv=%i6@>&u=^{e8HuK!G~wIt58$WjTXZrKslf3yO&D$bWXol
zStA}-nR4=CjDZx>VnraKBI@#J(W4Wo9HBQB2O2z3bO@3X5D{PEwMSXnXp2+A(^;k`
z`j&IeUZQc~`US;Pm&A`N_KGKoOn$;387Y}`CMChbZ;sJ~RgC`3%<mW`ElPN|s`5y?
z?nJH5B8C;6zB$_BY5E(_7R~s@xR`N^m-UXRiT%5QfyS2_;hE;^%b*2ha{w_2Tne5H
OqC8#wT-G@yGywqYM~#C3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbcc1c2fc6edd6aa1f87ff0af364fad0b97e3c36
GIT binary patch
literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004FNkl<ZSPAWy
zu}Z^G6oylA6U3HKC!eEl;0v@bP-;7hgKr>+gS((YvzLwyrO>UufGwg!J2?g`f^+5k
z_=kH+vV@#u$%Wo~ZtltXzFd+E^}MQ8J5cRF$vaR>;&;ynJNNo<_L!LG=46d)`!FeV
zcXO-iowj^4fx{$V6h*Os@B49V5kNo+3p5A<FkV&*@9F*-v2_;<2uQ%vzJIqEi|CX9
z!6!%cBG_Ok0fH$~gvEhCrt>LS0+t^|+%+T^bfxcr65!U49>xaGnp{!|6bYsd-T_X^
z7$FeOCaLU?&3o!v9t#jyZeH`Km8k{<F56d`ZqDN-2&_NXskQ3IjnuU~79h|(YpPoP
z>kBovoT$%`V4eq-VAfUw1iMEu6Rk!iKrltDpl)3yKrltzM5|Z{5KIw)ZhyY4*r=-n
z2<~=zUN{etVEq}!0s<7Uw6~S*@e9a*2Z4Q{<^KQ|F7Y2`e`M3W=?y{v000hUSV?A0
gO#mtY000O800000007cclK=n!07*qoM6N<$f_o~o&j0`b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json
new file mode 100644
index 0000000000..4b5971f183
--- /dev/null
+++ b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json
@@ -0,0 +1,65 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "copyright": "Danza",
+  "license": "CC-BY-SA-3.0",
+  "states": [
+    {
+      "name": "vet_locker"
+    },
+    {
+      "name": "vet_door"
+    },
+    {
+      "name": "vet_open"
+    },
+    {
+      "name": "brigadier_locker"
+    },
+    {
+      "name": "brigadier_door"
+    },
+    {
+      "name": "brigadier_open"
+    },
+    {
+      "name": "mofficer_locker"
+    },
+    {
+      "name": "mofficer_door"
+    },
+    {
+      "name": "mofficer_open"
+    },
+    {
+      "name": "lead_res_locker"
+    },
+    {
+      "name": "lead_res_door"
+    },
+    {
+      "name": "lead_res_open"
+    },
+    {
+      "name": "cargo_hunt_locker"
+    },
+    {
+      "name": "cargo_hunt_door"
+    },
+    {
+      "name": "cargo_hunt_open"
+    },
+    {
+      "name": "head_cleaner_locker"
+    },
+    {
+      "name": "head_cleaner_door"
+    },
+    {
+      "name": "head_cleaner_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..db05124b4e697f36e7bd316e90cb95d1c3e7383c
GIT binary patch
literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nNkl<ZSP5fb
z7zLvtFd70QJp>qu4S<{->;DUji7~u5x*x8ENn9SzhB3rclo;N=dc`osBakSwSzsCo
z(ICrpfBj<kDJ%?EY9c2CXTuplHJ5>Ei3Lo=Dg^lo1Wc4PQ0Nn1zA_+VkR(hkSRny|
z=n%kV&aE@&P^2szY*F}xI7B;u?e`z7W~rGNVHGD<kZ1?|V#ThMZXtlnM|2ATTn-qJ
z5P;<bkfY*&iSGH^e{lDK*y;>?a6Tah_K3x!>&(3ya9Nl`ZasPi7bBHHbUE<m(G$4Y
zFpJ>=K*r?ESTOhBnSNwpf^4E4K+q&I6_Dis<Y<7|n>&3mnECScH<%DnG|6cITkvn5
z-hpHpGXnz(A4v)elVk^g%m9S|%pst9Af&GoZnOmtH^Z7sR~R0o<-*1AG01WNvVj9q
z4j?;VWR`>@I|N{504yhf>H<mt(Yb(wkC$Q5fx{?vU3>Hzg%9HhDagT?1ZkpLuE?h7
z2l)Jl@h@)JLb86C-a$hH0CLE4x)oVYA^-pY4rN$LW=%~1DgXcg2mk;800000(o>TF
O0000<MNUMnLSTa7A-7fl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_locker.png
new file mode 100644
index 0000000000000000000000000000000000000000..322cbcd1c317d29064c0a31e279f4a21f1128846
GIT binary patch
literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004FNkl<ZSP5fb
z7+}Cito`}{KL3eT3sQG+!xo~<W+BE<kma@+$qWtx0t|OPzJzO0;TMOqkr@X*d;oF(
z6XOUbWQ_yC9(4dwX#f;8!eU|!$6vl?_;TkCJf>c&aKPEf3}JCGWG-GdQ4SCi6=m4a
z)DAX?lkqRy!0&rcz}e^wkRD<HQ4V<b`ZdFk`)|PJ{UF9vpqh6?sw2t)Ftg;{EMZK%
z^ut}p@ya7hj^={V5Eu;snuS10Y9Yhqt$PVp;Utv<$oZELd)cHJ499n_CfFt*$pONW
z5`^pp%RdB?CINmR{C{$0EM7;D<N%^<hblU=VG~gyK(jPJtYc~BfNz}NiE;x;Q6S30
zOq8LdD56;i5bFq%LSWC#jl`Nuv^tU;pdal+l)>i~t|v+zND)a6kmDdO4V)v|dIp98
zPXhz)0Ft6$!^|}#1TJw(iE;p_iA`)P7iKN7&2pIf0iyx7%|v-&+u-*A000hUSV?A0
gO#mtY000O800000007cclK=n!07*qoM6N<$f}OamD*ylh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..20afb09fda8aa5fb32fee078f4b5c812776d381e
GIT binary patch
literal 373
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFe-VvIEF-UCMQU+E><*<Vq%tI
z>bddeI{$~C{W^7phsD;sns9Z(=`@$^JShSB$*NtIdcUrj6f<y}aogAYXDx4FP?w(L
z%grWyCSbx+gYI<y2v*@`mb`q7Gjt8Q^XJ)fiEuS@UY_Ds$Z#Zyjjhx<dsb9ejzt%9
zg4ktSmUZ{4PblbWo@~%%aVXlt(yYvqVAs;>aQ;xIf#R&o8j247-HCS1)0qtzt1c(7
z=R{Y|xcBYQTV`tpvF`<eRz?T-8lKi$-QwQP^@c&MlyL`xRr2xH(=VJto;J%i<SDK3
za}Zz7Dz7SiNM~7fAkSw>9m7k;z6)9y&OEv(An`%qLeGb^8M|x6buuqZX<N=Xp;e*V
z@xe{kThD4!<QstoDC+)ZJTa~L21DeBXz#8+chrD^#+Mr5nda-upao=e05J$$3Z4w2
NJYD@<);T3K0RSlmgk=B#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..653b9eecc6054e4795cd2db792c761cac4cdd8c6
GIT binary patch
literal 517
zcmV+g0{Z=lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800059Nkl<ZSPAV`
zu};G<5WPlehal8~s%~Uy1S3Ni_6jk;!WXdf5e$3;ztM#Sq3*05i_)bmD2+q_B^@dh
z>ZIpbR??i~iiLQ2cfRwxXFF#FpdR%J)F<%YPoP0PfV<%^KI(Mf^md;wnLK=RTQuH+
z0Pe?Q61OQX+-9@lubu}#laQy)ywvVr?<I4yQR*M}dOWAhFv=1z&UVEH7D2=~^HB)q
zVr(0d1>}*$aW>0}%c8Pqv85$Iq!mv<oG-I?CZMcPQG90ts$K!P3-We=eOBe}kxxqi
zY!s-p9Tr9;3-}B}Xf>O-E=AS_YZ2^ys5;03zE&$ZG)*uXc<^a)R(R_B@a(#9?l>H&
zg48}jq3@{$%JS3%$ZUcjw)-lBd<D7Wo7<Q!7CdaX+aUTpP+({YIIt}Eh$6Td3=%}&
zU(d1cf-<zO;AK8fYRE__j5%5Y&TKp3krBx$s3kz&Ir@~sn4={?-Z}b6PC+#RQa0{b
zMoMAKQR)Jt1<=1tf4`EypHWJ4((NV&B9c>3Nq`?L!FtbV{b-pv6)oXmr!ibzIQ;#4
zd~%i7)2jSo)-NP>frkeAQmFs{01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXX
Hu0mjfB|_bG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_locker.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1fac6067ee35a95449e2261cfce67913594d1d0
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005QNkl<ZSP5fb
z7+}Cito=UjD*x}C`$&{>6(fFzEj#ZJWi|^jCW0*Y=G0+$Z}go(BZeEU<;Ie)a5geS
zkdu>v!JXkhF^*tD)`*Kutk0446RU?P2Ot|vZT5gWfT%POo~X_s`b&X96zF|bH6C~%
z{L}mbXQMO1)!r~PcD+Uy#^4i`Qcvwo`2XbDCx)t`!wfvq%y2`#JpBu2BQx6iY#C&v
z_!!Kb7Z5a`s3_p%kzpt+ILPql-#>;AkAK54h>s0})PnR70|>ehWQc~S=zow!!dzU$
zn91<=+cyRlCMJd(uU`{1pQsQZ%2qNJjXGd71c)k#VCjpAkzk^RDJ7bwSrqtcXb|NH
znmOR?vu8v(fTSp3V@4FigiPmQV<V&lEKjo#c=X`|Q4Sy}1ek%vE42ajO@zAe`|saG
zxs{|4;ACYb%1}}ik>mi96cgzRlFYpL@+DEmf~sOhA`2~&9H1^DLX-pUzI#WMI*=lg
z9KcOv-X_|1phBAE0%9F8;0_?Fdb@nG=6|5qbYeXPR@c$x|2QOho*W@fM1{c7qh}bR
zlQqE&O$`%41{emVc5E1=_RYs<vV<%j6!HM1%y!jp53>9K000hUSV?A0O#mtY000O8
Y00000007cclK=n!07*qoM6N<$f?6u!l>h($

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..c62d5a07de4ec98b7ed4817321d6d49d6b14ce1b
GIT binary patch
literal 394
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFq(V1IEF-UCMQU+E><*<Vq%tI
z>bdbITu|&^zfRrrx6x}}O}IMYbeiLKo|J%aC#J4S$Gv+sYO;zV9NHE}@5p=~w?nq>
z+_?fXU5Nzt1|GL<Q^dp`8cpV$&a(H2yDS4=qxN*YhdhNfMHZ$L6%3_-b^yg>&GR4m
zn0=4ie@xSzmvaO2z5hQPc{iUhVt&Km$j7(IB-mN_24j|!lf~IzzrO4HS!Q`O$TsAh
zoP2)1WZvFtcizpNM$B>2O*;R+{Wd>5dwslQ9aC+uen^MWOb^!rcAH-x7;`qR+F)=)
z(dE_h2+2E)MNCWy-HCjX8w4gidc62X_!0>Qe#XSSJhp(-!qeEUEVN{vqL;z>fUknv
zw<c}Vri9-Kmd)K$r%wB3d_Z=AzAEeX7k@UV7nrS;?71=P>6SO_3#vI7{uidq^F6#M
j78sIzsS%!OzP=1vKsE;ugTSTW$so$p)z4*}Q$iB}=|Pe#

literal 0
HcmV?d00001


From ed1a7340b7313779f51f3163026b62e7c61aed81 Mon Sep 17 00:00:00 2001
From: Hero010h <163765999+Hero010h@users.noreply.github.com>
Date: Wed, 25 Dec 2024 00:14:34 +0300
Subject: [PATCH 02/22] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BF=D1=8B=20=D0=BF=D1=83=D1=81=D1=82=D1=8B=D1=85=20=D1=8F?=
 =?UTF-8?q?=D1=89=D0=B8=D0=BA=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Structures/Storage/SenorsLockers.yml      |  22 +++++++++++++-----
 .../Storage/senor_lockers.rsi/generic.png     | Bin 0 -> 215 bytes
 .../senor_lockers.rsi/generic_door.png        | Bin 0 -> 206 bytes
 .../Storage/senor_lockers.rsi/locked.png      | Bin 0 -> 127 bytes
 .../Storage/senor_lockers.rsi/meta.json       |  15 ++++++++++++
 .../Storage/senor_lockers.rsi/unlocked.png    | Bin 0 -> 127 bytes
 .../Storage/senor_lockers.rsi/welded.png      | Bin 0 -> 206 bytes
 7 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic_door.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/locked.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/unlocked.png
 create mode 100644 Resources/Textures/White/Structures/Storage/senor_lockers.rsi/welded.png

diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
index d5c66c229d..9043a7f0ed 100644
--- a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
@@ -1,6 +1,16 @@
+- type: entity
+  id: BaseSenorsLocker
+  parent: LockerBaseSecure
+  abstract: true
+  name: base senors locker
+  components:
+  - type: Sprite
+    sprite: White/Structures/Storage/senor_lockers.rsi
+    noRot: true
+
 - type: entity
   id: LockerVeteran
-  parent: LockerBaseSecure
+  parent: BaseSenorsLocker
   name: veteran's locker
   components:
   - type: Appearance
@@ -13,7 +23,7 @@
 
 - type: entity
   id: LockerBrigadier
-  parent: LockerBaseSecure
+  parent: BaseSenorsLocker
   name: brigadier's locker
   components:
   - type: Appearance
@@ -26,7 +36,7 @@
 
 - type: entity
   id: LockerMedicalOfficer
-  parent: LockerBaseSecure
+  parent: BaseSenorsLocker
   name: medical officer's locker
   components:
   - type: Appearance
@@ -39,7 +49,7 @@
 
 - type: entity
   id: LockerCargoHunter
-  parent: LockerBaseSecure
+  parent: BaseSenorsLocker
   name: cargo hunter's locker
   components:
   - type: Appearance
@@ -52,7 +62,7 @@
 
 - type: entity
   id: LockerLeadResearcher
-  parent: LockerBaseSecure
+  parent: BaseSenorsLocker
   name: lead researcher's locker
   components:
   - type: Appearance
@@ -65,7 +75,7 @@
 
 - type: entity
   id: LockerHeadCleaner
-  parent: LockerBaseSecure
+  parent: BaseSenorsLocker
   name: head cleaner's locker
   components:
   - type: Appearance
diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd0c0ff2ea19a9c505384a6679cd195ce3e22632
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`S0JsSp`ov*XJut&V`Jm!
z=;-3&5)crOk)EEPpI=Z=(9qD(*w7Ghe(DaOQpS=XzhDN3XE)M-oH$Px#}JM4$q5Iz
zSPn8AOn(!_%A(DpAv9xi_4j$k>ViyXyb=-^#1on#RyPO;n6WWA@8a&*!O*De$+T#p
zgFuJBgAOl;kf+cA4t^fzqo*4eOi*DgagJ2HD9~W4$iQ&$pv7zNMF)9+HZgd*`njxg
HN@xNAfu=q2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..26498527779b4d6a73aae5d90c336bfffa1a1410
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`S0F7ZDJdf(qpYm#;NTDt
z5D*>`l9-T?k)EEPpI=;DTv=J!*wFC3pz|_NDPu{HUoeBivm0qZPN=7gV~EE2<OB(y
zgmaP#7M&^udt^AWCa^3EUw6-RuTbQIh=2=wCf(9<xTeIth56@FMGvNz3XH}jjHWeA
y4{w~&(02`EEMo6sII(ofDu?Z=B0L>Ef((HlEMJ!%{2~RkfWgz%&t;ucLK6UwoItz)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/locked.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..d90218d19e26a9037ed3fac22986f4c4aca73af6
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0Me**7iS)l>c{f0#Jy#
zB*-tA!Nz9UtAopcTp3Rn#}JM4$q5pyM;P54OBkI^7}eBE7?&!(&t{lx!>~3iF>NAH
O9fPN<pUXO@geCw+A0YJr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json
index 4b5971f183..ef5bcfe9de 100644
--- a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json
+++ b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json
@@ -7,6 +7,21 @@
   "copyright": "Danza",
   "license": "CC-BY-SA-3.0",
   "states": [
+    {
+      "name": "generic"
+    },
+    {
+      "name": "generic_door"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "locked"
+    },
     {
       "name": "vet_locker"
     },
diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/unlocked.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..418607bfaf59e0f774b85234300e48aeb1056b9a
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0F9%pCRvWCWLeriFyPS
zVlD~t3udsfS@!DSG9XvR)5S4F<9u?01nUt-HPsSEbrVK6=Mu()itn=-X0R}<J-=Yx
QFQ7UGPgg&ebxsLQ09C3YFaQ7m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/welded.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ba5dcc89629b486b489f8afc2a0ac2ed366c27f
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`S0L@+;Narq6c7*)92^`T
z5|WsZkddCApPye-QPJ4Y(AU*9dGh2BpB4T9l`@tD`2{mLJiCzw<b-;<IEHAPPfl21
z{y<UXz|v;50}q?^9`vdm*vag>ph#_&!%v<PQHdy>3oMt;US#13y~q-w%fThFV0PoW
zMG-=G^~G9b!ZJJ64y<d))7`~j+{Q3*BP)XwD_2I^?^%vO3m80I{an^LB{Ts5#>PX>

literal 0
HcmV?d00001


From 5817b84c580b0474536c5cc49b152fcf65e01c07 Mon Sep 17 00:00:00 2001
From: Hero010h <163765999+Hero010h@users.noreply.github.com>
Date: Wed, 25 Dec 2024 23:11:07 +0300
Subject: [PATCH 03/22] =?UTF-8?q?=D0=AF=D1=89=D0=B8=D0=BA=D0=B8=20=D0=B3?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Belt/clothingBeltUtilityImproved.ftl      |   2 +
 .../Belt/clothingBeltUtilityImproved.yml      |  13 ++
 .../Specific/Medical/expanded_medkit.yml      |  14 ++
 .../Structures/Storage/CleanersLocker.yml     |  12 ++
 .../Structures/Storage/SenorsLockers.yml      | 154 ++++++++++++++++--
 5 files changed, 177 insertions(+), 18 deletions(-)
 create mode 100644 Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl
 create mode 100644 Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml
 create mode 100644 Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml

diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl
new file mode 100644
index 0000000000..560fe1ca56
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl
@@ -0,0 +1,2 @@
+ent-ClothingBeltUtilityImproved = {ent-ClothingBeltUtility}
+    .desc = {ent-ClothingBeltUtility.desc}
\ No newline at end of file
diff --git a/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml
new file mode 100644
index 0000000000..b4bcd14018
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml
@@ -0,0 +1,13 @@
+- type: entity
+  id: ClothingBeltUtilityImproved
+  parent: ClothingBeltUtility
+  suffix: Brigadier
+  components:
+  - type: StorageFill
+    contents:
+      - id: ImprovedCrowbar
+      - id: ImprovedWrench
+      - id: ImprovedScrewdriver
+      - id: ImprovedWirecutter
+      - id: ImprovedWelder
+      - id: NetworkConfigurator
diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml
index 96c5e8c83b..3c0d2d62ec 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml
@@ -6,3 +6,17 @@
     - type: Sprite
       sprite: White/Specific/expmedkit.rsi
       state: icon
+
+- type: entity
+  id: ExpandedMedkitFilled
+  parent: ExpandedMedkit
+  suffix: Filled
+  components:
+    - type: StorageFill
+      contents:
+        - id: MedicatedSuture
+          amount: 2
+        - id: RegenerativeMesh
+          amount: 2
+        - id: PillCanisterDylovene
+        - id: PillCanisterKelotane
\ No newline at end of file
diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml
new file mode 100644
index 0000000000..5ebdb62092
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml
@@ -0,0 +1,12 @@
+- type: entity
+  id: LockerHeadCleaner
+  parent: BaseSenorsLocker
+  name: head cleaner's locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: head_cleaner_locker
+    stateDoorOpen: head_cleaner_open
+    stateDoorClosed: head_cleaner_door
+  - type: AccessReader
+    access: [ [ "Janitor" ] ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
index 9043a7f0ed..c3e3562945 100644
--- a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
@@ -3,6 +3,7 @@
   parent: LockerBaseSecure
   abstract: true
   name: base senors locker
+  description: Стандартное хранилище НаноТрайзен.
   components:
   - type: Sprite
     sprite: White/Structures/Storage/senor_lockers.rsi
@@ -11,7 +12,7 @@
 - type: entity
   id: LockerVeteran
   parent: BaseSenorsLocker
-  name: veteran's locker
+  name: шкаф ветерана
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -19,12 +20,40 @@
     stateDoorOpen: vet_open
     stateDoorClosed: vet_door
   - type: AccessReader
-    access: [ [ "ChiefEngineer" ] ]
+    access: [ [ "Security" ] ]
+
+- type: entity
+  id: LockerVeteranFilled
+  parent: LockerVeteran
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: FlashlightSeclite
+      - id: ClothingUniformJumpsuitSecGrey
+        prob: 0.3
+      - id: ClothingHeadHelmetBasic
+      - id: ClothingOuterArmorBasic
+      - id: ClothingBeltSeniorSecurityFilled
+      - id: Flash
+        prob: 0.5
+      - id: ClothingEyesGlassesSecurity
+      - id: ClothingHeadsetAltSecurity
+      - id: ClothingHandsGlovesColorBlack
+      - id: ClothingShoesBootsJack
+      - id: WeaponMeleeNeedle
+        prob: 0.1
+      - id: WeaponDisabler
+      - id: HoloprojectorSecurity
+        prob: 0.6
+      - id: WeaponPistolMk58Nonlethal
+      - id: SurveillanceBodyCamera
+      - id: MagazinePistol
 
 - type: entity
   id: LockerBrigadier
   parent: BaseSenorsLocker
-  name: brigadier's locker
+  name: шкаф бригадира
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -32,12 +61,41 @@
     stateDoorOpen: brigadier_open
     stateDoorClosed: brigadier_door
   - type: AccessReader
-    access: [ [ "ChiefEngineer" ] ]
+    access: [ [ "Engineering" ] ]
+
+- type: entity
+  id: LockerBrigadierFilled
+  parent: LockerBrigadier
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHandsGlovesColorYellow
+      - id: ClothingMaskGas
+      - id: ClothingShoesBootsMag
+      - id: ClothingBeltUtilityImproved
+      - id: ClothingEyesGlassesMeson
+      - id: ClothingHeadHatBeretEngineering
+
+- type: entity
+  id: LockerBrigadierFilledHurdsuit
+  parent: LockerBrigadier
+  suffix: Filled, Hardsuit
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitEngineering
+      - id: ClothingHandsGlovesColorYellow
+      - id: ClothingMaskGas
+      - id: ClothingShoesBootsMag
+      - id: ClothingBeltUtilityImproved
+      - id: ClothingEyesGlassesMeson
+      - id: ClothingHeadHatBeretEngineering
 
 - type: entity
   id: LockerMedicalOfficer
   parent: BaseSenorsLocker
-  name: medical officer's locker
+  name: шкаф медицинского офицера
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -47,10 +105,45 @@
   - type: AccessReader
     access: [ [ "Medical" ] ]
 
+- type: entity
+  id: LockerMedicalOfficerFilled
+  parent: LockerMedicalOfficer
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: HandheldHealthAnalyzer
+      - id: ClothingHandsGlovesLatex
+      - id: ClothingHeadsetMedical
+      - id: ClothingEyesHudMedical
+      - id: ClothingBeltMedical
+      - id: ClothingHeadHatSurgcapGreen
+        prob: 0.1
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapPurple
+        prob: 0.05
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapBlue
+        prob: 0.90
+        orGroup: Surgcaps
+      - id: ClothingUniformJumpsuitMedicalDoctor
+      - id: ClothingUniformJumpskirtMedicalDoctor
+      - id: UniformScrubsColorBlue
+        prob: 0.5
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorGreen
+        prob: 0.1
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorPurple
+        prob: 0.05
+        orGroup: Surgshrubs
+      - id: ClothingMaskSterile
+      - id: ExpandedMedkitFilled
+    
 - type: entity
   id: LockerCargoHunter
   parent: BaseSenorsLocker
-  name: cargo hunter's locker
+  name: шкаф охотника карго
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -58,12 +151,34 @@
     stateDoorOpen: cargo_hunt_open
     stateDoorClosed: cargo_hunt_door
   - type: AccessReader
-    access: [ [ "ChiefEngineer" ] ]
+    access: [ [ "Salvage" ] ]
+
+- type: entity
+  id: LockerCargoHunterFilled
+  parent: LockerCargoHunter
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingBeltUtilityFilled
+      - id: SurvivalKnife
+      - id: HandheldGPSBasic
+      - id: RadioHandheld
+      - id: SeismicCharge
+        amount: 2
+      - id: OreBag
+        prob: 0.5
+      - id: Flare
+        prob: 0.3
+      - id: Flare
+        prob: 0.3
+      - id: Flare
+        prob: 0.3
+      - id: ClothingOuterHardsuitImprovedSpatio
 
 - type: entity
   id: LockerLeadResearcher
   parent: BaseSenorsLocker
-  name: lead researcher's locker
+  name: шкаф ведущего исследователя
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -74,14 +189,17 @@
     access: [ [ "Research" ] ]
 
 - type: entity
-  id: LockerHeadCleaner
-  parent: BaseSenorsLocker
-  name: head cleaner's locker
+  id: LockerLeadResearcherFilled
+  parent: LockerLeadResearcher
   components:
-  - type: Appearance
-  - type: EntityStorageVisuals
-    stateBaseClosed: head_cleaner_locker
-    stateDoorOpen: head_cleaner_open
-    stateDoorClosed: head_cleaner_door
-  - type: AccessReader
-    access: [ [ "ChiefEngineer" ] ]
\ No newline at end of file
+  - type: StorageFill
+    contents:
+      - id: ClothingHandsGlovesLatex
+      - id: ClothingHeadsetScience
+      - id: ClothingMaskSterile
+      - id: ClothingOuterCoatRnd
+      - id: AnomalyScanner
+      - id: NodeScanner
+      - id: NetworkConfigurator
+        prob: 0.5
+      - id: ClothingShoesBootsMagSci
\ No newline at end of file

From 21187c386a6154d8b281e4146f3ae694ff9ec3e3 Mon Sep 17 00:00:00 2001
From: Hero010h <163765999+Hero010h@users.noreply.github.com>
Date: Thu, 26 Dec 2024 00:36:57 +0300
Subject: [PATCH 04/22] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=83=D1=80=D0=BE=D0=BD=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BA=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B6=D0=B0=D0=BB=D0=B0-=D0=BA=D1=80=D1=83=D1=88=D0=B8=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Prototypes/Entities/Objects/Weapons/Melee/mining.yml   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 947bc01bcc..378367bfe5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -75,6 +75,13 @@
   name: crusher dagger
   description: A scaled down version of a proto-kinetic crusher. Uses kinetic energy to vibrate the blade at high speeds.
   components:
+#WD edit start
+  - type: EmbeddableProjectile
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 15
+#WD edit end
   - type: Sprite
     sprite: Objects/Weapons/Melee/crusher_dagger.rsi
     state: icon

From e247779b967cd14860a735480af599969361023c Mon Sep 17 00:00:00 2001
From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date: Thu, 26 Dec 2024 10:16:07 +0300
Subject: [PATCH 05/22] Stuff

---
 .../_White/GhostRecruitment/GhostRecruitmentSystem.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/_White/GhostRecruitment/GhostRecruitmentSystem.cs b/Content.Server/_White/GhostRecruitment/GhostRecruitmentSystem.cs
index a7ed4e92a6..c917ec24cf 100644
--- a/Content.Server/_White/GhostRecruitment/GhostRecruitmentSystem.cs
+++ b/Content.Server/_White/GhostRecruitment/GhostRecruitmentSystem.cs
@@ -63,7 +63,7 @@ public sealed class GhostRecruitmentSystem : EntitySystem
 
         var count = 0;
 
-        var maxCount = Math.Max(3, _playerManager.PlayerCount / 8);
+        var maxCount = Math.Max(3, _playerManager.PlayerCount / 12);
         var query = EntityQueryEnumerator<GhostRecruitedComponent>();
 
         while (query.MoveNext(out var uid, out var ghostRecruitedComponent))

From 3b2a6eb27c79c9ca21dfdd50bfe1b7f7bca0c4b3 Mon Sep 17 00:00:00 2001
From: keslik <simonov.danila20@gmail.com>
Date: Thu, 26 Dec 2024 15:21:15 +0300
Subject: [PATCH 06/22] Add: Reindeer and snowman

---
 Resources/Locale/ru-RU/_white/new-year.ftl    |   5 ++
 .../Entities/Objects/Decoration/snowman.yml   |  43 ++++++++++++++
 .../_White/Entities/Mobs/Animal/mobs.yml      |  56 ++++++++++++++++++
 .../White/Mobs/Animals/reindeer.rsi/dead.png  | Bin 0 -> 1036 bytes
 .../White/Mobs/Animals/reindeer.rsi/meta.json |  23 +++++++
 .../Mobs/Animals/reindeer.rsi/reindeer.png    | Bin 0 -> 3753 bytes
 .../Decoration/NewYear/snowman.rsi/meta.json  |  14 +++++
 .../NewYear/snowman.rsi/snowman.png           | Bin 0 -> 912 bytes
 8 files changed, 141 insertions(+)
 create mode 100644 Resources/Locale/ru-RU/_white/new-year.ftl
 create mode 100644 Resources/Prototypes/Entities/Objects/Decoration/snowman.yml
 create mode 100644 Resources/Textures/White/Mobs/Animals/reindeer.rsi/dead.png
 create mode 100644 Resources/Textures/White/Mobs/Animals/reindeer.rsi/meta.json
 create mode 100644 Resources/Textures/White/Mobs/Animals/reindeer.rsi/reindeer.png
 create mode 100644 Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/meta.json
 create mode 100644 Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/snowman.png

diff --git a/Resources/Locale/ru-RU/_white/new-year.ftl b/Resources/Locale/ru-RU/_white/new-year.ftl
new file mode 100644
index 0000000000..600c0197df
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/new-year.ftl
@@ -0,0 +1,5 @@
+ent-MobReindeer = северный олень
+    .desc = А где Санта?
+
+ent-DecorationSnowman = снеговик
+    .desc = Кажется, он следит за тобой.
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/snowman.yml b/Resources/Prototypes/Entities/Objects/Decoration/snowman.yml
new file mode 100644
index 0000000000..1b108d59f6
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Decoration/snowman.yml
@@ -0,0 +1,43 @@
+- type: entity # WD
+  parent: BaseStructure
+  id: DecorationSnowman
+  name: snowman
+  description: It seems he is following you.
+  placement:
+    mode: AlignTileAny
+  components:
+  - type: Physics
+    bodyType: Static
+  - type: Transform
+    noRot: true
+  - type: Sprite
+    sprite: White/Objects/Decoration/NewYear/snowman.rsi
+    state: snowman
+    noRot: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.3
+        density: 190
+        mask:
+        - HighImpassable
+  - type: Damageable
+    damageContainer: StructuralInorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 20
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/Footsteps/snowstep3.ogg
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path:
+          "/Audio/Weapons/star_hit.ogg"
diff --git a/Resources/Prototypes/_White/Entities/Mobs/Animal/mobs.yml b/Resources/Prototypes/_White/Entities/Mobs/Animal/mobs.yml
index 2da6687b4b..c34526928a 100644
--- a/Resources/Prototypes/_White/Entities/Mobs/Animal/mobs.yml
+++ b/Resources/Prototypes/_White/Entities/Mobs/Animal/mobs.yml
@@ -78,3 +78,59 @@
   - type: FootstepModifier
     footstepSoundCollection:
       path: /Audio/Effects/hulk_step.ogg
+
+- type: entity
+  name: reindeer
+  parent: SimpleMobBase
+  id: MobReindeer
+  description: Where is Santa?
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: reindeer
+      sprite: White/Mobs/Animals/reindeer.rsi
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.40
+        density: 400
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: reindeer
+      Dead:
+        Base: dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeat
+      amount: 5
+  - type: InteractionPopup
+    successChance: 0.7
+    interactDelay: 2 # Avoids overlapping SFX due to spam - these SFX are a little longer than the typical 1 second.
+    interactSuccessString: petting-success-soft-floofy
+    interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/kangaroo_grunt.ogg
+  - type: Perishable
+    molsPerSecondPerUnitMass: 0.0015
+  - type: NpcFactionMember
+    factions:
+    - Passive
+  - type: Body
+    prototype: AnimalRuminant
+  - type: HTN
+    rootTask:
+      task: RuminantCompound
diff --git a/Resources/Textures/White/Mobs/Animals/reindeer.rsi/dead.png b/Resources/Textures/White/Mobs/Animals/reindeer.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..cda66cc28508de0755a434dc8ea908063bdca558
GIT binary patch
literal 1036
zcmV+n1oQieP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkRzDYzuR9J=WmrYDuRTRg6@6CJ6o5wH^hG7_xSEi8Cmf@pfO*FQZ
zMoAhM)Vk1^XsS*8h|x60)P)P9D~(+kcW4ZWAq|!h8=D4g8ZpL5iBu43`XMb09T@p2
zUj;fJZ{Brbc`2a_h(=t@S>Ahd{=ak2xhMBXLI^g~<V{u20Av6%02zP`Kn5TK@P7c<
zupNE<WpU*2v!d(V8S%<XhyT%UMhJnl5n+JP&h7SEp}&xm;jd{u5ni{S4FlXu*yG8;
z=MNALf5orodsvPq$kAOm)hryUgH+OFW^Rt>{uriFQFzi{Ku)#}K>w9%wx$pQWj&-r
z9W6|sad70*FkM~W^FaOm0PL!*#+|L>E%35?_k(=$;YZv~#L-<&)T{#9HI3Fpf``p<
zoMN6{DL`FixwsodF#<jzNiy8YW+XNt0c<Jui+v4y86F<tg{PW0`ORs(2M*#fP0AF7
zA3k`G$>}L3r=}T>+#nhqM+kwI<;1em7-d0TJ<$$8xZ2IwVgkQmFfls1DmY~{Hf3Ll
z5%7sE0l$dECZx#t1bx3;VDJ7%Y5x5>YSIEA{_fk{d}I&4@hH``wRCrP6RO%l|8E1-
zj^E<X=m>h2gY=b40JMd&$?u!v{QiBU2Y-TG17PJQq%}2Q6#0Z@S!kMuEJ0~vl7Oy|
zt2qc>TB1==IR4BbJnkGCA8(-L=!=xNRTNpmuV-NifwOm(M&<A9cGS2zG_c4qA8gHa
z^0Vc)wfZg(Np=lvFS}2emW4~xNF<Y(sWi)}BoWO=zBPl(;UE_BaQ5N?Z?$!Bv-6bg
zs8G+st;+Po7IE%rf^8PP$rQ?k?-+|N;x<kEE*HAupnve%s-P8svf?5k%MOM{q7p!<
zzd%Tm#G6wy09>uqIX*bg8&w`U{R;K1r)X~ejCgk^`I>|IL>g6=m`|oD={Zflrl80&
zw{?YMH%#6)oM2ka&&JmjxCBsP6bqN8F?jX51W;V)72nP-*oV%VCQJ2s2mx~mlctZ`
z0BCsZ2>{;NmB-T;mjHMzSCHqFDRQgis4}W7F&#HqNLsXy#8*Xc_kjwdL=26Nt=d!-
zMWjqq8c<aM@MS2QrBs?;XOL)Yl9n$%$9v$Qeg65a#+v9>%rhI|$4PTdz1e-ho0p3s
zOXBjK6x{VzsY#`zy2^6FGWZJeN!?n)t-AoINu_M3b@oGE-E7un57kwP`kmWEs3LgJ
z-d<N(E>@rbu_IXeuS~RS2IEjgP*fPj|Jk@Kgh1Nt@%%5c&2;F_QCr&p0000<MNUMn
GLSTYYy6C?E

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Mobs/Animals/reindeer.rsi/meta.json b/Resources/Textures/White/Mobs/Animals/reindeer.rsi/meta.json
new file mode 100644
index 0000000000..7748867d4b
--- /dev/null
+++ b/Resources/Textures/White/Mobs/Animals/reindeer.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from ParadiseSS13 at https://github.com/ss220club/Paradise-SS220/blob/master/icons/mob/winter_mob.dmi",
+  "states": [
+    {
+      "name": "dead",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "reindeer",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/White/Mobs/Animals/reindeer.rsi/reindeer.png b/Resources/Textures/White/Mobs/Animals/reindeer.rsi/reindeer.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b20f0dc89745cab8ff7c69e27fc45c018df42d
GIT binary patch
literal 3753
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
TZ!|kz00000NkvXXu0mjf`X*A!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/meta.json b/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/meta.json
new file mode 100644
index 0000000000..2d63ead19c
--- /dev/null
+++ b/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from ParadiseSS13 at https://github.com/ss220club/Paradise-SS220/blob/master/icons/obj/statue.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "snowman"
+        }
+    ]
+}
diff --git a/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/snowman.png b/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/snowman.png
new file mode 100644
index 0000000000000000000000000000000000000000..85340cd3c3cf4de8fd36a8da9f331244233a2aa7
GIT binary patch
literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkRLP<nHR9J=WmoZB-Srmq!1WgmcNg`yoFd8yovxF2{DT9TGh{b~V
z8&<Hg-*y|fu@T%qU?XE?r3NIG5Sz$0G6R{xW+zONJCZbs<Zj_QB%jG-l5fE+_P{WA
z4(Fcpp7*{t_a-8x<SQ-urPcoj@LvEh^F5OrjfSt_WHK3<CdX6^xUMT**OiS%gJd#E
zqtU>1U1^%;#9Jyd={B@&TXwr$R8{qTrfK@)+1Xi^mX<=ZF%<*DimR%Mq9~ImlTwC$
z48xFyVMzH-n?IIP${&@uKmNxbD(A!usH#e_Si~?4R8{4#Uw#7M*WXSk7K;-TFp&mK
z)0B#$u&}UzX`0Oa{xbkS{PAah%m>g=Ita~xuIn-qiBPFja9wv~aoe`3R4VAY9;&lY
z4CuNpHBIC7^%cvqcz%9ndwcs++|A7mD=RAqA;@O4RI63?_xA&t82dw{>$=?9+VZ~(
zg#w0QaCdhHK(E&WAR3JljYcUH3f$k{lgs7&`9UB88TjZt7K`C|9_4bG&CSg~!0mRM
za=FaT&JJ&HZvc3nM<$aQ3L;Pgnx^sc@`C4izR$MpKmh$VGxJVxxm+F@69}MGDh(vi
zG>vMtif!AUfVA6fzk5y7czAdKpwsCDf*dPCUDstcoAtjJ7Z-hC!%WjO;GOpQ`FTpE
zQlJpWYG8GBmB+_Nve_)nW)pyXK9A>lBoc{%_+GEa)6)||2-eote9fd%sp$cHh_0XV
zX0u5?pZ^qpdwa{q#s=|te84Y+AeYMx1rZ3qwrx2#H}}ckY&MC-VngSATO6R(YK=T0
z14VdxdOFmfNF<2I<76_Kfp@ptMF=qvD}-QJ6QKYESt^wpcncv=6vaQ1KY&=4MXS}C
z4nU{V89BLLuMa%K?gByx9LM40<YZ)xvD@(I=t!=wuai!vDHIBUvHgYNz5A=HE6&c&
zM(%>KOHixTNT<^{j^ii(cAfhRe=LP%SvZbEtyT-nAL=wbI5?01hlhtajzhg(XLolO
zMNvM1u`COK^Ye26E-x<wPs52WBzt>%65#mw*!L|jFZ+cZ#{uBt;)3hz>rfYxiEqXI
mK!#b^!rukp-?T6PYxXz2r2ppm{eVRP0000<MNUMnLSTXn7pZ~(

literal 0
HcmV?d00001


From e2c43cf1155447673793038ae21800e6659e4bc1 Mon Sep 17 00:00:00 2001
From: Hero010h <163765999+Hero010h@users.noreply.github.com>
Date: Thu, 26 Dec 2024 17:43:45 +0300
Subject: [PATCH 07/22] =?UTF-8?q?=D0=AF=D1=89=D0=B8=D0=BA=D0=B8=20=D0=B3?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Belt/clothingBeltUtilityImproved.yml      |  2 +-
 .../Specific/Medical/expanded_medkit.yml      |  2 +-
 .../Structures/Storage/CleanersLocker.yml     | 33 ++++++++++++++++---
 .../Structures/Storage/SenorsLockers.yml      | 15 +++++----
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml
index b4bcd14018..66bc00f9a4 100644
--- a/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml
+++ b/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml
@@ -10,4 +10,4 @@
       - id: ImprovedScrewdriver
       - id: ImprovedWirecutter
       - id: ImprovedWelder
-      - id: NetworkConfigurator
+      - id: Multitool
diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml
index 3c0d2d62ec..574f7abbf9 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: Medkit
   id: ExpandedMedkit
-  name: expanded medkit
+  name: расширенная аптечка
   components:
     - type: Sprite
       sprite: White/Specific/expmedkit.rsi
diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml
index 5ebdb62092..b84452ede9 100644
--- a/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: LockerHeadCleaner
-  parent: BaseSenorsLocker
-  name: head cleaner's locker
+  id: LockerCleaner
+  parent: BaseSeniorsLocker
+  name: шкаф уборщика
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -9,4 +9,29 @@
     stateDoorOpen: head_cleaner_open
     stateDoorClosed: head_cleaner_door
   - type: AccessReader
-    access: [ [ "Janitor" ] ]
\ No newline at end of file
+    access: [ [ "Janitor" ] ]
+    
+- type: entity
+  id: LockerCleanerFilled
+  parent: LockerCleaner
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: MopItem
+        amount: 2
+      - id: BoxMousetrap
+        amount: 2
+      - id: WetFloorSign
+        amount: 3
+      - id: TrashBag
+        amount: 2
+      - id: LightReplacer
+      - id: BoxLightMixed
+      - id: Holoprojector
+      - id: SoapNT
+        amount: 2
+      - id: FlashlightLantern
+        amount: 2
+      - id: Plunger
+        amount: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
index c3e3562945..6bca59642d 100644
--- a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BaseSenorsLocker
+  id: BaseSeniorsLocker
   parent: LockerBaseSecure
   abstract: true
   name: base senors locker
@@ -11,7 +11,7 @@
 
 - type: entity
   id: LockerVeteran
-  parent: BaseSenorsLocker
+  parent: BaseSeniorsLocker
   name: шкаф ветерана
   components:
   - type: Appearance
@@ -52,7 +52,7 @@
 
 - type: entity
   id: LockerBrigadier
-  parent: BaseSenorsLocker
+  parent: BaseSeniorsLocker
   name: шкаф бригадира
   components:
   - type: Appearance
@@ -94,7 +94,7 @@
 
 - type: entity
   id: LockerMedicalOfficer
-  parent: BaseSenorsLocker
+  parent: BaseSeniorsLocker
   name: шкаф медицинского офицера
   components:
   - type: Appearance
@@ -142,7 +142,7 @@
     
 - type: entity
   id: LockerCargoHunter
-  parent: BaseSenorsLocker
+  parent: BaseSeniorsLocker
   name: шкаф охотника карго
   components:
   - type: Appearance
@@ -177,7 +177,7 @@
 
 - type: entity
   id: LockerLeadResearcher
-  parent: BaseSenorsLocker
+  parent: BaseSeniorsLocker
   name: шкаф ведущего исследователя
   components:
   - type: Appearance
@@ -191,9 +191,11 @@
 - type: entity
   id: LockerLeadResearcherFilled
   parent: LockerLeadResearcher
+  suffix: Filled
   components:
   - type: StorageFill
     contents:
+      - id: AnomalyLocator
       - id: ClothingHandsGlovesLatex
       - id: ClothingHeadsetScience
       - id: ClothingMaskSterile
@@ -201,5 +203,4 @@
       - id: AnomalyScanner
       - id: NodeScanner
       - id: NetworkConfigurator
-        prob: 0.5
       - id: ClothingShoesBootsMagSci
\ No newline at end of file

From 44cc12c3a28a238e22ef9d8c2a614f45e762277c Mon Sep 17 00:00:00 2001
From: Hero010h <163765999+Hero010h@users.noreply.github.com>
Date: Thu, 26 Dec 2024 18:03:29 +0300
Subject: [PATCH 08/22] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_White/Entities/Structures/Storage/SenorsLockers.yml         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
index 6bca59642d..f9c57d1737 100644
--- a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
@@ -156,6 +156,7 @@
 - type: entity
   id: LockerCargoHunterFilled
   parent: LockerCargoHunter
+  suffix: Filled
   components:
   - type: StorageFill
     contents:

From 6bad22bd399d3ee11a377c81af790bddd1a5b244 Mon Sep 17 00:00:00 2001
From: Hero010h <163765999+Hero010h@users.noreply.github.com>
Date: Thu, 26 Dec 2024 18:11:30 +0300
Subject: [PATCH 09/22] =?UTF-8?q?=D0=9E=D0=BF=D1=8F=D1=82=D1=8C=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_White/Entities/Structures/Storage/SenorsLockers.yml       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
index f9c57d1737..56814a6972 100644
--- a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
@@ -49,6 +49,7 @@
       - id: WeaponPistolMk58Nonlethal
       - id: SurveillanceBodyCamera
       - id: MagazinePistol
+      - id: ClothingHeadHatBeretSecurity
 
 - type: entity
   id: LockerBrigadier
@@ -204,4 +205,4 @@
       - id: AnomalyScanner
       - id: NodeScanner
       - id: NetworkConfigurator
-      - id: ClothingShoesBootsMagSci
\ No newline at end of file
+      - id: ClothingHandsGlovesMagnetic
\ No newline at end of file

From 1329e4ee667e9a72200e16888242c664e0d60e19 Mon Sep 17 00:00:00 2001
From: RavmorganButOnCocaine <valtos@nextmail.ru>
Date: Thu, 26 Dec 2024 17:10:03 +0000
Subject: [PATCH 10/22] Automatic changelog update

---
 Resources/Changelog/ChangelogWhite.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml
index f3e637ccf8..522ebff4cc 100644
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: wCATw
-  changes:
-  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u043E\
-      \u0444\u043B\u044B \u0441 id \u043A\u0430\u0440\u0442\u0430\u043C\u0438, unicode\
-      \ \u0440\u043E\u0444\u043B\u0430\u043C\u0438 \u0432 \u0440\u0435\u0434\u0430\
-      \u043A\u0442\u043E\u0440\u0435 \u0438 \u043F\u0440\u043E\u0447\u0438\u043C."
-    type: Fix
-  id: 141
-  time: '2023-04-11T16:55:01.0000000+00:00'
 - author: HitPanda
   changes:
   - message: "\u0415\u0433\u0430\u043D\u0443 \u0438\u0437\u043C\u0435\u043D\u0451\u043D\
@@ -8908,3 +8899,12 @@
   id: 640
   time: '2024-12-25T21:15:53.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/845
+- author: keslik
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u043D\u0435\
+      \u0433\u043E\u0432\u0438\u043A \u0438 \u0441\u0435\u0432\u0435\u0440\u043D\u044B\
+      \u0439 \u043E\u043B\u0435\u043D\u044C"
+    type: Add
+  id: 641
+  time: '2024-12-26T17:08:59.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/848

From 742230fa15ca4b08c1ab2854cb9f90f2e6e7ae18 Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Thu, 26 Dec 2024 20:32:38 +0300
Subject: [PATCH 11/22] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Objects/Weapons/Melee/mining.yml      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 378367bfe5..d12de9dbe9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -75,13 +75,6 @@
   name: crusher dagger
   description: A scaled down version of a proto-kinetic crusher. Uses kinetic energy to vibrate the blade at high speeds.
   components:
-#WD edit start
-  - type: EmbeddableProjectile
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Piercing: 15
-#WD edit end
   - type: Sprite
     sprite: Objects/Weapons/Melee/crusher_dagger.rsi
     state: icon
@@ -92,6 +85,13 @@
     damage:
       types:
         Slash: 15
+  - type: EmbeddableProjectile # WD
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: DamageOtherOnHit # WD
+    damage:
+      types:
+        Piercing: 17
+        Slash: 15
   - type: Tag
     tags:
     - Knife

From c53fa37b17ed8ee448911f8ed6e2d17e04a26a00 Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Thu, 26 Dec 2024 20:32:51 +0300
Subject: [PATCH 12/22] =?UTF-8?q?=D0=A0=D0=B5=D0=B1=D0=B0=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=BD=D1=81=20=D0=BD=D0=BE=D0=B6=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Objects/Weapons/Melee/knife.yml   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 6652b98efe..04b5dbf346 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -42,10 +42,13 @@
   - type: Item
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
     storedRotation: -45
+  - type: EmbeddableProjectile # WD
+    sound: /Audio/Weapons/star_hit.ogg
   - type: DamageOtherOnHit # WD
     damage:
       types:
-        Piercing: 20
+        Piercing: 10
+        Slash: 10
   - type: GuideHelp
     guides:
     - Chef
@@ -73,6 +76,13 @@
     damage:
       types:
         Slash: 13 # WD
+  - type: EmbeddableProjectile # WD
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: DamageOtherOnHit # WD
+    damage:
+      types:
+        Piercing: 10
+        Slash: 13
   - type: Item
     size: Normal
     sprite: Objects/Weapons/Melee/cleaver.rsi
@@ -104,7 +114,8 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 27 # WD
+        Piercing: 15 # WD
+        Slash: 12 # WD
   - type: Item
     sprite: Objects/Weapons/Melee/combat_knife.rsi
     storedRotation: -45
@@ -144,7 +155,8 @@
   - type: DamageOtherOnHit # WD
     damage:
       types:
-        Piercing: 44
+        Piercing: 32
+        Slash: 12
   - type: Item
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
 

From 15ee317201a3059a1e58188f7c94e29f33e6ef17 Mon Sep 17 00:00:00 2001
From: RavmorganButOnCocaine <valtos@nextmail.ru>
Date: Thu, 26 Dec 2024 17:34:35 +0000
Subject: [PATCH 13/22] Automatic changelog update

---
 Resources/Changelog/ChangelogWhite.yml | 27 ++++++++++----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml
index 522ebff4cc..7db6883592 100644
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -1,21 +1,4 @@
 Entries:
-- author: HitPanda
-  changes:
-  - message: "\u0415\u0433\u0430\u043D\u0443 \u0438\u0437\u043C\u0435\u043D\u0451\u043D\
-      \ \u0440\u0430\u0437\u043C\u0435\u0440 \u0441\u043E \u0441\u0442\u0430\u043D\
-      \u0434\u0430\u0440\u0442\u043D\u043E\u0433\u043E \u0434\u043E \u043C\u0430\u043B\
-      \u0435\u043D\u044C\u043A\u043E\u0433\u043E(\u043A\u0430\u043A \u0443 \u043F\u0438\
-      \u0441\u0442\u043E\u043B\u0435\u0442\u043E\u0432). \u0422\u0435\u043F\u0435\u0440\
-      \u044C \u0435\u0433\u043E \u043C\u043E\u0436\u043D\u043E \u043A\u043B\u0430\u0441\
-      \u0442\u044C \u0432 \u043F\u043E\u044F\u0441\u0430. \u0412\u0435\u0441 \u0442\
-      \u0430\u043A\u0436\u0435 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D \u0441\
-      \ 50 \u0434\u043E 20."
-    type: Tweak
-  - message: "\u041C\u0435\u043B\u043A\u0438\u0435 \u043F\u0440\u0430\u0432\u043A\u0438\
-      \ \u043F\u0435\u0440\u0435\u0432\u043E\u0434\u0430."
-    type: Fix
-  id: 142
-  time: '2023-04-14T13:41:52.0000000+00:00'
 - author: RavMorgan
   changes:
   - message: "\u041C\u044F\u0441\u043D\u0430\u044F \u043F\u0430\u043D\u0435\u043B\u044C\
@@ -8908,3 +8891,13 @@
   id: 641
   time: '2024-12-26T17:08:59.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/848
+- author: Hero_010
+  changes:
+  - message: "\u041A\u0438\u043D\u0436\u0430\u043B-\u041A\u0440\u0443\u0448\u0438\u0442\
+      \u0435\u043B\u044C \u043C\u043E\u0436\u0435\u0442 \u043D\u0430\u043D\u043E\u0441\
+      \u0438\u0442\u044C \u0443\u0440\u043E\u043D \u043C\u0435\u0442\u0430\u043D\u0438\
+      \u0435\u043C."
+    type: Tweak
+  id: 642
+  time: '2024-12-26T17:33:31.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/846

From fab57e12707b89ce4e2bedcebc6e9147bfb808ee Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Thu, 26 Dec 2024 21:48:35 +0300
Subject: [PATCH 14/22] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_White/Entities/Structures/Storage/SenorsLockers.yml       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
index 56814a6972..d35766275d 100644
--- a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
@@ -140,7 +140,7 @@
         orGroup: Surgshrubs
       - id: ClothingMaskSterile
       - id: ExpandedMedkitFilled
-    
+
 - type: entity
   id: LockerCargoHunter
   parent: BaseSeniorsLocker
@@ -205,4 +205,3 @@
       - id: AnomalyScanner
       - id: NodeScanner
       - id: NetworkConfigurator
-      - id: ClothingHandsGlovesMagnetic
\ No newline at end of file

From 778c93489da48a6782b581bc8de2b0a9fc4a303e Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Thu, 26 Dec 2024 21:48:44 +0300
Subject: [PATCH 15/22] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B8=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Objects/Tools/tools.yml          | 20 ++++++++++---------
 .../Entities/Objects/Tools/seniors_tools.yml  | 20 +++++++++++++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 3a6f430fe3..d785d1190c 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -129,9 +129,10 @@
     state: icon
   - type: Item
     sprite: Objects/Tools/wrench.rsi
-    storedSprite:
-      sprite: Objects/Tools/wrench.rsi
-      state: storage
+    storedRotation: -44 # WD
+    # storedSprite: # WD removed
+    #   sprite: Objects/Tools/wrench.rsi
+    #   state: storage
   - type: MeleeWeapon
     wideAnimationRotation: 135
     attackRate: 1.5
@@ -177,9 +178,10 @@
   - type: Item
     sprite: Objects/Tools/crowbar.rsi
     size: Small
-    storedSprite:
-      sprite: Objects/Tools/crowbar.rsi
-      state: storage
+    storedRotation: -63 # WD
+    # storedSprite: # WD removed
+    #   sprite: Objects/Tools/crowbar.rsi
+    #   state: storage
   - type: MeleeWeapon
     wideAnimationRotation: -135
     damage:
@@ -213,9 +215,9 @@
     state: red-icon
   - type: Item
     heldPrefix: red
-    storedSprite:
-      sprite: Objects/Tools/crowbar.rsi
-      state: red-storage
+    # storedSprite: # WD removed
+    #   sprite: Objects/Tools/crowbar.rsi
+    #   state: red-storage
 
 - type: entity
   name: multitool
diff --git a/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml
index 40f6ee17f2..d4a505c9cd 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml
@@ -16,6 +16,9 @@
       sprite: White/Objects/Tools/impcrowbar.rsi
     - type: Item
       sprite: White/Objects/Tools/impcrowbar.rsi
+      size: Small
+      storedSprite: null
+      storedRotation: -63
 
 - type: entity
   parent: Wrench
@@ -30,6 +33,9 @@
       sprite: White/Objects/Tools/impwrench.rsi
     - type: Item
       sprite: White/Objects/Tools/impwrench.rsi
+      size: Small
+      storedSprite: null
+      storedRotation: -44
     - type: MeleeWeapon
       attackRate: 1.5
       damage:
@@ -55,6 +61,7 @@
       state: icon
     - type: Item
       sprite: White/Objects/Tools/impscrewdriver.rsi
+      storedRotation: -90
     - type: UseDelay
     - type: MeleeWeapon
       attackRate: 1
@@ -72,6 +79,12 @@
     - type: PhysicalComposition
       materialComposition:
         Steel: 100
+    - type: EmitSoundOnPickup
+      sound:
+        path: /Audio/White/Items/handling/screwdriver_pickup.ogg
+    - type: EmitSoundOnDrop
+      sound:
+        path: /Audio/Items/screwdriver_drop.ogg
 
 - type: entity
   parent: BaseItem
@@ -83,6 +96,7 @@
       price: 500
     - type: Item
       sprite: White/Objects/Tools/impwirecutter.rsi
+      storedRotation: -90
     - type: Sprite
       sprite: White/Objects/Tools/impwirecutter.rsi
       state: icon
@@ -110,6 +124,12 @@
     - type: PhysicalComposition
       materialComposition:
         Steel: 100
+    - type: EmitSoundOnPickup
+      sound:
+        path: /Audio/White/Items/handling/wirecutter_pickup.ogg
+    - type: EmitSoundOnDrop
+      sound:
+        path: /Audio/Items/wirecutter_drop.ogg
 
 - type: entity
   parent: BaseWelder

From a4f5165fc12e7dc3238114bbd610146f3f56246f Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Thu, 26 Dec 2024 23:25:54 +0300
Subject: [PATCH 16/22] Update _engine_lib.ftl

---
 Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl b/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl
index cf69936c9e..468824afdc 100644
--- a/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl
+++ b/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl
@@ -53,8 +53,8 @@ zzzz-conjugate-be =
 # Used internally by the CONJUGATE-HAVE() function.
 zzzz-conjugate-have =
     { GENDER($ent) ->
-        [epicene] have
-       *[other] has
+        [epicene] имеют
+       *[other] имеет
     }
 # Used internally by the CONJUGATE-BASIC() function.
 zzzz-conjugate-basic =

From 44bf677f92c7f4b741d95386666e22d9741e3e0e Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Thu, 26 Dec 2024 23:43:21 +0300
Subject: [PATCH 17/22] Genders update

---
 .../ru-RU/interaction/interaction-popup-component.ftl    | 2 +-
 Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl    | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl
index f4bebe19f0..9a09e505b9 100644
--- a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl
@@ -10,7 +10,7 @@ petting-success-bird = Вы гладите { $target } по { POSS-ADJ($target)
 petting-success-cat = Вы гладите { $target } по { POSS-ADJ($target) } маленькой пушистой голове.
 petting-success-corrupted-corgi = В порыве самонадеянности, вы гладите { $target } по { POSS-ADJ($target) } маленькой проклятой голове.
 petting-success-crab = Вы гладите { $target } по { POSS-ADJ($target) } маленькой гладкой голове.
-petting-success-dehydrated-carp = Вы гладите { $target } по { POSS-ADJ($target) } сухой маленькой голове. { CAPITALIZE(OBJECT($target)) } похоже теперь любит вас.
+petting-success-dehydrated-carp = Вы гладите { $target } по { POSS-ADJ($target) } сухой маленькой голове. { CAPITALIZE(SUBJECT($target)) } похоже теперь любит вас.
 petting-success-dog = Вы гладите { $target } по { POSS-ADJ($target) } мягкой пушистой голове.
 petting-success-frog = Вы гладите { $target } по { POSS-ADJ($target) } маленькой скользкой голове.
 petting-success-goat = Вы гладите { $target } по { POSS-ADJ($target) } рогатой пушистой голове.
diff --git a/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl b/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl
index 468824afdc..9301b9988b 100644
--- a/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl
+++ b/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl
@@ -13,12 +13,13 @@ zzzz-subject-pronoun =
        *[neuter] оно
     }
 # Used internally by the OBJECT() function.
+# I know it's wrong, but I don't have gender studies degree and it's just works.
 zzzz-object-pronoun =
     { GENDER($ent) ->
-        [male] его
-        [female] её
-        [epicene] их
-       *[neuter] его
+        [male] него
+        [female] неё
+        [epicene] них
+       *[neuter] него
     }
 # Used internally by the POSS-PRONOUN() function.
 zzzz-possessive-pronoun =

From caae80f51e195f84cf24ab3ee13aaadc1ca0dd64 Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Fri, 27 Dec 2024 00:08:41 +0300
Subject: [PATCH 18/22] =?UTF-8?q?=D0=92=D0=B5=D1=89=D0=BC=D0=B5=D1=88?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D1=81=D0=B8=D0=BD=D0=B4=D0=B8=D0=BA=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../catalog/fills/backpacks/duffelbag.ftl     | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
index 94a8bdf369..297dc7da08 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
@@ -1,51 +1,51 @@
-ent-ClothingBackpackDuffelSurgeryFilled = хирургический вещмешок
-    .desc = Большой вещевой мешок для хранения дополнительного медицинского снаряжения - похоже, этот мешок предназначен для хранения хирургических инструментов.
-ent-ClothingBackpackDuffelSyndicateFilledMedical = хирургический вещмешок синдиката
-    .desc = Большой вещевой мешок с полным набором хирургических инструментов.
-ent-ClothingBackpackDuffelSyndicateFilledShotgun = набор "Бульдог"
-    .desc = Простой и надежный: Содержит популярный дробовик Бульдог, барабан пуль и 3 барабана дроби.
-ent-ClothingBackpackDuffelSyndicateFilledSMG = набор "C-20r"
-    .desc = Старый добрый: Классический пистолет-пулемет C-20r в комплекте с тремя магазинами.
-ent-ClothingBackpackDuffelSyndicateFilledRevolver = набор "Питон"
-    .desc = Выступите громко и гордо с заряженным Магнум Питон и двумя спидлоадерами.
-ent-ClothingBackpackDuffelSyndicateFilledLMG = набор "L6 Saw"
-    .desc = Еще больше дакки: культовый лёгкий пулемет L6 в комплекте с 2 коробами патронов.
-ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncher = набор "Крайт"
-    .desc = Старый гранатомет Крайт, снабженный 11 гранатами различной поражающей способности.
-ent-ClothingBackpackDuffelSyndicateFilledCarbine = набор "М-90gl"
-    .desc = Универсальная боевая винтовка с подствольным гранатометом, в комплекте с 3 магазинами и 6 гранатами различной мощности.
-ent-ClothingBackpackDuffelSyndicateAmmoFilled = набор боеприпасов
-    .desc = Перезаряжаю! Содержит 4 магазина для C-20r, 4 барабана для Бульдога и 2 короба патронов для L6 SAW.
-ent-ClothingBackpackDuffelSyndicateCostumeCentcom = вещмешок с костюмом представителя Центкома
-    .desc = Содержит полный комплект униформы представителя Центкома, гарнитуру и планшет. Гарнитура поставляется без ключа шифрования.
+ent-ClothingBackpackDuffelSurgeryFilled = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор хирургических инструментов.
+ent-ClothingBackpackDuffelSyndicateFilledMedical = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор хирургических инструментов.
+ent-ClothingBackpackDuffelSyndicateFilledShotgun = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "Бульдог".
+ent-ClothingBackpackDuffelSyndicateFilledSMG = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "C-20r".
+ent-ClothingBackpackDuffelSyndicateFilledRevolver = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "Питон".
+ent-ClothingBackpackDuffelSyndicateFilledLMG = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "L6 Saw".
+ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncher = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "Крайт".
+ent-ClothingBackpackDuffelSyndicateFilledCarbine = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "М-90gl".
+ent-ClothingBackpackDuffelSyndicateAmmoFilled = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор боеприпасов.
+ent-ClothingBackpackDuffelSyndicateCostumeCentcom = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: костюм представителя Центкома.
     .suffix = НЕ МАППИТЬ
 ent-ClothingBackpackDuffelSyndicateCostumeClown = { ent-ClothingBackpackDuffelClown }
     .desc = { ent-ClothingBackpackDuffelClown.desc }
     .suffix = Синдикат
-ent-ClothingBackpackDuffelSyndicateCarpSuit = вещмешок костюма карпа
-    .desc = Содержит костюм карпа и нескольких друзей для игр.
-ent-ClothingBackpackDuffelSyndicatePyjamaBundle = вещмешок пижам синдиката
-    .desc = Содержит 3 пижамы синдиката и 3 плюшевые игрушки для самой лучшей ночёвки.
-ent-ClothingBackpackDuffelSyndicateC4tBundle = набор C-4 синдиката
-    .desc = Содержит много зарядов взрывчатки С-4.
+ent-ClothingBackpackDuffelSyndicateCarpSuit = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор костюма карпа.
+ent-ClothingBackpackDuffelSyndicatePyjamaBundle = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор пижам.
+ent-ClothingBackpackDuffelSyndicateC4tBundle = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор C-4.
 ent-ClothingBackpackChameleonFill = { ent-ClothingBackpackChameleon }
     .suffix = Заполненный, Хамелеон
     .desc = { ent-ClothingBackpackChameleon.desc }
-ent-ClothingBackpackDuffelSyndicateEVABundle = набор EVA синдиката
-    .desc = Содержит одобренный Синдикатом костюм EVA.
-ent-ClothingBackpackDuffelSyndicateHardsuitBundle = набор скафандра синдиката
-    .desc = Содержит фирменный кроваво-красный комбинезон Синдиката.
-ent-ClothingBackpackDuffelZombieBundle = зомби набор синдиката
-    .desc = Универсальный набор для создания зомби на станции.
-ent-ClothingBackpackDuffelSyndicateOperative = вещмешок оперативника
+ent-ClothingBackpackDuffelSyndicateEVABundle = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор EVA синдиката.
+ent-ClothingBackpackDuffelSyndicateHardsuitBundle = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор скафандра синдиката.
+ent-ClothingBackpackDuffelZombieBundle = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: зомби набор синдиката.
+ent-ClothingBackpackDuffelSyndicateOperative = { ent-ClothingBackpackDuffelSyndicate }
     .desc = { ent-ClothingBackpackDuffelSyndicateBundle.desc }
-ent-ClothingBackpackDuffelSyndicateOperativeMedic = вещмешок оперативника-медика
-    .desc = Большой вещевой мешок для хранения дополнительного медицинского снаряжения.
-ent-ClothingBackpackDuffelSyndicateMedicalBundleFilled = набор медикаментов
-    .desc = Все, что нужно для возвращения в строй ваших товарищей: главным образом, боевая аптечка, дефибриллятор и три боевых медипена.
-ent-ClothingBackpackDuffelSyndicateDecoyKitFilled = набор приманок
-    .desc = Содержит отвлечения, как слуховые, так и визуальные. Скоро будет запах.
-ent-ClothingBackpackDuffelSyndicateEliteHardsuitBundle = набор элитного скафандра синдиката
-    .desc = Содержит элитный скафандр синдиката, в который входит еще кое-что.
-ent-ClothingBackpackDuffelSyndicateHardsuitExtrasBundle = набор принадлежностей для скафандра
-    .desc = Содержит вещи, которые вам непременно понадобятся при покупке скафандра.
+ent-ClothingBackpackDuffelSyndicateOperativeMedic = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = { ent-ClothingBackpackDuffelSyndicateBundle.desc }
+ent-ClothingBackpackDuffelSyndicateMedicalBundleFilled = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор медикаментов.
+ent-ClothingBackpackDuffelSyndicateDecoyKitFilled = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор приманок.
+ent-ClothingBackpackDuffelSyndicateEliteHardsuitBundle = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор элитного скафандра синдиката.
+ent-ClothingBackpackDuffelSyndicateHardsuitExtrasBundle = { ent-ClothingBackpackDuffelSyndicate }
+    .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор принадлежностей для скафандра.

From 05c00cadfd26b5c8611ba752288298ca10f2ecd5 Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Fri, 27 Dec 2024 00:08:49 +0300
Subject: [PATCH 19/22] =?UTF-8?q?=D0=9B=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/Locale/ru-RU/store/store.ftl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Locale/ru-RU/store/store.ftl b/Resources/Locale/ru-RU/store/store.ftl
index 6bea8a60fe..c9ec4164c6 100644
--- a/Resources/Locale/ru-RU/store/store.ftl
+++ b/Resources/Locale/ru-RU/store/store.ftl
@@ -4,4 +4,7 @@ store-ui-balance-display = { $currency }: { $amount }
 store-ui-price-display = { $amount } { $currency }
 store-ui-traitor-flavor = Лицензия (C) НТ-30643
 store-ui-traitor-warning = Оперативники должны блокировать свои восходящие каналы связи после использования, чтобы избежать обнаружения.
+
 store-withdraw-button-ui = Вывести { $currency }
+store-ui-button-out-of-stock = {""} (Нет в наличии)
+store-not-account-owner = Этот {$store} не привязан к вам!

From b2374296c5ddf1835ad95d909d6c29b702d9a941 Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Fri, 27 Dec 2024 00:11:12 +0300
Subject: [PATCH 20/22] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Locale/ru-RU/wires/components/wires-panel-component.ftl     | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 Resources/Locale/ru-RU/wires/components/wires-panel-component.ftl

diff --git a/Resources/Locale/ru-RU/wires/components/wires-panel-component.ftl b/Resources/Locale/ru-RU/wires/components/wires-panel-component.ftl
deleted file mode 100644
index 66514f7731..0000000000
--- a/Resources/Locale/ru-RU/wires/components/wires-panel-component.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-wires-panel-component-on-examine-open = [color=lightgray]панель технического обслуживания[/color] [color=red]открыта[/color].
-wires-panel-component-on-examine-closed = The [color=lightgray]панель технического обслуживания[/color] [color=darkgreen]закрыта[/color].

From fd68a19f0ed9ffe4fc09c8c5e74e7d7b8d1466a2 Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Fri, 27 Dec 2024 00:12:32 +0300
Subject: [PATCH 21/22] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B4=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/Locale/ru-RU/nuke/nuke-component.ftl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Resources/Locale/ru-RU/nuke/nuke-component.ftl b/Resources/Locale/ru-RU/nuke/nuke-component.ftl
index 78cfb5a644..d81993b372 100644
--- a/Resources/Locale/ru-RU/nuke/nuke-component.ftl
+++ b/Resources/Locale/ru-RU/nuke/nuke-component.ftl
@@ -41,3 +41,7 @@ nuke-codes-fax-paper-name = коды ядерной аутентификации
 
 # Nuke disk slot
 nuke-slot-component-slot-name-disk = Диск
+
+## Examine
+nuke-examine-armed = Эй, а почему эта [color=red]красная лампочка[/color] мигает?
+nuke-examine-exploding = Ага... Похоже, уже слишком поздно, приятель.

From 84d7d88cded9b8dd2278ac792644cd2de48c45bd Mon Sep 17 00:00:00 2001
From: RavmorganButOnCocaine <valtos@nextmail.ru>
Date: Thu, 26 Dec 2024 21:18:52 +0000
Subject: [PATCH 22/22] Automatic changelog update

---
 Resources/Changelog/ChangelogWhite.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml
index 7db6883592..f52a67a40e 100644
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: RavMorgan
-  changes:
-  - message: "\u041C\u044F\u0441\u043D\u0430\u044F \u043F\u0430\u043D\u0435\u043B\u044C\
-      \ \u0442\u0435\u043F\u0435\u0440\u044C \u0440\u0430\u0431\u043E\u0442\u0430\u0435\
-      \u0442 \u0438 \u043F\u043E\u0441\u043B\u0435 \u043F\u0435\u0440\u0435\u0437\u0430\
-      \u0445\u043E\u0434\u0430!"
-    type: Add
-  id: 143
-  time: '2023-04-25T06:47:43.0000000+00:00'
 - author: RavMorgan
   changes:
   - message: "\u041D\u043E\u0440\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043A\u0435\
@@ -8901,3 +8892,11 @@
   id: 642
   time: '2024-12-26T17:33:31.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/846
+- author: BIG_Zi_348
+  changes:
+  - message: "\u041F\u0440\u0430\u0432\u043A\u0438 \u043B\u043E\u043A\u0430\u043B\u0438\
+      \u0437\u0430\u0446\u0438\u0438."
+    type: Tweak
+  id: 643
+  time: '2024-12-26T21:17:49.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/850