From 66fefa0eaf4319b5ea8eef4c5f0a0649ef7df55f Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Wed, 19 Jun 2019 17:35:09 -0300
Subject: [PATCH] Bug fixes: alien udders and empty grilled carp (#6592)

---
 code/modules/mob/living/simple_animal/simple_animal.dm | 10 ++++++----
 code/modules/reagents/reagent_containers.dm            |  1 +
 .../modules/reagents/reagent_containers/food/snacks.dm |  3 ++-
 html/changelogs/alberyk-morebugfixes.yml               |  7 +++++++
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 html/changelogs/alberyk-morebugfixes.yml

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 529f20bbd20..bed6c90be56 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -430,12 +430,14 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
 	if(has_udder)
 		var/obj/item/weapon/reagent_containers/glass/G = O
 		if(stat == CONSCIOUS && istype(G) && G.is_open_container())
-			user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
-			var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
+			if(udder.total_volume <= 0)
+				to_chat(user, "<span class='warning'>The udder is dry.</span>")
+				return
 			if(G.reagents.total_volume >= G.volume)
 				to_chat(user, "<span class='warning'>The [O] is full.</span>")
-			if(!transfered)
-				to_chat(user, "<span class='warning'>The udder is dry.</span>")
+				return
+			user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
+			udder.trans_id_to(G, milk_type , rand(5,10))
 			return
 
 	if(istype(O, /obj/item/weapon/reagent_containers) || istype(O, /obj/item/stack/medical) || istype(O,/obj/item/weapon/gripper/))
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 2eee3fc2636..53a9770a7d7 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -189,6 +189,7 @@
 		return 1
 
 	//var/types = target.find_type()
+
 	var/mob/living/carbon/human/H
 	if(istype(target, /mob/living/carbon/human))
 		H = target
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 59daccb83f5..c54804d4471 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -890,7 +890,7 @@
 	reagents.add_reagent("pacid",6)
 
 /obj/item/weapon/reagent_containers/food/snacks/fishfingers
-	name = "fish Fingers"
+	name = "fish fingers"
 	desc = "A finger of fish."
 	icon_state = "fishfingers"
 	filling_color = "#FFDEFE"
@@ -4910,6 +4910,7 @@
 	trash = /obj/item/trash/snacktray
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize()
+	. = ..()
 	reagents.add_reagent("seafood", 12)
 
 /obj/item/weapon/reagent_containers/food/snacks/grilled_carp_slice
diff --git a/html/changelogs/alberyk-morebugfixes.yml b/html/changelogs/alberyk-morebugfixes.yml
new file mode 100644
index 00000000000..4ac19f12d9d
--- /dev/null
+++ b/html/changelogs/alberyk-morebugfixes.yml
@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - bugfix: "Fatshouter should now produce the correct milk."
+  - bugfix: "Fixed the korlaaskak recipe having no reagents."