cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes diona and simple_animals eating snacks.

Browse Source
This commit is contained in:
Zuhayr
2014-12-09 22:14:41 +10:30
parent 79fbc2cde9
commit bc394b72d6
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -16,9 +16,7 @@
/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M)
if(!usr) return
if(!reagents.total_volume)
if(M == usr)
usr << "<span class='notice'>You finish eating \the [src].</span>"
M.visible_message("<span class='notice'>[M] finishes eating \the [src].</span>")
M.visible_message("<span class='notice'>[M] finishes eating \the [src].</span>","<span class='notice'>You finish eating \the [src].</span>")
usr.drop_from_inventory(src) //so icons update :[
if(trash)
@@ -194,8 +192,8 @@
del(src)
return
/obj/item/weapon/reagent_containers/food/snacks/proc/is_sliceable()
return (slices_num && slice_path && slices_num > 0)
/obj/item/weapon/reagent_containers/food/snacks/proc/is_sliceable()
return (slices_num && slice_path && slices_num > 0)
/obj/item/weapon/reagent_containers/food/snacks/Del()
if(contents)
@@ -206,24 +204,18 @@
////////////////////////////////////////////////////////////////////////////////
/// FOOD END
////////////////////////////////////////////////////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/attack_generic(var/mob/living/user)
if(isanimal(user) || isalien(user))
if(bitecount == 0 || prob(50))
user.custom_emote(1,"nibbles away at the [src]")
bitecount++
if(reagents && user.reagents)
reagents.trans_to_ingest(user, bitesize)
spawn(5)
if(!src && !user.client)
user.custom_emote(1,"[pick("burps", "cries for more", "burps twice", "looks at the area where the food was")]")
del(src)
On_Consume(user)
if(!isanimal(user) && !isalien(user))
return
user.visible_message("<b>[user]</b> nibbles away at the [src].","You nibble away at the [src].")
bitecount++
if(reagents && user.reagents)
reagents.trans_to_ingest(user, bitesize)
spawn(5)
if(!src && !user.client)
user.custom_emote(1,"[pick("burps", "cries for more", "burps twice", "looks at the area where the food was")]")
del(src)
On_Consume(user)
//////////////////////////////////////////////////
////////////////////////////////////////////Snacks