From e985f8eaca6cfaf6b6b4bfdc0c961f5797322142 Mon Sep 17 00:00:00 2001
From: Lexanx <61974560+Lexanx@users.noreply.github.com>
Date: Wed, 6 Mar 2024 23:05:56 +0300
Subject: [PATCH 1/2] head pats

---
 code/modules/species/species.dm   |  6 +++---
 mods/emote_panel/README.md        |  2 +-
 mods/emote_panel/_emote_panel.dme |  1 +
 mods/emote_panel/code/species.dm  | 26 ++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 mods/emote_panel/code/species.dm

diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm
index baa537ad3e5f9..9e3bfe0c1f699 100644
--- a/code/modules/species/species.dm
+++ b/code/modules/species/species.dm
@@ -330,7 +330,7 @@ The slots that you can use are found in items_clothing.dm and are the inventory
 		else if(!LAZYLEN(available_cultural_info[token]))
 			var/list/map_systems = GLOB.using_map.available_cultural_info[token]
 			available_cultural_info[token] = map_systems.Copy()
-			
+
 		// [SIERRA-ADD] - EXPANDED_CULTURE_DESCRIPTOR - Вносит культуры из мода в список культур после всех возможных альтераций, чтобы предотвратить конфликты при добавлении оффами новых культур
 		if(extended_cultural_info[token])
 			available_cultural_info[token] |= extended_cultural_info[token]
@@ -431,7 +431,7 @@ The slots that you can use are found in items_clothing.dm and are the inventory
 		post_organ_rejuvenate(O, H)
 
 	H.sync_organ_dna()
-
+/* ------------------------> code\modules\emotes\definitions\_species.dm
 /datum/species/proc/hug(mob/living/carbon/human/H,mob/living/target)
 
 	var/t_him = "them"
@@ -447,7 +447,7 @@ The slots that you can use are found in items_clothing.dm and are the inventory
 	if(H != target)
 		H.update_personal_goal(/datum/goal/achievement/givehug, TRUE)
 		target.update_personal_goal(/datum/goal/achievement/gethug, TRUE)
-
+*/
 /datum/species/proc/add_base_auras(mob/living/carbon/human/H)
 	if(base_auras)
 		for(var/type in base_auras)
diff --git a/mods/emote_panel/README.md b/mods/emote_panel/README.md
index 9803bc1469749..6041df6f1cfde 100644
--- a/mods/emote_panel/README.md
+++ b/mods/emote_panel/README.md
@@ -28,7 +28,7 @@ ID мода: EMOTE_PANEL
 
 ### Изменения *кор кода*
 
-- Отсутствуют
+- `code\modules\species\species.dm` : `/datum/species/proc/hug(mob/living/carbon/human/H,mob/living/target)`
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.
diff --git a/mods/emote_panel/_emote_panel.dme b/mods/emote_panel/_emote_panel.dme
index f958213fd751b..eb593545ef9d9 100644
--- a/mods/emote_panel/_emote_panel.dme
+++ b/mods/emote_panel/_emote_panel.dme
@@ -7,6 +7,7 @@
 #include "code/overrides.dm"
 // #include "code/pain.dm" // SIERRA TODO: Use it
 #include "code/silicon.dm"
+#include "code\species.dm"
 #include "code/unathi.dm"
 
 #endif
diff --git a/mods/emote_panel/code/species.dm b/mods/emote_panel/code/species.dm
new file mode 100644
index 0000000000000..13cde85b8eb57
--- /dev/null
+++ b/mods/emote_panel/code/species.dm
@@ -0,0 +1,26 @@
+/datum/species/proc/hug(mob/living/carbon/human/H, mob/living/target)
+
+	var/t_him = "them"
+	var/obj/item/organ/external/affecting
+	if(ishuman(target))
+		var/mob/living/carbon/human/T = target
+		affecting = T.get_organ(H.zone_sel.selecting)
+		switch(target.gender)
+			if(MALE)
+				t_him = "him"
+			if(FEMALE)
+				t_him = "her"
+	if(H.zone_sel.selecting == "head")
+		H.visible_message( \
+			"<span class='notice'>[H] pats [target] on the head.</span>", \
+			"<span class='notice'>You pat [target] on the head.</span>", )
+	else if((H.zone_sel.selecting == "r_hand" || H.zone_sel.selecting == "l_hand") && (affecting && !affecting.is_stump()))
+		H.visible_message( \
+			"<span class='notice'>[H] shakes [target]'s hand.</span>", \
+			"<span class='notice'>You shake [target]'s hand.</span>", )
+	else H.visible_message("<span class='notice'>[H] hugs [target] to make [t_him] feel better!</span>", \
+				"<span class='notice'>You hug [target] to make [t_him] feel better!</span>")
+
+	if(H != target)
+		H.update_personal_goal(/datum/goal/achievement/givehug, TRUE)
+		target.update_personal_goal(/datum/goal/achievement/gethug, TRUE)

From dfb92b4df4328a19b5d5538e78954644045cab6d Mon Sep 17 00:00:00 2001
From: Lexanx <61974560+Lexanx@users.noreply.github.com>
Date: Thu, 7 Mar 2024 11:35:13 +0300
Subject: [PATCH 2/2] it

---
 mods/emote_panel/README.md       | 3 ++-
 mods/emote_panel/code/species.dm | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mods/emote_panel/README.md b/mods/emote_panel/README.md
index 6041df6f1cfde..9cb12d9866181 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/1927
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание
@@ -70,7 +71,7 @@ ID мода: EMOTE_PANEL
 
 ### Авторы:
 
-SuhEugene, LordNest
+SuhEugene, LordNest, Lexanx
 <!--
   Здесь находится твой никнейм
   Если работал совместно - никнеймы тех, кто помогал.
diff --git a/mods/emote_panel/code/species.dm b/mods/emote_panel/code/species.dm
index 13cde85b8eb57..2d71182bd6e4e 100644
--- a/mods/emote_panel/code/species.dm
+++ b/mods/emote_panel/code/species.dm
@@ -10,6 +10,8 @@
 				t_him = "him"
 			if(FEMALE)
 				t_him = "her"
+			if(NEUTER)
+				t_him = "it"
 	if(H.zone_sel.selecting == "head")
 		H.visible_message( \
 			"<span class='notice'>[H] pats [target] on the head.</span>", \