From e24422c59082794c3e53bf08b15a5654763d7487 Mon Sep 17 00:00:00 2001
From: xDanilcusx <xDanilcusx@gmail.com>
Date: Mon, 2 Dec 2024 23:46:04 +0300
Subject: [PATCH 1/2] ascent

---
 mods/_fd/ascent/README.md              | 10 ++++---
 mods/_fd/ascent/_ascent.dme            |  1 +
 mods/_fd/ascent/code/ascent_species.dm | 37 +++++++++++++++++++++++++-
 mods/_fd/ascent/code/yummy_organs.dm   | 32 ++++++++++++++++++++++
 4 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 mods/_fd/ascent/code/yummy_organs.dm

diff --git a/mods/_fd/ascent/README.md b/mods/_fd/ascent/README.md
index 7121747dc5c65..462a33a24eaa7 100644
--- a/mods/_fd/ascent/README.md
+++ b/mods/_fd/ascent/README.md
@@ -1,7 +1,7 @@
 
 #### Список PRов:
 
-- Отсутствуют
+- https://github.com/RepoStash/FD-NewBay/pull/67
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание
@@ -33,7 +33,8 @@ ID мода: ASCENT
   - `/datum/reagent/toxin/bromide/affect_ingest()`
   - `/datum/reagent/toxin/methyl_bromide/affect_touch()`
   - `/datum/reagent/toxin/methyl_bromide/affect_ingest()`
-
+- `code/yummy_organs.dm`:
+  - `/obj/item/reagent_containers/food/snacks/organ/use_before()`
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.
@@ -79,8 +80,9 @@ ID мода: ASCENT
 
 ### Авторы:
 
-Unknown
->https://github.com/Baystation12/Baystation12/commit/b5b3f37e9c15a8ac69be658187c1d5a79df85a34
+Danilcus
+>Unknown
+https://github.com/Baystation12/Baystation12/commit/b5b3f37e9c15a8ac69be658187c1d5a79df85a34
 <!--
   Здесь находится твой никнейм
   Если работал совместно - никнеймы тех, кто помогал.
diff --git a/mods/_fd/ascent/_ascent.dme b/mods/_fd/ascent/_ascent.dme
index fdc3522545e38..306168b3b0c4a 100644
--- a/mods/_fd/ascent/_ascent.dme
+++ b/mods/_fd/ascent/_ascent.dme
@@ -29,6 +29,7 @@
 #include "code/culture_ascent.dm"
 #include "code/location_ascent.dm"
 #include "code/religion_ascent.dm"
+#include "code/yummy_organs.dm"
 #include "code/~ascent.dm"
 
 #endif
diff --git a/mods/_fd/ascent/code/ascent_species.dm b/mods/_fd/ascent/code/ascent_species.dm
index fd02a821d3bf7..f5928e54a37f3 100644
--- a/mods/_fd/ascent/code/ascent_species.dm
+++ b/mods/_fd/ascent/code/ascent_species.dm
@@ -104,6 +104,18 @@
 		/datum/mob_descriptor/body_length = -2
 		)
 
+	default_emotes = list(
+		/singleton/emote/audible/ascent_hiss,
+		/singleton/emote/audible/ascent_purr,
+		/singleton/emote/audible/ascent_snarl,
+		/singleton/emote/visible/ascent_dazzle,
+		/singleton/emote/visible/ascent_flicker,
+		/singleton/emote/visible/ascent_glimmer,
+		/singleton/emote/visible/ascent_glint,
+		/singleton/emote/visible/ascent_pulse,
+		/singleton/emote/visible/ascent_shine,
+	)
+
 	pain_emotes_with_pain_level = list(
 			list(/singleton/emote/visible/ascent_shine, /singleton/emote/visible/ascent_dazzle) = 80,
 			list(/singleton/emote/visible/ascent_glimmer, /singleton/emote/visible/ascent_pulse) = 50,
@@ -254,6 +266,18 @@
 		TAG_RELIGION =  RELIGION_KHARMAANI
 	)
 
+	default_emotes = list(
+		/singleton/emote/audible/ascent_hiss,
+		/singleton/emote/audible/ascent_purr,
+		/singleton/emote/audible/ascent_snarl,
+		/singleton/emote/visible/ascent_dazzle,
+		/singleton/emote/visible/ascent_flicker,
+		/singleton/emote/visible/ascent_glimmer,
+		/singleton/emote/visible/ascent_glint,
+		/singleton/emote/visible/ascent_pulse,
+		/singleton/emote/visible/ascent_shine,
+	)
+
 /datum/species/nabber/monarch_worker/skills_from_age(age)
 	. = 0
 
@@ -323,7 +347,6 @@
 		/datum/mob_descriptor/body_length = -1
 		)
 
-
 	force_cultural_info = list(
 		TAG_CULTURE =   CULTURE_ASCENT,
 		TAG_HOMEWORLD = HOME_SYSTEM_KHARMAANI,
@@ -331,6 +354,18 @@
 		TAG_RELIGION =  RELIGION_KHARMAANI
 		)
 
+	default_emotes = list(
+		/singleton/emote/audible/ascent_hiss,
+		/singleton/emote/audible/ascent_purr,
+		/singleton/emote/audible/ascent_snarl,
+		/singleton/emote/visible/ascent_dazzle,
+		/singleton/emote/visible/ascent_flicker,
+		/singleton/emote/visible/ascent_glimmer,
+		/singleton/emote/visible/ascent_glint,
+		/singleton/emote/visible/ascent_pulse,
+		/singleton/emote/visible/ascent_shine,
+	)
+
 /datum/species/nabber/monarch_queen/New()
 	equip_adjust = list(
 		slot_belt_str = list(
diff --git a/mods/_fd/ascent/code/yummy_organs.dm b/mods/_fd/ascent/code/yummy_organs.dm
new file mode 100644
index 0000000000000..2a06746f49634
--- /dev/null
+++ b/mods/_fd/ascent/code/yummy_organs.dm
@@ -0,0 +1,32 @@
+/obj/item/reagent_containers/food/snacks/organ/use_before(mob/M as mob, mob/user as mob)
+	if (!istype(M, /mob/living/carbon))
+		return FALSE
+	if (!reagents || !reagents.total_volume)
+		to_chat(user, SPAN_DANGER("None of [src] left!"))
+		qdel(src)
+		return TRUE
+	if (!is_open_container())
+		to_chat(user, SPAN_NOTICE("\The [src] isn't open!"))
+		return TRUE
+
+	var/mob/living/carbon/C = M
+	var/fullness = C.get_fullness()
+	if(istype(C,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = M
+		if(!H.check_has_mouth())
+			to_chat(user, "Where do you intend to put \the [src]? You don't have a mouth!")
+			return TRUE
+		var/obj/item/blocked = H.check_mouth_coverage()
+		if(blocked)
+			to_chat(user, SPAN_WARNING("\The [blocked] is in the way!"))
+			return TRUE
+
+	if(fullness > 550)
+		user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)//puts a limit on how fast people can eat/drink things
+		to_chat(C, SPAN_DANGER("You cannot force any more of [src] to go down your throat."))
+		return TRUE
+
+	if(is_type_in_list(M, ALL_ASCENT_SPECIES))
+		reagents.del_reagent(/datum/reagent/toxin)
+
+	return ..()

From 2b16ed1c43f389c5ea258f7e4ab903ec6172f357 Mon Sep 17 00:00:00 2001
From: xDanilcusx <xDanilcusx@gmail.com>
Date: Wed, 4 Dec 2024 19:40:40 +0300
Subject: [PATCH 2/2] MS(Q) cannot speak shinese

---
 mods/_fd/ascent/code/ascent_species.dm | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/mods/_fd/ascent/code/ascent_species.dm b/mods/_fd/ascent/code/ascent_species.dm
index f5928e54a37f3..17d434ade4a21 100644
--- a/mods/_fd/ascent/code/ascent_species.dm
+++ b/mods/_fd/ascent/code/ascent_species.dm
@@ -270,12 +270,6 @@
 		/singleton/emote/audible/ascent_hiss,
 		/singleton/emote/audible/ascent_purr,
 		/singleton/emote/audible/ascent_snarl,
-		/singleton/emote/visible/ascent_dazzle,
-		/singleton/emote/visible/ascent_flicker,
-		/singleton/emote/visible/ascent_glimmer,
-		/singleton/emote/visible/ascent_glint,
-		/singleton/emote/visible/ascent_pulse,
-		/singleton/emote/visible/ascent_shine,
 	)
 
 /datum/species/nabber/monarch_worker/skills_from_age(age)
@@ -358,12 +352,6 @@
 		/singleton/emote/audible/ascent_hiss,
 		/singleton/emote/audible/ascent_purr,
 		/singleton/emote/audible/ascent_snarl,
-		/singleton/emote/visible/ascent_dazzle,
-		/singleton/emote/visible/ascent_flicker,
-		/singleton/emote/visible/ascent_glimmer,
-		/singleton/emote/visible/ascent_glint,
-		/singleton/emote/visible/ascent_pulse,
-		/singleton/emote/visible/ascent_shine,
 	)
 
 /datum/species/nabber/monarch_queen/New()