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("[user] milks [src] using \the [O].") - var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) + if(udder.total_volume <= 0) + to_chat(user, "The udder is dry.") + return if(G.reagents.total_volume >= G.volume) to_chat(user, "The [O] is full.") - if(!transfered) - to_chat(user, "The udder is dry.") + return + user.visible_message("[user] milks [src] using \the [O].") + 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."