From 6880b29df0d7b48e82b916e29f90c5501687f678 Mon Sep 17 00:00:00 2001
From: Jaraci <57604458+Jaraci@users.noreply.github.com>
Date: Sun, 4 Sep 2022 11:38:20 +0100
Subject: [PATCH] Fixes Diona nymphs producing the wrong meat when butchered
 (#14759)

---
 code/game/objects/structures/kitchen_spike.dm  |  3 ++-
 code/modules/cooking/machinery/gibber.dm       |  3 +++
 code/modules/mob/living/carbon/alien/alien.dm  |  2 +-
 html/changelogs/omicega-dionafixfgdgfdfgdf.yml | 13 +++++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/omicega-dionafixfgdgfdfgdf.yml

diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index 8c9555a0dc1..e422aa5bb23 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -37,7 +37,8 @@
 		meat_type = H.species.meat_type
 		icon_state = "spikebloody"
 	else if(istype(victim, /mob/living/carbon/alien))
-		meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
+		var/mob/living/carbon/alien/A = victim
+		meat_type = A.meat_type
 		icon_state = "spikebloodygreen"
 	else
 		return 0
diff --git a/code/modules/cooking/machinery/gibber.dm b/code/modules/cooking/machinery/gibber.dm
index 6efea814f7e..999088a1e41 100644
--- a/code/modules/cooking/machinery/gibber.dm
+++ b/code/modules/cooking/machinery/gibber.dm
@@ -189,6 +189,9 @@
 			slab_count = critter.meat_amount
 		if(critter.meat_type)
 			slab_type = critter.meat_type
+	else if(istype(occupant, /mob/living/carbon/alien))
+		var/mob/living/carbon/alien/A = occupant
+		slab_type = A.meat_type
 	else if(ishuman(occupant))
 		var/mob/living/carbon/human/H = occupant
 		slab_type = H.species.meat_type
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 99b200d2e15..244b3c195be 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -17,7 +17,7 @@
 	var/language
 	var/death_msg = "lets out a waning guttural screech, green blood bubbling from its maw."
 	var/meat_amount = 0
-	var/meat_type
+	var/meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
 
 /mob/living/carbon/alien/Initialize()
 	. = ..()
diff --git a/html/changelogs/omicega-dionafixfgdgfdfgdf.yml b/html/changelogs/omicega-dionafixfgdgfdfgdf.yml
new file mode 100644
index 00000000000..83fdceee5fc
--- /dev/null
+++ b/html/changelogs/omicega-dionafixfgdgfdfgdf.yml
@@ -0,0 +1,13 @@
+# Your name.
+author: Omicega
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Diona nymphs now produce the correct meat when put in the gibber and on the meat spike."