cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes: alien udders and empty grilled carp (#6592)

Browse Source
This commit is contained in:
Alberyk
2019-06-19 22:35:09 +02:00
committed by Werner
parent a33141023d
commit 66fefa0eaf
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/simple_animal.dm
+6 -4
View File
@@ -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/))