From 872187f0614224024a7efad745f8f0375819ca43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Schr=C3=B6dinger?=
 <132720404+Schrodinger71@users.noreply.github.com>
Date: Fri, 20 Dec 2024 00:39:25 +0300
Subject: [PATCH 1/6] =?UTF-8?q?[Prototype]=20=D0=9C=D0=B5=D0=BB=D0=BA?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BD=D0=B8=D0=BC=D1=84=D1=8B=20=D0=B4=D0=B8=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=8B=20(#901)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Описание PR
Теперь нимфов можно брать в руки или рюкзак. Size: Normal.
Спрайты в руках и на голове взяты с
`https://github.com/ParadiseSS13/Paradise/`

## Почему / Баланс
Просто мелкие улучшения нимф дионы

**Ссылка на публикацию в Discord**
-
[Предложения](https://discord.com/channels/901772674865455115/1314291879466106950/1314291879466106950)

## Медиа

![image](https://github.com/user-attachments/assets/37224506-82e5-4371-b273-5c5b346d3527)

![image](https://github.com/user-attachments/assets/12dde986-b4e4-4006-977f-3bc252352cf0)

![image](https://github.com/user-attachments/assets/eb7e9b4e-3124-48a7-b045-8580841368c4)

## Требования
<!--
В связи с наплывом ПР'ов нам необходимо убедиться, что ПР'ы следуют
правильным рекомендациям.

Пожалуйста, уделите время прочтению, если делаете пулл реквест (ПР)
впервые.

Отметьте поля ниже, чтобы подтвердить, что Вы действительно видели их
(поставьте X в скобках, например [X]):
-->
- [x] Я прочитал(а) и следую [Руководство по созданию пулл
реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению
мейнтейнера.
- [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие
его изменения в игре, **или** этот пулл реквест не требует демонстрации
в игре

**Чейнджлог**

:cl: Шрёдька
- add: Добавлена возможность взять нифму дионы в руки или надеть её в
слот для головного убора.
---
 .../Prototypes/Entities/Mobs/NPCs/animals.yml    |  13 +++++++++++++
 .../Textures/Mobs/Animals/nymph.rsi/meta.json    |  14 +++++++++++++-
 .../Animals/nymph.rsi/nimf-equipped-HELMET.png   | Bin 0 -> 1077 bytes
 .../Mobs/Animals/nymph.rsi/nimf-inhand-left.png  | Bin 0 -> 901 bytes
 .../Mobs/Animals/nymph.rsi/nimf-inhand-right.png | Bin 0 -> 930 bytes
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Mobs/Animals/nymph.rsi/nimf-equipped-HELMET.png
 create mode 100644 Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-left.png
 create mode 100644 Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-right.png

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 5a1cab1b9e9..0b9b676ad1f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -3496,6 +3496,19 @@
     reformTime: 10
     popupText: diona-reform-attempt
     reformPrototype: MobDionaReformed
+  # ADT Start Tweak Nimf
+  - type: Clothing
+    quickEquip: false
+    sprite: Mobs/Animals/nymph.rsi
+    equippedPrefix: nimf
+    slots:
+    - HEAD
+  - type: Appearance
+  - type: Item
+    size: Normal
+    sprite: Mobs/Animals/nymph.rsi
+    heldPrefix: nimf
+  # ADT End Tweak Nimf
 
 - type: entity
   parent: MobDionaNymph
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json b/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
index c6bb6e0ac4e..2cda83c1bbe 100644
--- a/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
@@ -58,6 +58,18 @@
     },
     {
       "name": "icon"
+    },
+    {
+      "name": "nimf-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "nimf-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "nimf-equipped-HELMET",
+      "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1040466582611fd23536c3286f69117b4d6eade
GIT binary patch
literal 1077
zcmV-51j_q~P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&?@2^KRCt{2nlVTlQ5?p<3sR{hrin&QEGQXzlmo#*aR`_pixkHaq-#KG$DmLU
z3sNYgIGPf0Eg^F$T^uqvxD^TxE}|`B$R$SN5vWLC2m8*8mG-@NcS#Q44<vY}?|b*%
z_ujqB|0!UgTrL9u^0^EFfaTR~rC7)kdVX<fQ?Z|;$CJq<OY=<HxAi}Nd~NAJd+|<K
zKfv1|dhxoZVs;(SH5J7|me_^8WO;R4$>%cU_{6~E)5kbIF_6z?g!Q=$u#1G!6-<Ou
z2&F4`p7#RU{`go73#lnInk_7(rZ7Gh6V~TW0Og{j;^<-r7bR7+2_Z_mYXkrq%@!hq
z186i`ZO3^LGT=NK!2Ur6dmF(1K?UbgVIR3kC*CRmVAM=Bnl1b|Im7n{SJrV}`b7RI
zI@*u)^BX}?_ni<M4k9u*aQ(~4nQ%Ko2HbXA)O}H!<|T}p3E(;jP4iN?EhYna9%uH)
zmRFod13=xxllTY#pjtPD+v?olb&1mM8hLc~3nN28G@30d2_2mTy9pg`vEd+$nu*wO
zu<bZ6zB7PAFMj`^g2kmx;W@~+2G9gJ#g_&wE^R9N2Nf&+PVl7xlzW>1;5r4>y6I^A
z13osuEqrZ&)4T5}ZmtN+<uV8%+&?V%IstBQ?+suYLr&s6H#c`Jq_7QF*66apqABz`
zECTC=u^QzT9aD4j&a&cK0^Aq^y$V+Xx^Wksz><J_{}hl0bh`uHMjF8L$DMvgcY=;B
zgq-4)`8~T3q8IFB4Z>2-aI_G*U6cP;nOad4S6-3r8h7mp;6->6q#Gn6;V|;K3@H|}
zBoYq8zH!2B>>Bx8hD5^Qw!VnKJqJ)RT~iSmjQ=T9$MI?BD;82yxSBsiaU)CI{<fxA
z$dcK0pzq6#7S(PvTUNh#b-5ByEM!SyIu2b^t@1SeOw4Gwnm@!uD8<tx7ZafruI3Ms
zn9<s_jhYEvQ<0dCbEknj0aUPBH?5*%wQgc$C<tRK2)x?iZIYRziya(p1p%~cJApX?
z^zPG(59kkZ9t~KZ)R4UmZ@#QtT-sFjHel)4wFCM?RO=>;n#r94?gUWrmx=Zb67~%f
zUST)3w7W*^1<?<uE5u$hXN7AHp!;#6qy25iJH0{TE=}4e+DBHn44|c`v(ukkBAtNt
ziML$FYyd4q>6-di0(ybyXg_pK1#h{Gdm&`h%&tWKf20#{6_H{ow*hXHq`g9<Z$b&^
zRXj_8{kiIw1hB3JnAQPwL-fc{5R=Ij;qmXr?(u&ynOsqf+8aVQbF<KMli6)VUZKC0
v-;>GYisH555{X12kw_#Gi9{liNc_ofKy3cnmV2D200000NkvXXu0mjfHg@VC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-left.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..143196ddeb5ae01707c94871de0d7a4751fd8d12
GIT binary patch
literal 901
zcmV;01A6?4P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&KS@MERCt{2nlVTlQ5eVn&lZFdITE9sbkP#X;OHV$Fhi#7re+s{Sr0N5T?z$*
zTd^KwKPt{n8Y0xuMUYaE>QY*Bm&TBQbckPvaFUCOxr^T=THg;2lH>Tl?|tuk-+OoO
z10)iOL?V$$Boc|_86voZip3(fHdZK;%?kjI-!`#WjH@|EyARQS$z@2d&ff<SIsP9W
z9&(x0lM!w~L)R#%DBQ9zbd3yMqux(?gUtb%Y+e|;M$5T4=GU50z@=^I8cmJ|xa1tL
zN5DmGAJb!THoex)&qh^nM*&+7u&I4fv27N(Wib&Bz_jYP3h|B^n*$78quHp6BeMiL
zufR(Zbc>}nu)2_A)n#+%RcHjJRR^6{AZCJGvJP%euh})(9I(2S6PDUQCYu+bsZlOj
zq|%$BRIbCc>Znw!Y`QkA6UrW;cMBgxw`4^`cdlO8PVfWPBv`3daj?5irE(pq^d{?E
z<<_%dUk2~%yqnP;G^`QeN9OlJtAmAbXUaeg?iK;<#<srTcwupIv8!e`*dm~t(SE!E
za>Bk7<e*=tJ-Qsz9u=LIKu)9k(PUo*o*L2t!!}^pJbMQWbQN&BHV+aR0mC++6aDT4
z`@z?kZ0|@v8=QXk2?O5>`-R_U1kXMPNCyntfMMfn4tVUZ!oU-ZfYu{7j^no{=YXBP
zGhuf;lg*2VI^oeTgTURX6jT%#x<(vdidiF|b>ovvM998pUmPS85t?5EmUD5O6mt(g
ziuYv-Boh(Z**g<JbM&~A;q+J>7qxvBE%qspPR;rLVQ%|l0dFT%nAY9XqOFaUTj#rh
z-2uzF=IB(a5l>|@_t91dB$9~;eVZD^P5BzSaV&HrcKb~9&1<An3hBnNtG3yvz)Wp{
zwLqdByQ6=8{l#olMLIP{_PvAMb(#o!t0ZBMfQ!p9vHhvw>ogEELC|>xrg-HjnE3wV
zCoEO<q{SWq;lL&NRUly#ni|E<-kGq}23D7x1ry=lFFa|nM!-oiM@MFfQ?etU-+vWA
z^BBJMeo#?hsSTj)UW+vX{H_qO>9nud+E}5<@c?d4uRR^5vpT?!3K1{(QI{Z*NF)-8
b<p1R#!qse>Pu_mr00000NkvXXu0mjfN2Z?c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-right.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..96b4dd0c93a2523ab375af88fe5b16f35467f0b9
GIT binary patch
literal 930
zcmV;T16}-yP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&TuDShRCt{2noUR>K@`XTV+AjfCGmrm_Mk<`!J`yB6dY+zp6f^MfuKDucq*1c
zL7Lz-b;0|hv{z47R;WiWf=D4WUP?<6i6H?`Iz8x0vZk}U+1c!h^MfVX?9SxPf8V@$
zGdqApB9TZW5{X12d5RF;#l`tawz{@W0HBb|+<&*Alm=*;Gp1?!wu38xX_{>fw~G)J
z0se;@`}&-2h${*VU1M&I3KK)um{(i50u*u?HnR>a=Tk6r?LilaBBMhwPY=w|1I7na
zIB)Fxv#JLey2hrGDgbXHI0~?}ae&5->eIa7xlHt-Qf*>nIOeGwSAf;EZNf@5997Dg
zN~)2L1uF}AQdO@#mvi(0G7$$W)ljK6ahY(uJydQ^uRND=Y*Aut0IO@;q^e$HWg#Ew
zAXux{QK>djzGxzy-E?IuR{%rT*wX7y1mLUdG#>X7FO3I)e%{4&c9R&o#zu!?sMYJP
zDrBs8VdC)cu<g8?VcM|^q_dl(e9`n;@1ue10Tw)$3e){(XJ>ua!4<$uuHQ@77fH0o
zwI1NA3q%z{{Ex~{-UFlnVH*%OQh=}x2pcIt*an2nlNaDoCqho?x0^(XD?pUy`9UGO
zfT)V>ixYsD>1xnO4+#1XS_4rO*9?3Mz<YVx?R2$Mcj^SC)VHX<x`4g$yL-hzmdy*f
z3=8T_w2&@f=o*VF3IP5xnp=;s55Kn}XBefF*su9r6mj$bUW4L_f)g{(mh&mhtlw^^
z@MR6hhPa|2o1PY4zYq^NZ|q}yFa_Y7i0ay)lwxsylFh8&zNto0Z2ephpp>?`V<DG$
z@B}K=CK@{`wl)sLT4rN>Fon4npM}R5S3!_c3Paae^5yfk-*w}dlrNe%>#u{AYOn`E
z##mQJCxQ~#aW2pr14f2p`2O_+d-L`q0f20JnoT8D9Q`S`l@ZBZeWa83iNMn^c-CLX
z&tJdq&#g@ftW*P;hzCA-T6*`2otSx{LO2T0+Nj~b&)Tk8n-X^SiX<^M@SrRq#P#7s
z>plgMc=CX%dJSv5xA^k@2eCf8O;+4wbBVD5?Cur2+6BVHl>nw`LN|`d&FK|JhhiN^
z13$R&25X;!CAcVD=K*&Ckpz*9c(Fkukw_#Gi9{lZfA(Z;8ImFLqyPW_07*qoM6N<$
Eg5994@&Et;

literal 0
HcmV?d00001


From 4beb9eaff298b3de865c7e0b15276eab5ab59df1 Mon Sep 17 00:00:00 2001
From: sh4zik <lorenczahar516@gmail.com>
Date: Fri, 20 Dec 2024 15:30:35 +0100
Subject: [PATCH 2/6] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=89=D0=B5=D0=B9,=20=D0=B8=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE=D0=B4=D0=BD=D0=B8=D1=85=20=D0=BF=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=BC=D0=B5=D1=82=D0=BE=D0=B2=20(#897)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Описание PR
Добавление новогодних штучек, по заказу Pangaari, А также фиксы моего
предыдущего ПРа

## Почему / Баланс
Разнообразие сервера контентом, потому что, почему бы и нет, ну и
починка этого разнообразного контента

## Требования
<!--
В связи с наплывом ПР'ов нам необходимо убедиться, что ПР'ы следуют
правильным рекомендациям.

Пожалуйста, уделите время прочтению, если делаете пулл реквест (ПР)
впервые.

Отметьте поля ниже, чтобы подтвердить, что Вы действительно видели их
(поставьте X в скобках, например [X]):
-->
- [x] Я прочитал(а) и следую [Руководство по созданию пулл
реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению
мейнтейнера.
- [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие
его изменения в игре, **или** этот пулл реквест не требует демонстрации
в игре

**Чейнджлог**
<!-- Были добавлены новогодние вещи для более счастливого проведения
нового года, или просто для повышения настроения, фикс багов, и конечно
же, добавление деревянного меча🆑 Sh4zik
-->

:cl: Sh4zik
- add: Был добавлен снежок
- add: Был добавлен огромный ящик, заполненным снегом
- add: Были добавлены превосходные, зимние сани
- add: Был добавлен ????? из слаймолюдов.
- add: Было добавлено новогоднее настроение!
- add: Была добавлены различные вариации кинжалов
- add: Была добавлена возможность скрафтить новые виды вооружения -
кинжалы
- fix: Были починены крафты закалённых копей и заточек, а также их урон
---
 .../Entities/Objects/Materials/shards.ftl     |   5 +
 .../Entities/Objects/Weapons/Melee/melee.ftl  |  16 +
 .../Entities/Structures/Furniture/misc.ftl    |  17 +
 .../ADT/Entities/Objects/Fun/misc.yml         |  60 ++
 .../Entities/Objects/Misc/newyearkatalki.yml  |   1 +
 .../Entities/Objects/Misc/slimehappines.yml   |   1 +
 .../Entities/Objects/Shields/fullshield.yml   |   2 +-
 .../Entities/Objects/Weapons/Melee/shives.yml |   4 +-
 .../Entities/Objects/Weapons/Melee/spear.yml  |  12 +-
 .../Entities/Objects/Weapons/Melee/swords.yml |  40 ++
 .../Storage/Crates/snowballcrate.yml          | 517 ++++++++++++++++++
 .../Crafting/Graphs/Improvised/daggers.yml    |  55 ++
 .../Crafting/Graphs/Improvised/shield.yml     |  28 +-
 .../Crafting/Graphs/Improvised/shives.yml     |   4 +-
 .../Crafting/Graphs/Improvised/spear.yml      |   4 +-
 .../ADT/Recipes/Crafting/improvised.yml       |  52 ++
 .../ADT/Objects/Fun/snowball.rsi/meta.json    |  14 +
 .../ADT/Objects/Fun/snowball.rsi/snowball.png | Bin 0 -> 406 bytes
 .../Objects/Misc/slimehappines.rsi/icon.png   | Bin 0 -> 519 bytes
 .../Objects/Misc/slimehappines.rsi/meta.json  |  14 +
 .../Specific/snowdispenser.rsi/icon.png       | Bin 0 -> 787 bytes
 .../Specific/snowdispenser.rsi/meta.json      |  14 +
 .../Weapons/Melee/wooden_sword.rsi/icon.png   | Bin 0 -> 402 bytes
 .../Melee/wooden_sword.rsi/inhand-left.png    | Bin 0 -> 506 bytes
 .../Melee/wooden_sword.rsi/inhand-right.png   | Bin 0 -> 500 bytes
 .../Weapons/Melee/wooden_sword.rsi/meta.json  |  22 +
 .../Specific/newyearkatalki.rsi/meta.json     |  15 +
 .../newyearkatalki.rsi/newyearkatalka.png     | Bin 0 -> 1367 bytes
 28 files changed, 871 insertions(+), 26 deletions(-)
 create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl
 create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml
 create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml
 create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
 create mode 100644 Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json
 create mode 100644 Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png
 create mode 100644 Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png
 create mode 100644 Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json
 create mode 100644 Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/icon.png
 create mode 100644 Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json
 create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png
 create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-left.png
 create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png
 create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json
 create mode 100644 Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json
 create mode 100644 Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png

diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl
new file mode 100644
index 00000000000..b1d21ec4c1f
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl
@@ -0,0 +1,5 @@
+ent-ADTShardGlassReinforcedPlasma = осколок закалённого плазменного стекла
+    .desc = Небольшой осколок плазменного стекла.
+
+ent-ADTShardGlassReinforcedUran = осколок закалённого уранового стекла 
+    .desc = Небольшой осколок уранового стекла. 
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl
index 087f0d3319f..29d324396ff 100644
--- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl
@@ -44,3 +44,19 @@ ent-SpearReinforcedPlasma = копьё из закалённой плазмы
 
 ent-ADTReinforcedPlasmaShiv = заточка из закалённой плазмы
     .desc = Заточка, созданная из осколка закалённой плазмы, имеющий тканевую основу, для более удобной нарезки ваших оппонентов.
+
+ent-ADTGlassDagger = стеклянный кинжал
+    .desc = Стеклянный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие.
+
+ent-ADTPlasmaDagger = плазменный кинжал
+    .desc = Плазменный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие.
+
+ent-ADTGlassReinDagger = кинжал из закалённого стекла
+    .desc = Закалённый, стеклянный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие.
+
+ent-ADTGlassUranDagger = урановый кинжал
+    .desc = Урановый самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие.
+
+ent-ADTWoodenSword = деревянный меч
+    .desc = Настоящий робаст нуждается в ежедневных тренировках.
+    .suffix = { "Тренировочное" }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl
index fab527195dc..828f6dd8e6d 100644
--- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl
@@ -32,3 +32,20 @@ ent-ADTHalloweenCarvedPumpkinCube = { ent-ADTHalloweenCarvedPumpkinSmile }
 ent-ADTHalloweenCarvedPumpkinWily = { ent-ADTHalloweenCarvedPumpkinSmile }
     .suffix = { ent-ADTHalloweenCarvedPumpkinSmile.suffix }
     .desc = { ent-ADTHalloweenCarvedPumpkinSmile.desc }
+
+
+ent-ADTSnowballsCrate = телега со снегом
+    .suffix = New Year
+    .desc = Ради неё вовсе не разрушают чьи-то планеты... Вовсе нет.
+
+ent-ADTNewYearKatalka = зимние сани
+    .suffix = New Year
+    .desc = Такси бизнес-класса, потому что упряжка не рассчитана под стадо оленей.
+
+ent-ADTSnowball = снежок
+    .suffix = New Year
+    .desc = Снаряд опаснее всякой пули... БЕРЕГИСЬ!
+
+ent-ADTSlimeHappines = экстракт счастья
+    .suffix = New Year
+    .desc = Концентрация искреннего счастья слаймолюдов, полученная абсолютно гуманным путём
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
index 8e279c8bea9..39c4b105f86 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
@@ -18,3 +18,63 @@
   #- type: ClothingSpeedModifier
   #  walkModifier: 0.9
   #  sprintModifier: 1.2
+
+#New Year
+
+- type: entity
+  parent: BaseItem
+  id: ADTSnowball
+  name: Snowball
+  description: yeayea. Snow? Balls! I love balls!!
+  suffix: New Year
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Fun/snowball.rsi
+    state: snowball
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: FootstepSnow
+          params:
+            variation: 0.125
+            volume: 6
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: DamageOnLand
+    ignoreResistances: true
+    damage:
+      types:
+        Blunt: 5
+  - type: StaminaDamageOnCollide
+    damage: 5
+
+
+- type: entity
+  name: Slime Happines
+  parent: BaseItem
+  id: ADTSlimeHappines
+  description: Slimyy..
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Misc/slimehappines.rsi
+    state: icon
+
+
+
+- type: entity
+  name: New Year gurney
+  id: ADTNewYearKatalka
+  parent: ChairBase
+  description: Yea.
+  components:
+  - type: Sprite
+    sprite: ADT/Structures/Specific/newyearkatalki.rsi
+    state: newyearkatalka
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml
@@ -0,0 +1 @@
+
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml
@@ -0,0 +1 @@
+
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml
index c25945c8734..855fe33fed7 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml
@@ -44,7 +44,7 @@
     - type: HeldSpeedModifier
     - type: Construction
       graph: ADTShield
-      node: start
+      node: ADTCompShield
     - type: Destructible
       thresholds:
         - trigger:
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml
index b907baf3069..284356bd79a 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml
@@ -15,7 +15,7 @@
     sprite: ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi
   - type: Construction
     graph: ADTPShiv
-    node: start
+    node: ADTCompPlasmaShiv
 
 - type: entity
   name: reinforced uranium shiv
@@ -35,4 +35,4 @@
     sprite: ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi
   - type: Construction
     graph: ADTUShiv
-    node: start
+    node: ADTCompUraniumShiv
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml
index 86cf8957c9a..470020ae64c 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml
@@ -10,14 +10,14 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Piercing: 15
+        Piercing: 25
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 18
+        Piercing: 28
   - type: Construction
-    graph: ADTPSpear
-    node: start
+    graph: ADTPSpear 
+    node: ADTCompPlasmaSpear
 
 - type: entity
   name: reinforced uranium spear
@@ -31,7 +31,7 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Piercing: 18
+        Piercing: 12
         Radiation: 9
   - type: DamageOtherOnHit
     damage:
@@ -40,4 +40,4 @@
         Radiation: 9
   - type: Construction
     graph: ADTUraniumSpear
-    node: start
+    node: ADTCompUraniumSpear
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
index d5f78576d5d..5951f1a0334 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
@@ -88,6 +88,9 @@
   id: ADTPlasmaDagger
   description: Dogor
   components:
+  - type: Construction
+    graph: ADTPDagger
+    node: ADTCompPlasmaDager
   - type: Tag
     tags:
     - Knife
@@ -115,6 +118,9 @@
   id: ADTGlassReinDagger
   description: Dogor
   components:
+  - type: Construction
+    graph: ADTGRDagger
+    node: ADTCompGlassRefDager
   - type: Tag
     tags:
     - Knife
@@ -142,6 +148,9 @@
   id: ADTGlassDagger
   description: Dogor
   components:
+  - type: Construction
+    graph: ADTGDagger
+    node: ADTCompGlassDager
   - type: Tag
     tags:
     - Knife
@@ -169,6 +178,9 @@
   id: ADTGlassUranDagger
   description: Dogor
   components:
+  - type: Construction
+    graph: ADTUDagger
+    node: ADTCompUranDager
   - type: Tag
     tags:
     - Knife
@@ -190,4 +202,32 @@
       types:
         Slash: 9
 
+- type: entity
+  name: wooden sword
+  parent: BaseItem
+  id: ADTWoodenSword
+  description: A true robust need training everyday.
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Melee/wooden_sword.rsi
+    state: icon
+  - type: MeleeWeapon
+    attackRate: 1.2
+    angle: 75
+    damage:
+      types:
+        Blunt: 0.5
+    soundHit:
+      collection: BoxingHit
+  - type: StaminaDamageOnHit
+    damage: 12
+  #- type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 1
+  - type: Item
+    size: Huge
+  - type: DisarmMalus
+
 
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml
new file mode 100644
index 00000000000..11cf63d02ab
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml
@@ -0,0 +1,517 @@
+- type: entity
+  name: Snowballs crate
+  parent: BaseStructure
+  id: ADTSnowballsCrate
+  description: Mmm.. Crate full of BALLS!!!
+  suffix: New Year
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Specific/snowdispenser.rsi
+    state: icon
+  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      bin-container: !type:Container
+  - type: Bin
+    maxItems: 500
+    initialContents:
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
+    - ADTSnowball
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
new file mode 100644
index 00000000000..87e28b684c4
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
@@ -0,0 +1,55 @@
+- type: constructionGraph
+  id: ADTGDagger
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: ADTCompGlassDager
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: ADTCompGlassDager
+    entity: ADTGlassDagger
+
+- type: constructionGraph
+  id: ADTGRDagger
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: ADTCompGlassRefDager
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: ADTCompGlassRefDager
+    entity: ADTGlassReinDagger
+
+- type: constructionGraph
+  id: ADTUDagger
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: ADTCompUranDager
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: ADTCompUranDager
+    entity: ADTGlassUranDagger
+
+- type: constructionGraph
+  id: ADTPDagger
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: ADTCompPlasmaDager
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: ADTCompPlasmaDager
+    entity: ADTPlasmaDagger
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml
index 20e5715883a..a366b76ee4a 100644
--- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml
@@ -2,16 +2,18 @@
   id: ADTShield
   start: start
   graph:
-  - node: start
-    edges:
-    - to: ADTCompShield
-      steps:
-      - material: Steel
-        amount: 20
-      - material: ReinforcedGlass
-        amount: 10	
-      - material: Cable
-        amount: 2
-        doAfter: 5
-  - node: ADTCompShield
-    entity: ADTFullRiotShield  
+    - node: start
+      edges:
+        - to: ADTCompShield
+          steps:
+            - material: Steel
+              amount: 20
+              doAfter: 5
+            - material: ReinforcedGlass
+              amount: 10
+              doAfter: 5	
+            - material: Cable
+              amount: 2
+              doAfter: 5
+    - node: ADTCompShield
+      entity: ADTFullRiotShield  
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml
index 47f1153f3f2..49f25878c41 100644
--- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml
@@ -7,7 +7,7 @@
     - to: ADTCompPlasmaShiv
       steps:
       - tag: ADTRPlasmaShard
-        name: "Осколок плазменного стекла"
+        name: "Осколок закалённого плазменного стекла"
         icon:
           sprite: Objects/Materials/Shards/shard.rsi
           state: shard1
@@ -27,7 +27,7 @@
     - to: ADTCompUraniumShiv
       steps:
       - tag: ADTRUranShard
-        name: "Осколок уранового стекла"
+        name: "Осколок закалённого уранового стекла"
         icon:
           sprite: Objects/Materials/Shards/shard.rsi
           state: shard1
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml
index 68fa4861e7c..1c9057cfd72 100644
--- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml
@@ -13,7 +13,7 @@
         amount: 3
         doAfter: 1
       - tag: ADTRPlasmaShard
-        name: "Осколок плазменного стекла"
+        name: "Осколок закалённого плазменного стекла"
         icon:
           sprite: Objects/Materials/Shards/shard.rsi
           state: shard1
@@ -36,7 +36,7 @@
         amount: 3
         doAfter: 1
       - tag: ADTRUranShard
-        name: "Осколок уранового стекла"
+        name: "Осколок закалённого уранового стекла"
         icon:
           sprite: Objects/Materials/Shards/shard.rsi
           state: shard1
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml
index 8221f94dfda..01797e4f6fc 100644
--- a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml
@@ -62,3 +62,55 @@
   icon:
     sprite: ADT/Objects/Weapons/Melee/Rplasma_spear.rsi
     state: spear
+
+- type: construction
+  name: glass dagger
+  id: ADTDaggerGlass
+  graph: ADTGDagger
+  startNode: start
+  targetNode: ADTCompGlassDager
+  category: construction-category-weapons
+  objectType: Item
+  description: Dagger to cut your enemies.
+  icon:
+    sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi
+    state: icon
+
+- type: construction
+  name: reinforced glass dagger
+  id: ADTDaggerRefGlass
+  graph: ADTGRDagger
+  startNode: start
+  targetNode: ADTCompGlassRefDager
+  category: construction-category-weapons
+  objectType: Item
+  description: Dagger to cut your enemies.
+  icon:
+    sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi
+    state: icon
+
+- type: construction
+  name: plasma dagger
+  id: ADTDaggerPlasma
+  graph: ADTPDagger
+  startNode: start
+  targetNode: ADTCompPlasmaDager
+  category: construction-category-weapons
+  objectType: Item
+  description: Dagger to cut your enemies.
+  icon:
+    sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi
+    state: icon
+
+- type: construction
+  name: uranium dagger
+  id: ADTDaggerUranium
+  graph: ADTUDagger
+  startNode: start
+  targetNode: ADTCompUranDager
+  category: construction-category-weapons
+  objectType: Item
+  description: Dagger to cut your enemies.
+  icon:
+    sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi
+    state: icon
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json
new file mode 100644
index 00000000000..76dfb6cb316
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by Pangaari, Discord - @pangaari",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "snowball"
+        }
+    ]
+}
diff --git a/Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png
new file mode 100644
index 0000000000000000000000000000000000000000..de0566e0e3a38503ef54f4ecb1cb701efc995d56
GIT binary patch
literal 406
zcmV;H0crk;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$P)S5VR9J=Wl`%`hKoo$##^ZX16f$U~b`iu?@PD{E_zN9eT{?8_D(xzTF11uT
zgli4qXzv_ik4h1eXz7w~O5VMD?>o4>Kut|e&5>zT-T3tU;&$I3AMPvFD!r-KA2@*a
z`MHlRS1YE|X(f?T$*-d~*SYKvO1rl<p3J>S8HvJ)zcpW`Yfgj&VD>&MEfEwI0DN;}
z48|Bz6VMda$FHw0Xhl((lEnnJrw2$)fKDwgP;A!5=Lj<Y-0gPvF6o~HAU}PQB!tq^
zib9&gBBaEaTw;wXTB@1=Kpe*aY`(9-sjx&*gw~o+S}$`Dfz;%wizGt|ht}H1lv0(N
z7Z$j?y=e@GBLL1~g$Nu<DFhi>YowI8AeT7kS1_K;_hQ@AH*Cgy@mZ!EP;wCU`UAI}
zfSq>h$J*>;dDua;D*;Cu#k>61&#0!Rrsn8;0nVGFXI}hXssI2007*qoM6N<$f>RH)
A(*OVf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..043a4fdabc587530cd87d8cc9c65eebf0862aa3c
GIT binary patch
literal 519
zcmV+i0{H!jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$!AV3xR9J=Wl|4(tKp4mW5kavpgY*p%7Z*XCx~PL6AmGwb2k8gM;_8QR5L~4~
z*A5ms=+eQ##i>q3N>%7fQc~NqA)z$q(7e_R$))089|+{Q`#=BRJ<sI=EMgJ=Jvdh3
z1)rsf=qh?&D*B3s>*@<rE+*0C{iB{qr9reYngfDt<PLB351i+3mxAV6W&x<xU%7_V
z2LK8HRcW7#suRkRi@60tv8*2?A2?Yg^tpe88zCQf_W-~o0)WHa9aial0Ejj=Uzw{I
z3ZOY4VSK{_ID+Z$g$5v!$bnK|+5+Y_1QrU#vK~vOX7$v7!qw?<piKn=FwM{6m7lsH
zPykPZLih%7nQ!a?lO8Z`+Y96=L?x1=jpn;=2;Zbmb0XK!X}8@A)&ax;epKQdEt(I2
zP%P`t@kjwis>ebD!b=khz*Ty+hD-w3-n8e50(5%zIHy&7SApp>B#L`HTai}x(|0ak
z07Mc|81fXYnq}yOuqt94#HXzjN+fZ90JA4LldvHy5ZQp$yfvW!07n&M8zQzgeJpbc
zD6R0mcMpWTh=|#D<G*B@|H?(=gcwR)&$)Oq9r!9<#3KGYz5%_0!m5V8RucdK002ov
JPDHLkV1f=h;6(rc

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json
new file mode 100644
index 00000000000..d5603034a8b
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by Pangaari, Discord - @pangaari",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5b3a28ed51335cdcb608a8b923fd1dbf2cf9e9d
GIT binary patch
literal 787
zcmV+u1MK{XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%%}GQ-R9J=WmOXFNP!xur7=q+DQA*U>Rgg)LP@@i2{{mtuVlF=bCKym?2UOC9
zU(kh#1r|0sAR*C}fwCh|t0WRl6spz@g+#Xdl`3YauJLCR+L6A~)w%ba^Z1;5tP2;q
z(1kAazbkPTr)st8q|<3E%c4{&ohe2vz{cE!Bi7Ask6W)c62gA;@I3(OblN>{S(dxD
zZ5x2ji&<{J{+<B%_~3>Euy@qw?we*PpU<!{H{m>5FQRGVzC)GDqAzKjEX%^SZ6rye
z)oQW4{MNT`7~3r5>+VMZTn+}&v~gx;?x5>Bs;c@DXEK>kQqwfuwK!|rHo07m+1Y#a
z`+Yi{4u^+_tge0n>OOxTK(pJUTz&$8q9_BCd+h>5_$Z2kqA0XlEk;I0=yW;&Y?{YD
ze<>JHIEp}-OeQvY6o?l>mSuEZN0KD+`Fy0GTLDeeoI*Cql|Zje(;N!G3t^h3uX?(!
z({8r`xR&vET@uL+!$<&BD$iJ3TMI#WdmXjs-49knmSqkO4kG<ScK~2_cb7(^fh@}?
zisJ5DmK8Y-ViXO-K+`l|+f37>R;#hKwFQLlfDhp5w^4GrZB|x3MA8nUN@XzwC&tk*
zwjt2X&=@Y{>p<NleQ6X)rR1Rj%H_uZ?CtH7O35tb>)gL|@*{fwON|H6G|d4hWRvcu
zw_GP+gSBZMV_3($<ECqKW7fjwT>!%{5{1HbN8E#8uYz!KDrA#<{;?1CUz>;-B}pXr
zR-lkghQ<Y;xKyRMRCU*0`yi+|c=tyn#<1D#(d_mjE6|uPg@A^Uh<PeNkT$9UL5RkD
zX{bsJRe>OFR0ReB#X+1_fzW5hO~Gl2#X1NR6*H*N17T`<(z%))jdeJWes_QJ^~<_1
zXXJBgYI@R%vY%JM<gow%sygPBN)rH7t2K6Z+W++SJFmYRL{-PmT#aG;{{U40I>7E#
R#@GM=002ovPDHLkV1i91ZI1u|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json
new file mode 100644
index 00000000000..a6d71cb4b1d
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by Pangaari, Discord - @pangaari",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      }
+    ]
+  }
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fc70d9545500eb274c0b6f844df9e65168284b2
GIT binary patch
literal 402
zcmV;D0d4+?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Oi4sRR9J=Gm$6F2Kpe(@+LDyEi5P>r2uTL%q$u<qoSZv$aPkd02yS_SK7gB#
zU>~4^Q1Ag9qTu2X1!Edou$)uDE+)BL(B@mR+};2CegE8X2US%t@<lN6McTN{GK!Cf
zJ@NMXl4)!y2K2UtrfYv^AdfawFF3im6q>GKZ13Tn4N}*yRswnHp-KtJ&_h)ckfnzz
zBv6DNpkCC#Jbni(>G_2c7!P|wZ(Ho_A4t)|I{yPI=;0qEAZ1`lZ&<s9=%o#)RBrb_
z={x7wh0l@oNnqliin(!!N_xncz};0>gwYKB^HD|36=gb#?dF0oX%R+KZ0_mwAC%oA
za<w2#YVbA1HXC#YYD{Emf$MnU;#Occ7f^2zCN&kcv+MZiM7WNZ`plA1Y64{yUh3CA
wx{fDIbBieY;ORL~{)mB;T@c67%C`)C11k<@hZLCe82|tP07*qoM6N<$f=e&5)c^nh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..d553d4185cc593ee7e569b47ec9f3055e6c89ebb
GIT binary patch
literal 506
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zw|KfZhE&XX
zduyZD;Q$e~2m6(Dow5Zlh2G**>fm5Bmp@>>q1(Cqxs&<!hT`&ey>Gl$7HQlfyF}YH
z)^U2|I=(5AeR3>7NA2UiCF1|`vo)X3D{j;K&)5M4+dK|$YI$c~R$@P4s?5HtIoYvI
z(^xC|WKHLmHYo6TUwvga?R0r*@6&_DIS=`)l=iWNmWE!NTox);%r5(pbHO!>BTNhi
zfkD@ca|-XxpE5-xdhwDK)-O07R2MK<?A~?x(i*=1Sy!GMT<XJnzAaYpoPCd6jMrCr
z1L-nWhAGnSE2iED379z46fk7Of7@PGaP#%YueFQh>i<r(FFT@D(PcN=V8@ewSw@D}
zfAe3}K6cn7kZ|n5YoGV?VIJt{=y`B&UdH}cH@?KJzA2XZUhs;%N5t~Lj8(Ir-&hp1
z(#5-??xS}mzt)s{><spv8)FU~J=;7jK&h^q;lJT8JC4I4?=!u9mMxyg(BS%kYxTbA
z7OQ`Ezw(HyPBD@F>aw;@Ahk47eBo;`#qDQwax*kv?sGk1YvLmnbxir^(U|+XhpsJM
sR(W4ZWM9Lgd_k^wh66hDJGwrzp3>gzZX3mX9vGPnp00i_>zopr0AW(!lmGw#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2e1896b22fc2747b0ce0c70ea2490007fab3a86
GIT binary patch
literal 500
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z*Lk`)hE&XX
zduwCXp#TxK2ls<`Sc5fHR%f&YXe?DId3|GHe!z6TcXL^{=QW<YX}#l$`3J^LoUG<A
z6S`MB1u`#<&08Mr67|UR`!S9G=IYPq{kh}woWTVOs*jY)O#E`jQLHz|dF?As1<RIt
z<_W9}3*@f|Pd+o-V&38qt79ovx=XaK@V`>xl1>VD3V3V$QT)fI+8cSS@!R?}a-P_=
zoc`wRsM@l1{qY62g%~!>=wW0C|9<}Ex-dVD`Xl>THx_<A?P&2-dCooCw<!WEXUmmD
zAJUuup!yRRgSB|ewlw#>4h#lDM>bp**_G{ei+dd#BZKSp_VUYdzt;rn3#@+69I$Gm
zUh?%&HpZN56}P^3cECZ<s!-dFd&~uF=cHQcnibBw)aD^`{^K`0trKZFr%&Zn0v*hB
zZs)gM?OOc$`Oy*6S{Ie~9!=@d_|m#kbK@P)4R^abKfP3QE^^{|AwQkp+ShPy?Z3Jo
zN8c`<*sxXf>Q-|F_Jyw3k0*Ugd~;a!?a|QhY@1|S{vExcs8!8;Tc$<I{>+nm4SX|A
o7boW*XgS0G{LcK2PfytAX&rm(!Ta+fFd7*=UHx3vIVCg!07@&~EC2ui

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json
new file mode 100644
index 00000000000..aa1bde388e2
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by discord:m1and1b for Adventure Time MRP Server",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json
new file mode 100644
index 00000000000..f096a63f544
--- /dev/null
+++ b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by Pangaari, Discord - @pangaari",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "newyearkatalka",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b0af56d06c105a359dbe5df6863e02326b84fb8
GIT binary patch
literal 1367
zcmV-d1*rOoP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA0A^53R7C&)0C^-NkSZ!>A0MnTGACwDAy+{m
zRzWU&Tw11wH<WHtlXxzATP9^oAXPsnXiXeQHylYfRvH@LaVGonHqy&3u&O7!Um$%Y
zC21fa7(Ff`TSKRzCBL{Tqf;E6P#Ys&MjlT)g1ufx0000YbW%=J0RR90|NsC0|NsC0
z|NsC0|NsC0|NsC0|NsC0|NsC0|Nk!ilfM7}1YAi(K~#90&6jO++Bgt^S1W@<XdwwH
zbms2<|L?lHna-pwNq|z<Hr94`B^k?x*7;V&I5yHg(!NQH0Wf+E8tL`hX29|=ywKyg
zvl#_&1|4Po?F5-li<NwdV*x;!)whNp{S#IEI2u5Rnb^TW15+mkadeWe#{mcoTI22L
zAU@EEM%n<3C7gs;7tJXE8s`Q6Ak16}V0r$GkXL|pcw1u%m>%623xp8jTV_!#FsVWR
zQ#CG(BEU9~-If6Pce(Sw6WHbqxD;o)&Imvbn&o$SqCl)zFW1Un1-O_6$dZ#;33&mt
zl5aJ4wDQJW1rWtFLV`ubYt9P}i@c~i^5X%u6F}yMfGb8|TPFZDUx9D|5cKSb`Zf+=
z-KFh9<vCQ&0B^*(D|1KzV8LCKN6x+I1%kUH%%GUVk?#O0;bC`S5roTUI0GiLq_?QM
z03*XvLpq5W3IGq8bh_&>NlQ>qF3sz52Yh*iPgc`fxf}Xn!EHW=P+0EnXm|J81H?G#
z8VbXEB($+~_v)9C0<Ol%5TGjXGWsg`1tuznK#PFEB(c|Y_=$>L`8F7n)&&6GyIohs
zC2l)5lxQ5thYic8zgdy$)vCBOW}ED(b^r()o?jaSUJ@nUJp)pKwRvivH}tvHt_7sS
z2Y@x<8L&bV3Bfuah@QK{AB_2u5<hh0g%G==d6}^7^bh2(wri<Ay8RIV_21<^=eJYK
zo`^p6-b(P%Z5o3yb>Bunxj0?!&ww`(_%PH{m@op?Phd}@<ulpN6Tn)+Y&0R0L^3JB
za2zH(@vqiT3xItO@I32n<-Z2->2nwW#u7x{P(B23VQ_Nopk9g7`idXlmmCDH>I39t
zj7vaFw!~1R_?kr)AhJC`=}JA8;~`@c0_xxpy(&Kd;1N7QMA^!FDYm<S1{QFToixb1
zQx8xaMG4UQXi?MjAb=G+S3Uw@%kM#o02N?+^=tt1qa4r$-`;)Wa;Xx)BW-o_@&M)o
zsQx)yeBgyb2vVRx&ec*bEBNb&ecCj<y9I!>yhN9mV6%f7+5<Qh3U=cB2=fAo7?4*y
zj{dGV!kGYD0kDzSyHk##5;P9v@DzYJhXGRGfK(?uNnV*B4EX0inR5d-|9czMG8a$p
zy}-Ug#{hkOEYt^cr@mlAx~lJmsDfHS0P@>ru`?Po2%B%EuhDoxJd?}!_5wf+7~F8s
zEny)l5a+hbG!%KHx53^vrWZ)>MN*7_QJxHv+JNsM1O<Tm_yT(?r)L6Sf|gDb)lz&Q
z6E95MorF+;sIZz=pDYYQnZLQw5R`B^_~b%r%(<F(ka0>v<#W%$008pil52T5#d?K&
zr7DU91jKsKmsk?U63dw6b2v$i{wNB^d#`>_asJ~__6M<nUd`{iC5|AmC$8O(V4px^
z*&igB41gBE<-*r9!LO6#z!!NR%fOKI7?lCH|ArN;0A4yh($;$SHO0nve1@bwWH&4i
ZKLItRipVdJIX(aY002ovPDHLkV1hIdY#RUo

literal 0
HcmV?d00001


From b19a0a58ac3edf97c0cc2015024cf0ba5b2dcaea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 20 Dec 2024 18:41:47 +0400
Subject: [PATCH 3/6] Auto CL update (#902)

No cl, no fun

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 Resources/Changelog/1ChangelogADT.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Resources/Changelog/1ChangelogADT.yml b/Resources/Changelog/1ChangelogADT.yml
index 6b43b3267ce..94cad5a9fb6 100644
--- a/Resources/Changelog/1ChangelogADT.yml
+++ b/Resources/Changelog/1ChangelogADT.yml
@@ -4887,3 +4887,23 @@ Entries:
           оперативников, type: Tweak}
     time: '2024-12-18T14:30:01Z'
     id: 608
+  - author: Шрёдька
+    changes:
+      - {message: Добавлена возможность взять нифму дионы в руки или надеть её в слот
+          для головного убора., type: Add}
+    time: '2024-12-19T21:39:25Z'
+    id: 609
+  - author: Sh4zik
+    changes:
+      - {message: Был добавлен снежок, type: Add}
+      - {message: 'Был добавлен огромный ящик, заполненным снегом', type: Add}
+      - {message: 'Были добавлены превосходные, зимние сани', type: Add}
+      - {message: 'Был добавлен ????? из слаймолюдов.', type: Add}
+      - {message: Было добавлено новогоднее настроение!, type: Add}
+      - {message: Была добавлены различные вариации кинжалов, type: Add}
+      - {message: Была добавлена возможность скрафтить новые виды вооружения - кинжалы,
+        type: Add}
+      - {message: 'Были починены крафты закалённых копей и заточек, а также их урон',
+        type: Fix}
+    time: '2024-12-20T14:30:35Z'
+    id: 610

From 1bc5607bb55349400dbde9403858343a0624529b Mon Sep 17 00:00:00 2001
From: NameLunar <147372161+NameLunar@users.noreply.github.com>
Date: Sat, 21 Dec 2024 20:42:16 +0700
Subject: [PATCH 4/6] [Update] Buff Xeno  (#900)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Описание PR

Увеличено здоровье ксеноморфам.
Добавлена способность ставить турельки у королевы.

**Ссылка на публикацию в Discord**
-
[Заказы-разработка](https://discord.com/channels/901772674865455115/1318583251933331569)


## Техническая информация
Попытался добавить ивент по шаблону ивента мима. Не получилось, не видел
прототип ивента. (Сам ивент видел).
Добавил способность королеве на основе невидимой стены мима. Она может
раз в 3 минуты призвать турель с 100 хп. (К сожалению спрайт стенки у
кнопки. Да.)


## Требования
- [x] Я прочитал(а) и следую [Руководство по созданию пулл
реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению
мейнтейнера.
- [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие
его изменения в игре, **или** этот пулл реквест не требует демонстрации
в игре

**Чейнджлог**
:cl: NameLunar
- fix: Ксеноморфы эволюционировали и стали намного опасней. В
особенности Королева!
- add: Добавлены некоторые способности для королевы ксеноморфов.

---------

Co-authored-by: Schrödinger <132720404+Schrodinger71@users.noreply.github.com>
---
 .../Abilities/XenoQeen/XenoQeenComponent.cs   |  29 +++++
 .../ADT/Abilities/XenoQeen/XenoQeenSystem.cs  |  66 +++++++++++
 .../ru-RU/ADT/prototypes/Actions/XenoQeen.ftl |  14 +++
 .../prototypes/entities/mobs/npcs/xeno.ftl    |  12 +-
 Resources/Prototypes/ADT/Actions/XenoQeen.yml | 109 ++++++++++++++++++
 .../Prototypes/Entities/Mobs/NPCs/xeno.yml    |  43 +++++--
 .../Weapons/Guns/Projectiles/projectiles.yml  |   2 +-
 .../Guns/Turrets/xenoturret.rsi/icon.png      | Bin 0 -> 668 bytes
 .../Guns/Turrets/xenoturret.rsi/meta.json     |   3 +
 9 files changed, 260 insertions(+), 18 deletions(-)
 create mode 100644 Content.Server/ADT/Abilities/XenoQeen/XenoQeenComponent.cs
 create mode 100644 Content.Server/ADT/Abilities/XenoQeen/XenoQeenSystem.cs
 create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Actions/XenoQeen.ftl
 create mode 100644 Resources/Prototypes/ADT/Actions/XenoQeen.yml
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/icon.png

diff --git a/Content.Server/ADT/Abilities/XenoQeen/XenoQeenComponent.cs b/Content.Server/ADT/Abilities/XenoQeen/XenoQeenComponent.cs
new file mode 100644
index 00000000000..1e4b46a9c18
--- /dev/null
+++ b/Content.Server/ADT/Abilities/XenoQeen/XenoQeenComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Abilities.XenoQeen
+{
+    /// <summary>
+    /// Lets its owner entity use mime powers, like placing invisible walls.
+    /// </summary>
+    [RegisterComponent]
+    public sealed partial class XenoQeenComponent : Component
+    {
+        /// <summary>
+        /// Whether this component is active or not.
+        /// </summarY>
+        [DataField("enabled")]
+        public bool Enabled = true;
+
+        /// <summary>
+        /// The wall prototype to use.
+        /// </summary>
+        [DataField("wallPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string XenoTurret = "WeaponTurretXeno";
+
+        [DataField("xenoTurretAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? XenoTurretAction = "ActionXenoQeenTurret";
+
+        [DataField("xenoTurretActionEntity")] public EntityUid? XenoTurretActionEntity;
+    }
+}
diff --git a/Content.Server/ADT/Abilities/XenoQeen/XenoQeenSystem.cs b/Content.Server/ADT/Abilities/XenoQeen/XenoQeenSystem.cs
new file mode 100644
index 00000000000..fb4f41abde3
--- /dev/null
+++ b/Content.Server/ADT/Abilities/XenoQeen/XenoQeenSystem.cs
@@ -0,0 +1,66 @@
+using Content.Server.Popups;
+using Content.Shared.Actions;
+using Content.Shared.Actions.Events;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Maps;
+using Content.Shared.Physics;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+
+namespace Content.Server.Abilities.XenoQeen
+{
+    public sealed class XenoQeenSystem : EntitySystem
+    {
+        [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+        [Dependency] private readonly TurfSystem _turf = default!;
+        [Dependency] private readonly IMapManager _mapMan = default!;
+        [Dependency] private readonly SharedContainerSystem _container = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<XenoQeenComponent, ComponentInit>(OnComponentInit);
+            SubscribeLocalEvent<XenoQeenComponent, InvisibleWallActionEvent>(OnCreateTurret);
+        }
+
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+        }
+        private void OnComponentInit(EntityUid uid, XenoQeenComponent component, ComponentInit args)
+        {
+            _actionsSystem.AddAction(uid, ref component.XenoTurretActionEntity, component.XenoTurretAction, uid);
+        }
+        private void OnCreateTurret(EntityUid uid, XenoQeenComponent component, InvisibleWallActionEvent args)
+        {
+            if (!component.Enabled)
+                return;
+
+            if (_container.IsEntityOrParentInContainer(uid))
+                return;
+
+            var xform = Transform(uid);
+            // Get the tile in front of the Qeen
+            var offsetValue = xform.LocalRotation.ToWorldVec();
+            var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager, _mapMan);
+            var tile = coords.GetTileRef(EntityManager, _mapMan);
+            if (tile == null)
+                return;
+
+            // Check if the tile is blocked by a wall or mob, and don't create the wall if so
+            if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable | CollisionGroup.Opaque))
+            {
+                _popupSystem.PopupEntity(Loc.GetString("create-turret-failed"), uid, uid);
+                return;
+            }
+
+            _popupSystem.PopupEntity(Loc.GetString("create-turret"), uid);
+            // Make sure we set the invisible wall to despawn properly
+            Spawn(component.XenoTurret, _turf.GetTileCenter(tile.Value));
+            // Handle args so cooldown works
+            args.Handled = true;
+        }
+
+    }
+}
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Actions/XenoQeen.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Actions/XenoQeen.ftl
new file mode 100644
index 00000000000..9a3337faeba
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Actions/XenoQeen.ftl
@@ -0,0 +1,14 @@
+ent-ActionXenoQeenTurret = Создать ксено турель.
+    .desc = Создаёт перед вами ксену турель, если хватает места.
+create-turret-failed = Найдите другое место.
+create-turret = Арргхсс. Шшшшш!
+ent-ActionSpawnMobXenoSpitter = Призвать Плевальщик
+    .desc = Родите Плевальщика, который будет плеваться!
+ent-ActionSpawnMobXenoPraetorian = Призвать Преторианеца
+    .desc = Родите Преторианеца, который будет сражаться за вас!
+ent-ActionSpawnMobXenoDrone = Просто Дрон. Кому он нужен?
+    .desc = Родите рабочего, Дрон.
+ent-ActionSpawnMobXenoRavager = Призвать Разрушителя
+    .desc = Родите смерть во плоти!
+ent-ActionSpawnMobXenoRunner = Призвать Бегуна
+    .desc = Родите самую быструю личинку!
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl
index d6fbec371b1..f1912d62683 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl
@@ -1,19 +1,19 @@
 ent-MobXeno = Бурильщик
     .desc = Обычно они приходят ночью. Обычно.
 ent-MobXenoPraetorian = Преторианец
-    .desc = { ent-MobXeno.desc }
+    .desc = Преторианец. Личная гвардия королевы, задача которого - защитить королеву. Стойкий воин ксено с хорошим уроном.
 ent-MobXenoDrone = Дрон
-    .desc = { ent-MobXeno.desc }
+    .desc = Дрон. Рядовой представитель ксеносов, задача которых - защищать улей и иногда охотиться. Не обладают выдающимися характеристиками.  Самый типичный ксено.
 ent-MobXenoQueen = Королева
-    .desc = { ent-MobXeno.desc }
+    .desc = Королева. Предводительница стаи, невероятно сильная и живучая, если она оказалась перед вами - считайте, что вы мертвы.
 ent-MobXenoRavager = Разрушитель
-    .desc = { ent-MobXeno.desc }
+    .desc = Разрушитель. Самый сильный и живучий ксенос, после королевы.
 ent-MobXenoRunner = Бегун
-    .desc = { ent-MobXeno.desc }
+    .desc = Бегун. Обладает малым уроном, но отличается большой скоростью, так что быстро бегает и бьёт.
 ent-MobXenoRouny = Руни
     .desc = { ent-MobXenoRunner.desc }
 ent-MobXenoSpitter = Плевальщик
-    .desc = { ent-MobXeno.desc }
+    .desc = Плевальщик. Рядовой представитель ксеносов, который плюётся едкой кислотой, прожигающую даже броню. Однако слаб в ближнем бою.
 ent-MobPurpleSnake = космическая гадюка
     .desc = Грозная пурпурная змея с Kepler-283c.
 ent-MobSmallPurpleSnake = космическая гадюка
diff --git a/Resources/Prototypes/ADT/Actions/XenoQeen.yml b/Resources/Prototypes/ADT/Actions/XenoQeen.yml
new file mode 100644
index 00000000000..2c853b949ad
--- /dev/null
+++ b/Resources/Prototypes/ADT/Actions/XenoQeen.yml
@@ -0,0 +1,109 @@
+# Спавн турелей у королевы
+- type: entity
+  id: ActionXenoQeenTurret
+  name: Create Xeno turret
+  description: Create an xeno turret in front of you, if placeable there.
+  components:
+  - type: InstantAction
+    priority: -1
+    useDelay: 180
+    icon:
+      sprite: Objects/Weapons/Guns/Turrets/xenoturret.rsi
+      state: icon
+    event: !type:InvisibleWallActionEvent 
+# Я не смог сделать отдельный ивент для спавнта турели. Он не видел прототип ивента.
+
+- type: entity
+  id: ActionSpawnMobXenoSpitter
+  name: Spawn Spitter
+  description: Give birth to Spitter who will spit!
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: WorldTargetAction
+    useDelay: 240
+    range: 4
+    itemIconStyle: BigAction
+    icon:
+      sprite: Mobs/Aliens/Xenos/spitter.rsi
+      state: crit
+    event: !type:WorldSpawnSpellEvent
+      prototypes:
+      - id: MobXenoSpitter
+        amount: 1
+      offset: 0, 1
+
+- type: entity
+  id: ActionSpawnMobXenoPraetorian
+  name: Spawn Praetorian
+  description: Give birth to a Praetorian who will fight for you!
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: WorldTargetAction
+    useDelay: 300
+    range: 4
+    itemIconStyle: BigAction
+    icon:
+      sprite: Mobs/Aliens/Xenos/praetorian.rsi
+      state: crit
+    event: !type:WorldSpawnSpellEvent
+      prototypes:
+      - id: MobXenoPraetorian
+        amount: 1
+      offset: 0, 1
+
+- type: entity
+  id: ActionSpawnMobXenoDrone
+  name: Just a Drone. Who needs it?
+  description: Give birth to a worker, Drone.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: WorldTargetAction
+    useDelay: 80
+    range: 4
+    itemIconStyle: BigAction
+    icon:
+      sprite: Mobs/Aliens/Xenos/drone.rsi
+      state: crit
+    event: !type:WorldSpawnSpellEvent
+      prototypes:
+      - id: MobXenoDrone
+        amount: 1
+      offset: 0, 1
+
+- type: entity
+  id: ActionSpawnMobXenoRavager
+  name: Spawn Ravager
+  description: Give birth to death in the flesh!
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: WorldTargetAction
+    useDelay: 480
+    range: 4
+    itemIconStyle: BigAction
+    icon:
+      sprite: Mobs/Aliens/Xenos/ravager.rsi
+      state: crit
+    event: !type:WorldSpawnSpellEvent
+      prototypes:
+      - id: MobXenoRavager
+        amount: 1
+      offset: 0, 1
+
+- type: entity
+  id: ActionSpawnMobXenoRunner
+  name: Spawn Runner
+  description: Give birth to the fastest larva!
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: WorldTargetAction
+    useDelay: 120
+    range: 4
+    itemIconStyle: BigAction
+    icon:
+      sprite: Mobs/Aliens/Xenos/runner.rsi
+      state: crit
+    event: !type:WorldSpawnSpellEvent
+      prototypes:
+      - id: MobXenoRunner
+        amount: 1
+      offset: 0, 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index a71adfc57cf..eacda126d91 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -146,12 +146,18 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      100: Dead
+      350: Dead # ADT Tweak
   - type: Stamina
     critThreshold: 300
   - type: SlowOnDamage
     speedModifierThresholds:
       50: 0.7
+  #ADT Start: Xeno baff
+  - type: MeleeWeapon
+    damage:
+      groups:
+        Brute: 8    
+  # ADT End
   - type: Fixtures
     fixtures:
       fix1:
@@ -183,14 +189,14 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      80: Dead
+      100: Dead # ADT Tweak
   - type: SlowOnDamage
     speedModifierThresholds:
       40: 0.7
   - type: MeleeWeapon
     damage:
       groups:
-        Brute: 6
+        Brute: 5 # ADT Tweak
   - type: MovementSpeedModifier
     baseSprintSpeed: 4
   - type: Fixtures
@@ -214,6 +220,16 @@
   parent: MobXeno
   id: MobXenoQueen
   components:
+  # ADT Start: Xeno buff
+  - type: XenoQeen # ADT Tweak: Способность спавнта турелей
+  - type: ActionGrant
+    actions:
+      - ActionSpawnMobXenoSpitter # Призыв Плевальщиков
+      - ActionSpawnMobXenoPraetorian # Призыв Преторианеца
+      - ActionSpawnMobXenoDrone # Призыв Дрона
+      - ActionSpawnMobXenoRavager # Призыв Разрушителя
+      - ActionSpawnMobXenoRunner # Призыв бегуна
+  #ADT End
   - type: Sprite
     drawdepth: Mobs
     sprite: Mobs/Aliens/Xenos/queen.rsi
@@ -224,7 +240,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      300: Dead
+      1000: Dead # ADT Tweak
   - type: SlowOnDamage
     speedModifierThresholds:
       150: 0.7
@@ -232,7 +248,7 @@
   - type: MeleeWeapon
     damage:
      groups:
-       Brute: 12
+       Brute: 20 # ADT Tweak
   - type: Fixtures
     fixtures:
       fix1:
@@ -252,7 +268,6 @@
     rankName: collective-mind-queen-rank
   # ADT-CollectiveMind-Tweak-End
 
-
 - type: entity
   name: ravager
   parent: MobXeno
@@ -268,13 +283,13 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      100: Dead
+      750: Dead # ADT Tweak
   - type: MovementSpeedModifier
-    baseSprintSpeed: 4
+    baseSprintSpeed: 2 # ADT Tweak
   - type: MeleeWeapon
     damage:
      groups:
-       Brute: 10
+       Brute: 30 # ADT Tweak
   - type: SlowOnDamage
     speedModifierThresholds:
       50: 0.7
@@ -306,8 +321,14 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: running
+    # ADT Start: Xeno buff    
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      100: Dead
+    # ADT End
   - type: MovementSpeedModifier
-    baseSprintSpeed: 6.0
+    baseSprintSpeed: 12.0 # ADT Tweak
   - type: MeleeWeapon
     damage:
      groups:
@@ -362,7 +383,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      50: Dead
+      80: Dead # ADT Tweak
   - type: SlowOnDamage
     speedModifierThresholds:
       25: 0.7
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index f4043820d0c..247d3dcb314 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -805,7 +805,7 @@
     - type: Projectile
       damage:
         types:
-          Caustic: 5
+          Caustic: 12 # ADT Tweak
     - type: Sprite
       sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi
       layers:
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7eef088dfb6101a27a2f83603752599c8f5b7185
GIT binary patch
literal 668
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vO2U$sR$z3=CCj3=9n|3=F@3LJcn%
z7)lKo7+xhXFj&oCU=S~uvn$XBD4`YL6XFV_`2<B}6jW7p^u;9Q7>pSh(il{iF);jR
z5aE^5Q`J|MQI!;u`~Uy{#>p)&fvOoxg8YIR9G=}s196hP-CcOUZAttJ<Zu>vL>2>$
zI|9OtQ?>b|fr9KMp1!W^FL;CnwZ$WEOuq)wlwaf*!gzjB`79t?#?!?yMB{wz#QlDU
z4FrzmDz@cWK3baWI<05rCIhvdOQR*{s4vje<`MO0$o`?c#M@|tQzheSNvjPDek|M|
z-1vy+PSVfv`Toz}C+BD|JQJ~xuhL`q@GpFhYSKf7_!u|gqgRuR9$%Y#@Il%pcc~p*
znoF7e)_4E@D)EH>=-o7(8}FW!ZI^5AJ=1OP;IcmGS#j~V?~z->TfTTqy)}LBgU!aa
zm+iOwI@{!>Z6A`7vG(i5JwGbyyY|m^zP?2K3bWFY%C)<nX>-5K*e}T3vFoZn)8@Lr
z9E_Vbgq~NpP*tQPq&97JSRzZqysx((M{daC=w+P1`;V2wMd_=Acv+YHj2mgH+l6x)
zWPbN}u_b*t@!xl<vyIGRo7(G{$0mD<ZL4FLKFQC}{@Ff3V4$g%xJHzuB$lLFB^RXv
zDF!10BNJUiBV9ww5JPh-6JskwQ*8qSD+2>NV_rWL4Y~O#nQ4`{HTdUk{RGsY0k@$f
iGdH!kBr&%DQ;(4`#FDQn%f0~hFnGH9xvX<aXaWFMcIWT_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
index 3adb37ea5c3..071f869db31 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
@@ -7,6 +7,9 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "icon"
+    },
     {
       "name": "acid_turret",
       "directions": 4,

From ee51094317431dc92154e79656e9f389d9d53989 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 21 Dec 2024 16:49:35 +0300
Subject: [PATCH 5/6] Auto CL update (#904)

No cl, no fun

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 Resources/Changelog/1ChangelogADT.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/1ChangelogADT.yml b/Resources/Changelog/1ChangelogADT.yml
index 94cad5a9fb6..e861591d1e3 100644
--- a/Resources/Changelog/1ChangelogADT.yml
+++ b/Resources/Changelog/1ChangelogADT.yml
@@ -4907,3 +4907,10 @@ Entries:
         type: Fix}
     time: '2024-12-20T14:30:35Z'
     id: 610
+  - author: NameLunar
+    changes:
+      - {message: Ксеноморфы эволюционировали и стали намного опасней. В особенности
+          Королева!, type: Fix}
+      - {message: Добавлены некоторые способности для королевы ксеноморфов., type: Add}
+    time: '2024-12-21T13:42:16Z'
+    id: 611

From 2b6fe4a1eb45050317c7e9ff4baeaf5fc2a2276e Mon Sep 17 00:00:00 2001
From: sh4zik <lorenczahar516@gmail.com>
Date: Sat, 21 Dec 2024 15:03:46 +0100
Subject: [PATCH 6/6] =?UTF-8?q?[FIX]=20=D0=91=D1=8B=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8C=D0=BA=D0=B8=D0=B5=20=D0=BF=D0=BE=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=BA=D0=B8=20(#903)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Описание PR
Починка всего, что было сломанно

## Почему / Баланс
Починка разнообразного контента

## Требования
<!--
В связи с наплывом ПР'ов нам необходимо убедиться, что ПР'ы следуют
правильным рекомендациям.

Пожалуйста, уделите время прочтению, если делаете пулл реквест (ПР)
впервые.

Отметьте поля ниже, чтобы подтвердить, что Вы действительно видели их
(поставьте X в скобках, например [X]):
-->
- [x] Я прочитал(а) и следую [Руководство по созданию пулл
реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению
мейнтейнера.
- [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие
его изменения в игре, **или** этот пулл реквест не требует демонстрации
в игре

**Чейнджлог**
<!-- Изменения и прочие фиксы моих же новвоведений🆑 Sh4zik
-->

:cl: Sh4zik
- tweak: Были переработаны кинжалы
- fix: Были починены крафты кинжалов
- fix: Был починен вес новогодних саней
---
 .../ADT/Entities/Objects/Fun/misc.yml         |  26 ++++-
 .../Entities/Objects/Weapons/Melee/swords.yml | 106 +++++++++++++++++-
 .../Crafting/Graphs/Improvised/daggers.yml    |  36 +++++-
 3 files changed, 158 insertions(+), 10 deletions(-)

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
index 39c4b105f86..5e7d11f74fe 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
@@ -2,7 +2,7 @@
 - type: entity
   parent: [BaseBallBat, ClothingHandsBase]
   id: ADTHalloweenBroom
-  name: witch broom
+  name: witch broom 
   description: time to fly
   suffix: Halloween
   components:
@@ -72,9 +72,31 @@
 - type: entity
   name: New Year gurney
   id: ADTNewYearKatalka
-  parent: ChairBase
+  parent: BaseStructure
   description: Yea.
+  placement:
+    mode: PlaceFree
   components:
   - type: Sprite
     sprite: ADT/Structures/Specific/newyearkatalki.rsi
     state: newyearkatalka
+  - type: Anchorable
+  - type: Rotatable
+  - type: Physics # ADT CHANGE START sleep
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+        density: 10
+        mask:
+        - TableMask
+  - type: HealOnBuckle
+    damage:
+      types:
+        Poison: -0.1
+        Blunt: -0.1
+  - type: Strap
+    position: Down
+    rotation: 0 # ADT CHANGE END sleep
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
index 5951f1a0334..0ff1bec9869 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
@@ -110,7 +110,31 @@
     attackRate: 1.75
     damage:
       types:
-        Slash: 6.3
+        Piercing: 8
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 1
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionInjectOnEmbed
+    transferAmount: 1
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 15
+  - type: EmbeddableProjectile
+    offset: -0.15,0.0
+  - type: ThrowingAngle
+    angle: 225
+  - type: LandAtCursor
 
 - type: entity
   name: dagger reinforced
@@ -140,7 +164,31 @@
     attackRate: 1.75
     damage:
       types:
-        Slash: 6
+        Piercing: 7
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 1
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionInjectOnEmbed
+    transferAmount: 1
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 12
+  - type: EmbeddableProjectile
+    offset: -0.15,0.0
+  - type: ThrowingAngle
+    angle: 225
+  - type: LandAtCursor
 
 - type: entity
   name: dagger glass
@@ -170,7 +218,31 @@
     attackRate: 1.75
     damage:
       types:
-        Slash: 5
+        Piercing: 6
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 1
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionInjectOnEmbed
+    transferAmount: 1
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 10
+  - type: EmbeddableProjectile
+    offset: -0.15,0.0
+  - type: ThrowingAngle
+    angle: 225
+  - type: LandAtCursor
 
 - type: entity
   name: dagger uranium
@@ -200,7 +272,33 @@
     attackRate: 1.75
     damage:
       types:
-        Slash: 9
+        Piercing: 5
+        Radiation: 5
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 1
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionInjectOnEmbed
+    transferAmount: 1
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 9
+        Radiation: 9
+  - type: EmbeddableProjectile
+    offset: -0.15,0.0
+  - type: ThrowingAngle
+    angle: 225
+  - type: LandAtCursor
 
 - type: entity
   name: wooden sword
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
index 87e28b684c4..04e9d3039ff 100644
--- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
@@ -6,8 +6,15 @@
     edges:
     - to: ADTCompGlassDager
       steps:
-      - material: Cloth
+      - material: MetalRod
         amount: 1
+      - material: Cable
+        amount: 1
+      - tag: GlassShard
+        name: glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
         doAfter: 1
   - node: ADTCompGlassDager
     entity: ADTGlassDagger
@@ -20,8 +27,15 @@
     edges:
     - to: ADTCompGlassRefDager
       steps:
-      - material: Cloth
+      - material: MetalRod
+        amount: 1
+      - material: Cable
         amount: 1
+      - tag: ReinforcedGlassShard
+        name: reinforced glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
         doAfter: 1
   - node: ADTCompGlassRefDager
     entity: ADTGlassReinDagger
@@ -34,8 +48,15 @@
     edges:
     - to: ADTCompUranDager
       steps:
-      - material: Cloth
+      - material: MetalRod
         amount: 1
+      - material: Cable
+        amount: 1
+      - tag: UraniumGlassShard
+        name: uranium glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
         doAfter: 1
   - node: ADTCompUranDager
     entity: ADTGlassUranDagger
@@ -48,8 +69,15 @@
     edges:
     - to: ADTCompPlasmaDager
       steps:
-      - material: Cloth
+      - material: MetalRod
+        amount: 1
+      - material: Cable
         amount: 1
+      - tag: PlasmaGlassShard
+        name: plasma glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
         doAfter: 1
   - node: ADTCompPlasmaDager
     entity: ADTPlasmaDagger