mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 21:12:24 +01:00
Bug fixes: alien udders and empty grilled carp (#6592)
This commit is contained in:
@@ -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/))
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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."
|
||||
Reference in New Issue
Block a user