From 24539931728b8d1097d72c7d23ae212633cca0ca Mon Sep 17 00:00:00 2001
From: UEDCommander <aleksgroza@mail.ru>
Date: Fri, 2 Feb 2024 12:28:34 +0300
Subject: [PATCH 01/12] Stuff

---
 mods/emote_panel/code/unathi.dm    | 16 ++++++
 mods/global_modpacks.dm            |  1 +
 mods/unathi/README.md              | 80 ++++++++++++++++++++++++++++++
 mods/unathi/_unathi.dm             |  4 ++
 mods/unathi/_unathi.dme            | 13 +++++
 mods/unathi/code/reagents.dm       | 12 +++++
 mods/unathi/code/species.dm        |  2 +
 mods/unathi/code/species_attack.dm | 23 +++++++++
 8 files changed, 151 insertions(+)
 create mode 100644 mods/unathi/README.md
 create mode 100644 mods/unathi/_unathi.dm
 create mode 100644 mods/unathi/_unathi.dme
 create mode 100644 mods/unathi/code/reagents.dm
 create mode 100644 mods/unathi/code/species.dm
 create mode 100644 mods/unathi/code/species_attack.dm

diff --git a/mods/emote_panel/code/unathi.dm b/mods/emote_panel/code/unathi.dm
index 7e6471180c80e..e30123ccc36cc 100644
--- a/mods/emote_panel/code/unathi.dm
+++ b/mods/emote_panel/code/unathi.dm
@@ -14,6 +14,22 @@
 	/singleton/emote/audible/lizard_threat
 )
 
+/datum/species/unathi/yeosa/default_emotes = list(
+	/singleton/emote/human/swish,
+	/singleton/emote/human/wag,
+	/singleton/emote/human/sway,
+	/singleton/emote/human/qwag,
+	/singleton/emote/human/fastsway,
+	/singleton/emote/human/swag,
+	/singleton/emote/human/stopsway,
+	/singleton/emote/audible/lizard_bellow,
+	/singleton/emote/audible/lizard_squeal,
+	/singleton/emote/audible/lizard_scream,
+	/singleton/emote/audible/lizard_roar,
+	/singleton/emote/audible/lizard_rumble,
+	/singleton/emote/audible/lizard_threat
+)
+
 /singleton/emote/audible/lizard_bellow
 	key = "bellow"
 	emote_message_3p_target = "USER утробно рычит на TARGET!"
diff --git a/mods/global_modpacks.dm b/mods/global_modpacks.dm
index 53ddea1452887..3cf61c81b1ef6 100644
--- a/mods/global_modpacks.dm
+++ b/mods/global_modpacks.dm
@@ -20,6 +20,7 @@
 #include "nyc_posters/_nyc_posters.dme"
 #include "ssinput/_ssinput.dme"
 #include "statusbar/_statusbar.dme"
+#include "unathi/_unathi.dme"
 #include "utf8/_utf8.dme"
 
 #include "../packs/sierra-tweaks/_pack.dm"
diff --git a/mods/unathi/README.md b/mods/unathi/README.md
new file mode 100644
index 0000000000000..783fd5799c56d
--- /dev/null
+++ b/mods/unathi/README.md
@@ -0,0 +1,80 @@
+
+#### Список PRов:
+
+- https://github.com/SierraBay/SierraBay12/pull/1442
+<!--
+  Ссылки на PRы, связанные с модом:
+  - Создание
+  - Большие изменения
+-->
+
+<!-- Название мода. Не важно на русском или на английском. -->
+## Unathi
+
+ID мода: UNATHI
+<!--
+  Название модпака прописными буквами, СОЕДИНЁННЫМИ_ПОДЧЁРКИВАНИЕМ,
+  которое ты будешь использовать для обозначения файлов.
+-->
+
+### Описание мода
+
+Мод включает особые механики рас унати и йоза'унати, доступные на билде Infinity.
+- Изменена механика ядовитого укуса йоза'унати - теперь вводит реагент яда вместо нанесения токсичного урона;
+- Возвращена механика переключения регенерации унати.
+<!--
+  Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
+  А также любая полезная информация.
+-->
+
+### Изменения *кор кода*
+
+- `code/game/objects/auras/regenerating_aura.dm`:
+  - `/obj/aura/regenerating/human/unathi/can_toggle()`
+<!--
+  Если вы редактировали какие-либо процедуры или переменные в кор коде,
+  они должны быть указаны здесь.
+  Нужно указать и файл, и процедуры/переменные.
+
+  Изменений нет - напиши "Отсутствуют"
+-->
+
+### Оверрайды
+
+Отсутствуют
+<!--
+  Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
+  Здесь указываются оверрайды в твоём моде и папке `_master_files`
+
+  Изменений нет - напиши "Отсутствуют"
+-->
+
+### Дефайны
+
+Отсутствуют
+<!--
+  Если требовалось добавить какие-либо дефайны, укажи файлы,
+  в которые ты их добавил, а также перечисли имена.
+  И то же самое, если ты используешь дефайны, определённые другим модом.
+
+  Не используешь - напиши "Отсутствуют"
+-->
+
+### Используемые файлы, не содержащиеся в модпаке
+
+Отсутствуют
+<!--
+  Будь то немодульный файл или модульный файл, который не содержится в папке,
+  принадлежащей этому конкретному моду, он должен быть упомянут здесь.
+  Хорошими примерами являются иконки или звуки, которые используются одновременно
+  несколькими модулями, или что-либо подобное.
+-->
+
+### Авторы:
+
+UEDHighCommand
+<!--
+  Здесь находится твой никнейм
+  Если работал совместно - никнеймы тех, кто помогал.
+  В случае порта чего-либо должна быть ссылка на источник.
+-->
diff --git a/mods/unathi/_unathi.dm b/mods/unathi/_unathi.dm
new file mode 100644
index 0000000000000..cf75927f62d47
--- /dev/null
+++ b/mods/unathi/_unathi.dm
@@ -0,0 +1,4 @@
+/singleton/modpack/unathi
+	name = "Унати"
+	desc = "Мод включает особые механики рас унати и йоза'унати, доступные на билде Infinity"
+	author = "UEDHighCommand"
diff --git a/mods/unathi/_unathi.dme b/mods/unathi/_unathi.dme
new file mode 100644
index 0000000000000..011dd4d4a6d20
--- /dev/null
+++ b/mods/unathi/_unathi.dme
@@ -0,0 +1,13 @@
+#ifndef UNATHI
+#define UNATHI
+
+#include "_unathi.dm"
+
+// Далее просто включай свой код
+// #include "code/something.dm"
+
+#include "code/reagents.dm"
+#include "code/species.dm"
+#include "code/species_attack.dm"
+
+#endif
diff --git a/mods/unathi/code/reagents.dm b/mods/unathi/code/reagents.dm
new file mode 100644
index 0000000000000..c1bf877b12a55
--- /dev/null
+++ b/mods/unathi/code/reagents.dm
@@ -0,0 +1,12 @@
+/datum/reagent/toxin/yeosvenom
+	name = "Esh Hashaar Haashane"
+	description = "A non-lethal toxin produced by Yeosa'Unathi"
+	taste_description = "absolutely vile"
+	color = "#91d895"
+	target_organ = BP_LIVER
+	strength = 1
+
+/datum/reagent/toxin/yeosvenom/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	if(prob(volume*10))
+		M.confused = max(M.confused, 10)
+	..()
diff --git a/mods/unathi/code/species.dm b/mods/unathi/code/species.dm
new file mode 100644
index 0000000000000..1610329786dbd
--- /dev/null
+++ b/mods/unathi/code/species.dm
@@ -0,0 +1,2 @@
+/datum/species/unathi/yeosa/New()
+	unarmed_types ^= list(/datum/unarmed_attack/bite/venom, /datum/unarmed_attack/bite/venom/yeosa)
diff --git a/mods/unathi/code/species_attack.dm b/mods/unathi/code/species_attack.dm
new file mode 100644
index 0000000000000..c2ecd21ea591a
--- /dev/null
+++ b/mods/unathi/code/species_attack.dm
@@ -0,0 +1,23 @@
+/datum/unarmed_attack/bite/venom/yeosa
+	var/poison_per_bite = 8
+	var/poison_type = /datum/reagent/toxin/yeosvenom
+	attack_verb = list("bit", "sank their fangs into")
+	attack_sound = 'sound/weapons/bite.ogg'
+	attack_name = "venomous bite 2"
+	damage = 1
+	delay = 30
+
+/datum/unarmed_attack/bite/venom/yeosa/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone)
+	..()
+	if(istype(src) && target && ishuman(target))
+		var/mob/living/carbon/human/H = target
+		var/obj/item/clothing/suit/space/S = H.get_covering_equipped_item_by_zone(zone)
+		if(istype(S) && !length(S.breaches))
+			return
+		if(target.reagents)
+			target.reagents.add_reagent(src.poison_type, rand(0.875 * src.poison_per_bite, src.poison_per_bite))
+			if(prob(src.poison_per_bite))
+				to_chat(H, SPAN_WARNING("You feel a tiny prick."))
+
+/datum/unarmed_attack/bite/venom/yeosa/get_damage_type()
+	return DAMAGE_BRUTE

From b5f18c61c6100ab3dc19d6d77d3a21f3f1dc00d3 Mon Sep 17 00:00:00 2001
From: UEDCommander <aleksgroza@mail.ru>
Date: Fri, 2 Feb 2024 12:49:15 +0300
Subject: [PATCH 02/12] Readme updates & fixes

---
 mods/emote_panel/README.md         | 1 +
 mods/unathi/README.md              | 2 +-
 mods/unathi/code/reagents.dm       | 4 ++--
 mods/unathi/code/species_attack.dm | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mods/emote_panel/README.md b/mods/emote_panel/README.md
index 9803bc1469749..e807872d26fc7 100644
--- a/mods/emote_panel/README.md
+++ b/mods/emote_panel/README.md
@@ -3,6 +3,7 @@
 
 - https://github.com/SierraBay/SierraBay12/pull/1087
 - https://github.com/SierraBay/SierraBay12/pull/1815
+- https://github.com/SierraBay/SierraBay12/pull/1856
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание
diff --git a/mods/unathi/README.md b/mods/unathi/README.md
index 783fd5799c56d..f5d262d037dd8 100644
--- a/mods/unathi/README.md
+++ b/mods/unathi/README.md
@@ -1,7 +1,7 @@
 
 #### Список PRов:
 
-- https://github.com/SierraBay/SierraBay12/pull/1442
+- https://github.com/SierraBay/SierraBay12/pull/1856
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание
diff --git a/mods/unathi/code/reagents.dm b/mods/unathi/code/reagents.dm
index c1bf877b12a55..d30a1a72a00f2 100644
--- a/mods/unathi/code/reagents.dm
+++ b/mods/unathi/code/reagents.dm
@@ -6,7 +6,7 @@
 	target_organ = BP_LIVER
 	strength = 1
 
-/datum/reagent/toxin/yeosvenom/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/yeosvenom/affect_blood(mob/living/carbon/M, alien, removed)
 	if(prob(volume*10))
-		M.confused = max(M.confused, 10)
+		M.set_confused(10)
 	..()
diff --git a/mods/unathi/code/species_attack.dm b/mods/unathi/code/species_attack.dm
index c2ecd21ea591a..a3eaa75e9b7a4 100644
--- a/mods/unathi/code/species_attack.dm
+++ b/mods/unathi/code/species_attack.dm
@@ -7,7 +7,7 @@
 	damage = 1
 	delay = 30
 
-/datum/unarmed_attack/bite/venom/yeosa/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone)
+/datum/unarmed_attack/bite/venom/yeosa/apply_effects(mob/living/carbon/human/user, mob/living/carbon/human/target, armour, attack_damage, zone)
 	..()
 	if(istype(src) && target && ishuman(target))
 		var/mob/living/carbon/human/H = target

From c40505013e10ef4afbb536e1c90bfd753601b8d6 Mon Sep 17 00:00:00 2001
From: UEDCommander <aleksgroza@mail.ru>
Date: Fri, 2 Feb 2024 12:59:03 +0300
Subject: [PATCH 03/12] I did an oopsie

---
 mods/unathi/code/species.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mods/unathi/code/species.dm b/mods/unathi/code/species.dm
index 1610329786dbd..ee4378f5dd4bc 100644
--- a/mods/unathi/code/species.dm
+++ b/mods/unathi/code/species.dm
@@ -1,2 +1,3 @@
 /datum/species/unathi/yeosa/New()
+	. = ..()
 	unarmed_types ^= list(/datum/unarmed_attack/bite/venom, /datum/unarmed_attack/bite/venom/yeosa)

From 72005a115187d1552fe1f755082d2cdf0bf7b763 Mon Sep 17 00:00:00 2001
From: UEDCommander <aleksgroza@mail.ru>
Date: Fri, 2 Feb 2024 13:50:49 +0300
Subject: [PATCH 04/12] Some more fixes

---
 code/game/objects/auras/regenerating_aura.dm | 5 ++++-
 mods/unathi/code/species.dm                  | 2 +-
 mods/unathi/code/species_attack.dm           | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/auras/regenerating_aura.dm b/code/game/objects/auras/regenerating_aura.dm
index 58a35ab1ebd0b..f05befa367b7a 100644
--- a/code/game/objects/auras/regenerating_aura.dm
+++ b/code/game/objects/auras/regenerating_aura.dm
@@ -120,7 +120,10 @@
 	var/toggle_blocked_until = 0 // A time
 
 /obj/aura/regenerating/human/unathi/can_toggle()
-	return FALSE
+	// [SIERRA-EDIT] - UNATHI - Механ с инфинити
+	// return FALSE // SIERRA-EDIT - ORIGINAL
+	return TRUE
+	// [/SIERRA-EDIT]
 
 // Default return; we're just logging.
 /obj/aura/regenerating/human/unathi/aura_check_weapon(obj/item/weapon, mob/attacker, click_params)
diff --git a/mods/unathi/code/species.dm b/mods/unathi/code/species.dm
index ee4378f5dd4bc..736a123b49ba6 100644
--- a/mods/unathi/code/species.dm
+++ b/mods/unathi/code/species.dm
@@ -1,3 +1,3 @@
 /datum/species/unathi/yeosa/New()
-	. = ..()
 	unarmed_types ^= list(/datum/unarmed_attack/bite/venom, /datum/unarmed_attack/bite/venom/yeosa)
+	. = ..()
diff --git a/mods/unathi/code/species_attack.dm b/mods/unathi/code/species_attack.dm
index a3eaa75e9b7a4..c74e0edf49927 100644
--- a/mods/unathi/code/species_attack.dm
+++ b/mods/unathi/code/species_attack.dm
@@ -3,7 +3,7 @@
 	var/poison_type = /datum/reagent/toxin/yeosvenom
 	attack_verb = list("bit", "sank their fangs into")
 	attack_sound = 'sound/weapons/bite.ogg'
-	attack_name = "venomous bite 2"
+	attack_name = "venomous bite"
 	damage = 1
 	delay = 30
 

From 4d61f0c3279a5a748acc2ee23ad279bf32fc988e Mon Sep 17 00:00:00 2001
From: UEDCommander <aleksgroza@mail.ru>
Date: Fri, 2 Feb 2024 23:14:44 +0300
Subject: [PATCH 05/12] Added regen delay, added some loadout items icons

---
 mods/loadout_items/README.md                     |   1 +
 mods/loadout_items/code/uniforms.dm              |  15 +++++++++++++++
 .../icons/unathi/onmob_under_unathi.dmi          | Bin 0 -> 4103 bytes
 mods/unathi/_unathi.dme                          |   1 +
 mods/unathi/code/aura.dm                         |   3 +++
 5 files changed, 20 insertions(+)
 create mode 100644 mods/loadout_items/icons/unathi/onmob_under_unathi.dmi
 create mode 100644 mods/unathi/code/aura.dm

diff --git a/mods/loadout_items/README.md b/mods/loadout_items/README.md
index 58a9c801ecbdd..e5efbf65b91b0 100644
--- a/mods/loadout_items/README.md
+++ b/mods/loadout_items/README.md
@@ -5,6 +5,7 @@
 - https://github.com/SierraBay/SierraBay12/pull/1643
 - https://github.com/SierraBay/SierraBay12/pull/1650
 - https://github.com/SierraBay/SierraBay12/pull/1761
+- https://github.com/SierraBay/SierraBay12/pull/1856
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание
diff --git a/mods/loadout_items/code/uniforms.dm b/mods/loadout_items/code/uniforms.dm
index adfb26eb2057b..9597cdd5dea99 100644
--- a/mods/loadout_items/code/uniforms.dm
+++ b/mods/loadout_items/code/uniforms.dm
@@ -18,6 +18,9 @@
 	item_state = "zpci_uniform"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //it's security uniform's stats
 	siemens_coefficient = 0.9
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_under_unathi.dmi'
+	)
 
 /obj/item/clothing/under/rank/security/saarecombat
 	name = "\improper SAARE combat uniform"
@@ -28,6 +31,9 @@
 	item_state = "saarecombat"
 	worn_state = "saarecombat"
 	gender_icons = 1
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_under_unathi.dmi'
+	)
 
 // SIERRA TO DO: Cleanup icons from unused loadout
 
@@ -243,6 +249,9 @@
 	item_icons = list(slot_w_uniform_str = 'mods/loadout_items/icons/onmob_under.dmi')
 	icon_state = "gotsis_dress_1"
 	item_state = "gotsis_dress_1"
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_under_unathi.dmi'
+	)
 
 /obj/item/clothing/under/dress/gotsis_orange
 	name = "orange gotsis dress"
@@ -251,6 +260,9 @@
 	item_icons = list(slot_w_uniform_str = 'mods/loadout_items/icons/onmob_under.dmi')
 	icon_state = "gotsis_dress_2"
 	item_state = "gotsis_dress_2"
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_under_unathi.dmi'
+	)
 
 // Spotrs
 
@@ -441,6 +453,9 @@
 	icon_state = "victorian_dress"
 	item_state = "victorian_dress"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_under_unathi.dmi'
+	)
 
 /obj/item/clothing/under/dress/victorian/red
 	name = "red victorian dress"
diff --git a/mods/loadout_items/icons/unathi/onmob_under_unathi.dmi b/mods/loadout_items/icons/unathi/onmob_under_unathi.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..c0e1145a7a8cdfb740c782542b0a4044fe7ee42a
GIT binary patch
literal 4103
zcmV+i5cuzjP)<h;3K|Lk000e1NJLTq006)M005u}0{{R3ZT6FI00048P)t-s0000R
z8ygxL8Wa>1BO@aqARx?{S_%pZQUCxcDJd>4E+;1^!jV;H1pxoQaO0|Eyciw!_Vykg
z9vK-K|NsAK000pY5fv2`7Z(@b#-{oC`E&*VhX4S{$;sB%*1NmA|KYsr(61pOAuup7
z&CSi`=H>tZ03972%9mLP2ne~kxzyCu3kwS+B_${*C@Lx{?d|Q{+}sTf4G#|w5)u-0
z003G50AT<CWdHzt000aO41fRt+S=O7%gbH>0CfNWW&i*{KtQSh0F?j$Ha0e0U0q8{
zOFut9iU0s{003B6SY>5pga80NJw5--Gim?;goK2dnVGh>ws`;mx4F#B&f**#92OQ9
zA|fIf7#JodCcwbJ0E_Jae%AnHtpHSye}8`<K2x8cpHov)D=RAw4h|n5A2Bg8EiElX
zL_|%1O=+BIIyyQK5D+vpG=qbKv$L}#BqTF4GdnvwF^n<?00001bW%=J06^y0W&i*H
zta?;fbVOxyV{&P5bZKvH004NLm61UUf<P36&%3{3(R-wI?Gi?K$iE;jchwiT8}B_0
z`t@lA-eSAWz<k5Nq~>@!mz60lrJfuy25$~#zu9W_Kr8)hcDYu)!>*T)VF7WoOeSn3
z5Q48QIp&%Ztt=8R1zNQPgIjdA5?v5R{>Jlvfh+=8H<7ckv%ua)0WT5J=e@yt^w<U(
zBH|1{t_i~xew3%?R2A<BUaEk1uyLd9!~g&dp-DtRRCt{2T@82BRuX;s@Wx1u-B__K
z*lYoB5o9YXG<GR8)OKUjq+KtR!pbd46FyoZASosJ|L5$?vtv>`Gs;QGq35iwEji|n
z-n;jGjO6D;D3v2ejvP6192W+_{LmtJScaicq{Z;2VcP}UHU$e3ml^T58T~TzH<q6%
z!h_|lbB<#u!*R~h4ot^!ZQFJohtpsd3WW>@LdZw6C3G-Tnxz$fG+Qp0i?A`g<+|sb
za|Ud#OF1wd_YjN&bm*ENOZq=HU9JJ<X3C}FjG8Hy$}@8eUn&)0qj}I@anHFQ!&b2g
z2T-#$)(@|w1kZ*pa-=>m3l8+4?NR#XXFy?frV9FI=BE{o`69<F%Py!23=!}Fuap4`
zVnDtPudYuUaBYw4o>3u=tAj`bb84nsg~yEkndGabYH60{EgR-;!LAi*c12l*DF<f3
z4&dKm4uFB6Ku$%^wtd5O1KvR3x`uC42F}l2Km&g-FQ9=7bLUBZ0sJkHJQzU9zVQ#k
zpS(MYPwb1xYyC=HbU&dC6u<zO;0?g>V4y%4xO5pMRbh%&QSRkSBwwljvtA*2^(hMU
zy^2xsK)}Vqr|<B=l>m9jA(&;YD^w5oP>4~OI`n8QaQH?0Q_f;|_1d*-S3~yjFkD<*
z3~AoFVrc{aDxd-H%DX)fpnk`@Sh(mp5D-v#$`3xXg96pQhkynM?9T$$z+(MceNi+J
zaR!uC!4ZTlj0WgDYI}%+LyvObhsmL`dO#HdjARUijW7}nEW(51QL+^qjuBhqckdu@
z?1Eu<hF5TD2c~VPKpAom=n$JuRG<yomu=!q-m)Ce!>2`_i6I3Rp!q$>gJh-z-mnV=
z+mj}-hY<#oYDWSi-oT>FTT7me59VU1=0Xk!0|k#cQ{y=T^vMQ5Kb}k|1E??3V}w?i
z#akBSaWr6iqyx+K@H_=)DvvS{1a1M8fkDXt&=}+f#2_4v@I`iv=nfKis{+~$c-UTr
zGyu{aFbEesR3rNy3^8cmf@}Z-U=mR!XakFafeikw0fRIE5<T$X!k&~EfHeokP{t6l
zZ3y$IEO0$M#C7uE&og+dVvG#9tN}x(QD&OL@EAcfFaq66^VdHgJ(;7kc=$Yn2H<jq
z{yYFF#DfzBYXAoadXx<qcs7?VH%<Y#Og7*_=9rO0Od=jrJ6<QD0Z|+FB3==mjREKb
zmu-JtJ+!jToko$hx$c?7=rqR`ae7$vN$jlvv2Nd&`QwG;$dMyQjvP61(9l=&A6kTj
zaJ-%P_-uP(NEnvO86{u@8xkJbpAc47{nEwe-27ZvDvBk9#ZpME4UgF)`xC;F9fac5
z^4NgbMY4hLaK{E@4H8Rq5XzVPbMy0a<%M#Qk0=6-QC#^!sKT1CH0Uo!kuN&1EK@RI
ziU!VKzA#rVm1g;f*;1)Icj5BX;{0LxO)Innfg$K$UKR~Rk=z4OBpiJC(xvmW<#LIS
zD3!~z=PzBl%vLb7JR|7~qexi0MYQ;pLp(l=TH@hK)$4Vs2Y?n14vWR8C}e@K7>PWf
zCGt=~mH`zmlzFneAm@lLz`z%RfiEJFM^t44Rk41(t4jvzZvzS3Sg1zTg&XYQHx?p^
z*TqIv$v`!d>JJxj7Yc)<t`FtDL%H!~1O}onIfcMS0uMPF_R&I<KT$Rp&;Xn1aphD_
z)X3u3RJ6XEQT5jHt!i|WR+zzu;X*O0R+~}t2B+@^kkx8bTwpYg*59QxfvelNz)kC0
z{;GPbd8_)>GN~|&#|!`itl5+dG@CF=xkNBtf9Jo#(ccnA+}Bh$mzS4UmLu4fmv5ec
z#}pO8B#DY#6Nb?wgf=i*f6p+WgQ$qx^G#^K2%4yQ`|FeN)ey+2*}NH2G~ny-X0r)%
zBnqpyDgJYL`CT1Z!6z5Ezeat_sBoUHKZ}Psx&RgyXc{mNB*t(KM~m<5@;d;?>+|qr
zj=%l&=*iW8ES{wSK;E8*Cm)d`M~)mha^%R7BgbDBZN!Hb!DA$jm)LH1I^9l3vXE_0
zh-fsvf&Dj)#tHfM>gsBHyl41cr_<?iJVbQ6-7E)fHl*Lb)A&|>+ql#3)BK&a24d|F
z&9{5K_0{z@Y`q>;MSHb(2*F`b?gQvVt^q(lDEt=m(GL0$um(HOPx7F@i`shnb-Ic%
z4}eY}9jbO`wfEg>M;c+BRWLwCfU57o!M{QO_mskZUprjW{wN3S^|tD+_XfT7E{LTJ
zbX6Cm_Xb_n;SBV?>vG*Qih%a{uE!W~)E!U=n{r44GT-jN(CiFgjCa65XZ_teVE)4V
z=ne)0eC>3*q=8PG>z#1~=+`Ap!Rb2=j-vnI_;KJJ$!h~750&c-)V-^xSer1Q{~Zjp
zC-0`p=yuxovJ7-|Q%&KA`#<6|1p_!mf4u(#$@gIh^+|pt2^0);@zVki`3}SDn0xoy
z_f}T!@&@j%tgK+vG~+-6D_{43KYmB?eb7(x6M=U*18v=YcRP1=6O*~7-M-iEf<oRv
zTN_{#mG6TA;aBQ>A9{e}wL(Y|I!Dm@R$=G^m??}0!E>b}^+0E39L5OjJAKiBz+;)c
z)$V$CwKsk@t$$<yvOS%IdJo{Zu6&|~450>03;4eO@V^iF-)aQr8+fpM8}x&LE~gL9
z!_fS!fi@)A2bjgg^8ikwF5|$rk_4U!Cvf=FPe1((+mI=Ib-g>#k99JY<C(0ZAM~jd
zGt`3zoq=>Q0eQId;K4YRO&ds(;qp*0kUV-ceDo;c3_#0h0|WYM1<qtJ3E*_R+NBJ%
z+XGYv2E`u0GYJGz;|%q~_+T9juU`FmI2`_b^(yT^7d|q;WO=xX0UkyWWf17z13=ag
z>OxG9EI}Jkl7UAceY8J`0e!6r*Gk+KCpzdI$3TzP|Nad0SOcRh#EkOxpgYR4@(|Kx
zaC2ZdL<8&`7#m>bfSv^KVA@B|KsZwmcmtSWI$3FSfM;{s06Kt;KMxGG0Zu<&0rhZ_
z!euAJ<M>)<nonmTZGbIbO&WnS04ZMj<@Q#qr8mC#Ha9*G`SroN@QIV}o=J?JWM}xf
zI_opL%pc=3|6hDrAV-cIIdbI4@qdlR)Oyi09Bz4DZEWJ-IR~2?9REw=x^D6d$1Alc
z+}7j}0r?wyhuR!R$$yQi9EWqcu?gxFXk;90Y>n@Zv&A`B+}_wyqK80jZEUj+8hs76
zh2@9@?^fU@`rZZ!#k+4o@gw~#IVnSMfb!PX?g+!kxr2+Vq=5uvL-E1m`Ns+607%nx
zZFs;7Epic#Z^?JZnSYG_Sp#bhc#sW%dS{I`kSHs0pV%9g{(0I!q5`mHCxQN%0EllT
zN%DlR{|V3-#Tw|N1IYmD?^6bXB*7aexdHw~yOkvGHe=wnEZAWW1j=fW&D^r<tt9LI
zL`kb|a|V96|Kt5ee@!y5)^FS=7Uz|Ey75&1QT`MCC;9r_pRn<CLrn~f-Vp{io_f%U
zeEm<{#Cy8I8gOuU`*IKXI8lg*?aghxuM+eC-a$#f`x7>|H;)+5@1_kr-P{5LVh<$V
z*5*_8V?7G<eaV1cGGGHN+kRqC-5ly@{bK_RwiM14xd+B!j6U4S1}0$?z(61xfK+Qw
zO^>(GEi3oHB#Z>g^Zkc>0T2DdFbY->JbU~sAn*R9`9pBUYvS2szW&G0CSfFou5y26
zSMD(2(XSA~1#Hzv;JSFLF#<aTT6HL+AuL?A8c=v$2pEEX*#J0T`OQY7Zq^$OYJzIs
zG#mAXX>vR|fHFh_jZI0vl9o<KJhwEgMh$GXOty)Uuea(_7nqH$ECX8&@otW%HlSn!
z60b%E#0GACPy;YMfEOkS8jwdwt1cVJ(vP!*cd%`mE!8s3cTZx+<w5_ptREe03l6gN
zXE{KDtiCM%82U3D42PNe#h}v~Ft;=HgM;nt+sfw1kt0Wr96562AYdXsv<M!i`J1UX
zmN%D{mUtc_o&%&RkUz5)sO_XLk|cSN?$kJb3BmEGKaOMB00x|qgO{&%cXnSSFJQk*
zDXi`8rs-~qyH_vC5|Wp%`u$XL@H|c-;`!eDQT%6s{-vE4yUFg0opgtAP}|*EN_UZC
z9lU(?A~t_drIoexcQfwCXJVkXl&YFGP*cVdVF39ZFt9`OfW3Hk@A>Yo)C0io?VgE&
zT58l(%>e@ryc+4d3P-#iLL`qs1C_Wh^*}$aoRtCmA5ac^KpDoA0nNks+1(*|#NP9G
zuad@+fjF(~#b+`H4C6N(=QxQ$+i&_mbeZO10PUnCkJtkkFv|H_V1^hN^*)s!#l!%|
z$LUTQ^E@JzhfsP_ZO6jl9ANo4PGiA<p1$%BnuMJRlH~OtuM_@z+S(iaV0kV5^&fl%
zf4rWAodx1#KaJD<B<A`3bf4!{oT@bCX)Gay5Fy}nNDdD6<NbpJt_zS)1s)v;_H+QY
z(P=b_g{KDx=|1l0D&ly|$3hoy2Ol@!G<Z`>4`LM`q_sCRzYiUxpo{it9`)@X#4M@H
zh_Q?_!rq%i8%W;Jd3p~VAivM>064fNCi%S@)^S#-y@9rcjY~6GJa947dv8N(G2elw
z1(c0LgiZ8WJaAe1(ZSh`A+?w6>FqT9u`0=tBgcEg{{RwT8oxGNS>6Bu002ovPDHLk
FV1jOWcPsz^

literal 0
HcmV?d00001

diff --git a/mods/unathi/_unathi.dme b/mods/unathi/_unathi.dme
index 011dd4d4a6d20..d67b58248ab74 100644
--- a/mods/unathi/_unathi.dme
+++ b/mods/unathi/_unathi.dme
@@ -6,6 +6,7 @@
 // Далее просто включай свой код
 // #include "code/something.dm"
 
+#include "code/aura.dm"
 #include "code/reagents.dm"
 #include "code/species.dm"
 #include "code/species_attack.dm"
diff --git a/mods/unathi/code/aura.dm b/mods/unathi/code/aura.dm
new file mode 100644
index 0000000000000..01297fe8fb4f4
--- /dev/null
+++ b/mods/unathi/code/aura.dm
@@ -0,0 +1,3 @@
+/obj/aura/regenerating/human/unathi/toggle()
+	..()
+	toggle_blocked_until = max(world.time + 2 MINUTES, toggle_blocked_until)

From e1b3d2b4226bac4c7b447901d3a197f7473da207 Mon Sep 17 00:00:00 2001
From: UEDCommander <aleksgroza@mail.ru>
Date: Sat, 3 Feb 2024 12:53:01 +0300
Subject: [PATCH 06/12] Fixes for dress icons

---
 mods/loadout_items/code/uniforms.dm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mods/loadout_items/code/uniforms.dm b/mods/loadout_items/code/uniforms.dm
index 9597cdd5dea99..347a22f779158 100644
--- a/mods/loadout_items/code/uniforms.dm
+++ b/mods/loadout_items/code/uniforms.dm
@@ -249,6 +249,7 @@
 	item_icons = list(slot_w_uniform_str = 'mods/loadout_items/icons/onmob_under.dmi')
 	icon_state = "gotsis_dress_1"
 	item_state = "gotsis_dress_1"
+	worn_state = "gotsis_dress_1"
 	sprite_sheets = list(
 		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_under_unathi.dmi'
 	)
@@ -260,6 +261,7 @@
 	item_icons = list(slot_w_uniform_str = 'mods/loadout_items/icons/onmob_under.dmi')
 	icon_state = "gotsis_dress_2"
 	item_state = "gotsis_dress_2"
+	worn_state = "gotsis_dress_2"
 	sprite_sheets = list(
 		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_under_unathi.dmi'
 	)
@@ -452,6 +454,7 @@
 	item_icons = list(slot_w_uniform_str = 'mods/loadout_items/icons/onmob_under.dmi')
 	icon_state = "victorian_dress"
 	item_state = "victorian_dress"
+	worn_state = "victorian_dress"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	sprite_sheets = list(
 		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_under_unathi.dmi'
@@ -462,6 +465,7 @@
 	desc = "A victorian style dress, fancy!"
 	icon_state = "victorian_reddress"
 	item_state = "victorian_reddress"
+	worn_state = "victorian_reddress"
 
 // Victorian Suits. Vampire fangs not included
 
@@ -485,3 +489,8 @@
 	name = "dark victorian suit"
 	icon_state = "victorian_twilight"
 	item_state = "victorian_twilight"
+
+/obj/item/clothing/under/rank/adjutant
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_under_unathi.dmi'
+	)

From e6f740f521072bb58ad857ef87f134cecd24551e Mon Sep 17 00:00:00 2001
From: UEDCommander <aleksgroza@mail.ru>
Date: Sat, 3 Feb 2024 13:02:26 +0300
Subject: [PATCH 07/12] Forgot this

---
 code/game/objects/auras/regenerating_aura.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/auras/regenerating_aura.dm b/code/game/objects/auras/regenerating_aura.dm
index f05befa367b7a..7c73efc017364 100644
--- a/code/game/objects/auras/regenerating_aura.dm
+++ b/code/game/objects/auras/regenerating_aura.dm
@@ -122,7 +122,9 @@
 /obj/aura/regenerating/human/unathi/can_toggle()
 	// [SIERRA-EDIT] - UNATHI - Механ с инфинити
 	// return FALSE // SIERRA-EDIT - ORIGINAL
-	return TRUE
+	if(world.time < toggle_blocked_until)
+		return FALSE
+	return ..()
 	// [/SIERRA-EDIT]
 
 // Default return; we're just logging.

From 09cb67d090eb72261da6a0e9afc07f285a4a1aa9 Mon Sep 17 00:00:00 2001
From: UEDCommander <aleksgroza@mail.ru>
Date: Sat, 3 Feb 2024 15:26:01 +0300
Subject: [PATCH 08/12] Rollback

---
 code/game/objects/auras/regenerating_aura.dm | 7 +------
 mods/unathi/_unathi.dme                      | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/code/game/objects/auras/regenerating_aura.dm b/code/game/objects/auras/regenerating_aura.dm
index 7c73efc017364..58a35ab1ebd0b 100644
--- a/code/game/objects/auras/regenerating_aura.dm
+++ b/code/game/objects/auras/regenerating_aura.dm
@@ -120,12 +120,7 @@
 	var/toggle_blocked_until = 0 // A time
 
 /obj/aura/regenerating/human/unathi/can_toggle()
-	// [SIERRA-EDIT] - UNATHI - Механ с инфинити
-	// return FALSE // SIERRA-EDIT - ORIGINAL
-	if(world.time < toggle_blocked_until)
-		return FALSE
-	return ..()
-	// [/SIERRA-EDIT]
+	return FALSE
 
 // Default return; we're just logging.
 /obj/aura/regenerating/human/unathi/aura_check_weapon(obj/item/weapon, mob/attacker, click_params)
diff --git a/mods/unathi/_unathi.dme b/mods/unathi/_unathi.dme
index d67b58248ab74..011dd4d4a6d20 100644
--- a/mods/unathi/_unathi.dme
+++ b/mods/unathi/_unathi.dme
@@ -6,7 +6,6 @@
 // Далее просто включай свой код
 // #include "code/something.dm"
 
-#include "code/aura.dm"
 #include "code/reagents.dm"
 #include "code/species.dm"
 #include "code/species_attack.dm"

From 9b219d24920d862f65b0b1715f27f19dc19e8127 Mon Sep 17 00:00:00 2001
From: UEDCommander <aleksgroza@mail.ru>
Date: Sat, 3 Feb 2024 15:27:12 +0300
Subject: [PATCH 09/12] Readme update

---
 mods/unathi/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mods/unathi/README.md b/mods/unathi/README.md
index f5d262d037dd8..c7def3de21fbe 100644
--- a/mods/unathi/README.md
+++ b/mods/unathi/README.md
@@ -29,8 +29,7 @@ ID мода: UNATHI
 
 ### Изменения *кор кода*
 
-- `code/game/objects/auras/regenerating_aura.dm`:
-  - `/obj/aura/regenerating/human/unathi/can_toggle()`
+Отсутствуют
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.

From 47c7832c243954976635098f3cea1f70a56e799f Mon Sep 17 00:00:00 2001
From: UEDCommander <52104104+UEDCommander@users.noreply.github.com>
Date: Sat, 3 Feb 2024 15:29:07 +0300
Subject: [PATCH 10/12] Apply suggestions from code review

Co-authored-by: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
---
 mods/unathi/_unathi.dme | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mods/unathi/_unathi.dme b/mods/unathi/_unathi.dme
index 011dd4d4a6d20..8f4697ade7f11 100644
--- a/mods/unathi/_unathi.dme
+++ b/mods/unathi/_unathi.dme
@@ -1,10 +1,8 @@
-#ifndef UNATHI
-#define UNATHI
+#ifndef MODPACK_UNATHI
+#define MODPACK_UNATHI
 
-#include "_unathi.dm"
 
-// Далее просто включай свой код
-// #include "code/something.dm"
+#include "_unathi.dm"
 
 #include "code/reagents.dm"
 #include "code/species.dm"

From 05f73b0dc2912b4e6734a45e08fe536ac9bf0b78 Mon Sep 17 00:00:00 2001
From: UEDCommander <52104104+UEDCommander@users.noreply.github.com>
Date: Mon, 18 Mar 2024 04:45:34 +0300
Subject: [PATCH 11/12] I don't want to talk about this

---
 mods/unathi/code/species.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mods/unathi/code/species.dm b/mods/unathi/code/species.dm
index 736a123b49ba6..cc7f7d8856d08 100644
--- a/mods/unathi/code/species.dm
+++ b/mods/unathi/code/species.dm
@@ -1,3 +1,5 @@
 /datum/species/unathi/yeosa/New()
-	unarmed_types ^= list(/datum/unarmed_attack/bite/venom, /datum/unarmed_attack/bite/venom/yeosa)
+	if (/datum/unarmed_attack/bite/venom in unarmed_types)
+		unarmed_types -= /datum/unarmed_attack/bite/venom
+	unarmed_types += /datum/unarmed_attack/bite/venom/yeosa
 	. = ..()

From f7cd9d0c5d7cdaa90a28b91cbf3c5870924b5386 Mon Sep 17 00:00:00 2001
From: UEDCommander <52104104+UEDCommander@users.noreply.github.com>
Date: Wed, 10 Apr 2024 04:34:54 +0300
Subject: [PATCH 12/12] Update species_attack.dm

There's the define, thanks for nothing staging-sierra
---
 mods/unathi/code/species_attack.dm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mods/unathi/code/species_attack.dm b/mods/unathi/code/species_attack.dm
index c74e0edf49927..cd8737e6dea87 100644
--- a/mods/unathi/code/species_attack.dm
+++ b/mods/unathi/code/species_attack.dm
@@ -1,3 +1,5 @@
+#define VENOM_ON_ATTACK_LOWER_TRESHOLD	0.875
+
 /datum/unarmed_attack/bite/venom/yeosa
 	var/poison_per_bite = 8
 	var/poison_type = /datum/reagent/toxin/yeosvenom
@@ -5,7 +7,7 @@
 	attack_sound = 'sound/weapons/bite.ogg'
 	attack_name = "venomous bite"
 	damage = 1
-	delay = 30
+	delay = 3 SECONDS
 
 /datum/unarmed_attack/bite/venom/yeosa/apply_effects(mob/living/carbon/human/user, mob/living/carbon/human/target, armour, attack_damage, zone)
 	..()
@@ -15,9 +17,11 @@
 		if(istype(S) && !length(S.breaches))
 			return
 		if(target.reagents)
-			target.reagents.add_reagent(src.poison_type, rand(0.875 * src.poison_per_bite, src.poison_per_bite))
+			target.reagents.add_reagent(src.poison_type, rand(VENOM_ON_ATTACK_LOWER_TRESHOLD * src.poison_per_bite, src.poison_per_bite))
 			if(prob(src.poison_per_bite))
 				to_chat(H, SPAN_WARNING("You feel a tiny prick."))
 
 /datum/unarmed_attack/bite/venom/yeosa/get_damage_type()
 	return DAMAGE_BRUTE
+
+#undef VENOM_ON_ATTACK_LOWER_TRESHOLD