From 529968d9df6213de19ea55ccc59135e8f0524f36 Mon Sep 17 00:00:00 2001
From: Neiro-13 <186548995+Neiro-13@users.noreply.github.com>
Date: Tue, 26 Nov 2024 20:26:46 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=9E=D0=B4=D0=BD=D0=B0=20=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=8F=20=D0=BF=D1=80=D0=B8=D1=87=D0=B5=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавил одну новую прическу с помощью мода "utility_item"
---
 mods/utility_items/_utility_items.dme |   4 ++++
 mods/utility_items/code/hair_dyak.dm  |   7 +++++++
 mods/utility_items/icons/dyak.dmi     | Bin 0 -> 350 bytes
 3 files changed, 11 insertions(+)
 create mode 100644 mods/utility_items/code/hair_dyak.dm
 create mode 100644 mods/utility_items/icons/dyak.dmi

diff --git a/mods/utility_items/_utility_items.dme b/mods/utility_items/_utility_items.dme
index 7d7e1d016ed6f..659b11b1a4789 100644
--- a/mods/utility_items/_utility_items.dme
+++ b/mods/utility_items/_utility_items.dme
@@ -22,10 +22,14 @@
 #include "code/hair_olivka.dm"
 #include "code/ert_maint_helmet.dm"
 #include "code/tag_recipe.dm"
+<<<<<<< Updated upstream
 #include "code/dodge_animation.dm"
 #include "code/advanced_landing.dm"
 #include "code/chemistry.dm"
 #include "code/jobs.dm"
 
+=======
+#include "code/hair_dyak.dm"
+>>>>>>> Stashed changes
 
 #endif
diff --git a/mods/utility_items/code/hair_dyak.dm b/mods/utility_items/code/hair_dyak.dm
new file mode 100644
index 0000000000000..81aa43626a931
--- /dev/null
+++ b/mods/utility_items/code/hair_dyak.dm
@@ -0,0 +1,7 @@
+/datum/sprite_accessory/hair/dyak
+
+	name = "Dyak"
+	icon = 'mods/utility_items/icons/dyak.dmi'
+	icon_state = "hair_dyak"
+	species_allowed = list(SPECIES_HUMAN)
+	flags = HAIR_TIEABLE
diff --git a/mods/utility_items/icons/dyak.dmi b/mods/utility_items/icons/dyak.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..dd9de0a400fe30d64f8fba6180160e8e2f1bbaeb
GIT binary patch
literal 350
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S4}Vw6chvsh>3}bx5g&|
zS&St?e!&b5&u*jvIjL145hX6E#mPmP1tppJc?=8{bArPPib}tK2`>2f^@*0ZuGYCT
z=Yuzd8eBAf@JQ#pkLF2+qMqIz7REuwmyNv?<~*8oWKxJiuxDqtvFhd(5=-WF8?V(c
zG#5Q$_9Q5*;A=7CYz~H5|0Vb=7bdy@E$s1haSZY3e0%vI=V1e$*2K`1hFg&iVS5|`
z*g3+!&tJK4x|i0D3(gA{%#WG(xzV5PN9fXRtMBevn-{N@U@RTE#KM7r??mi(jvGy}
z_6&ig;S9F>!*8!*KjXC1_y2r{X9}l{8kQDpuP#tzKlLEb@57vbAH(8KFxl*270~Zp
p;BLUQfa3!5AErHXQ*O@x!jPK5{Y5dQiXG@K22WQ%mvv4FO#tkFgi!zh

literal 0
HcmV?d00001


From e573ddd08829b056b5d26ebbd84d5083a7b07ebc Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Tue, 26 Nov 2024 22:39:14 +0500
Subject: [PATCH 2/2] Update _utility_items.dme

---
 mods/utility_items/_utility_items.dme | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mods/utility_items/_utility_items.dme b/mods/utility_items/_utility_items.dme
index 659b11b1a4789..acca6b2ddf5d4 100644
--- a/mods/utility_items/_utility_items.dme
+++ b/mods/utility_items/_utility_items.dme
@@ -22,14 +22,10 @@
 #include "code/hair_olivka.dm"
 #include "code/ert_maint_helmet.dm"
 #include "code/tag_recipe.dm"
-<<<<<<< Updated upstream
 #include "code/dodge_animation.dm"
 #include "code/advanced_landing.dm"
 #include "code/chemistry.dm"
 #include "code/jobs.dm"
-
-=======
 #include "code/hair_dyak.dm"
->>>>>>> Stashed changes
 
 #endif