Makes forks usable.

This commit is contained in:
Zuhayr
2014-06-22 21:49:55 +09:30
parent b11408e367
commit bb8951a53c
4 changed files with 72 additions and 133 deletions

View File

@@ -127,8 +127,39 @@
..() // -> item/attackby()
if(istype(W,/obj/item/weapon/storage))
..() // -> item/attackby()
if(istype(W,/obj/item/weapon/kitchen/utensil))
var/obj/item/weapon/kitchen/utensil/U = W
if(!U.reagents)
U.create_reagents(5)
if (U.reagents.total_volume > 0)
user << "\red You already have something on your [U]."
return
user.visible_message( \
"[user] scoops up some [src] with \the [U]!", \
"\blue You scoop up some [src] with \the [U]!" \
)
src.bitecount++
U.overlays.Cut()
U.loaded = "[src]"
var/image/I = new(U.icon, "loadedfood")
I.color = src.filling_color
U.overlays += I
reagents.trans_to(U,min(reagents.total_volume,5))
if (reagents.total_volume <= 0)
del(src)
return
if((slices_num <= 0 || !slices_num) || !slice_path)
return 0
var/inaccurate = 0
if( \
istype(W, /obj/item/weapon/kitchenknife) || \
@@ -173,8 +204,8 @@
)
else
user.visible_message( \
"\blue [user] inaccurately slices \the [src] with [W]!", \
"\blue You inaccurately slice \the [src] with your [W]!" \
"\blue [user] crudely slices \the [src] with [W]!", \
"\blue You crudely slice \the [src] with your [W]!" \
)
slices_lost = rand(1,min(1,round(slices_num/2)))
var/reagents_per_slice = reagents.total_volume/slices_num
@@ -182,6 +213,7 @@
var/obj/slice = new slice_path (src.loc)
reagents.trans_to(slice,reagents_per_slice)
del(src)
return
/obj/item/weapon/reagent_containers/food/snacks/Del()
@@ -876,33 +908,6 @@
..()
reagents.add_reagent("nutriment", 8)
bitesize = 1
attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
if (W.icon_state == "forkloaded")
user << "\red You already have omelette on your fork."
return
//W.icon = 'icons/obj/kitchen.dmi'
W.icon_state = "forkloaded"
/*if (herp)
world << "[user] takes a piece of omelette with his fork!"*/
//Why this unecessary check? Oh I know, because I'm bad >:C
// Yes, you are. You griefing my badmin toys. --rastaf0
user.visible_message( \
"[user] takes a piece of omelette with their fork!", \
"\blue You take a piece of omelette with your fork!" \
)
reagents.remove_reagent("nutriment", 1)
if (reagents.total_volume <= 0)
del(src)
/*
* Unsused.
/obj/item/weapon/reagent_containers/food/snacks/omeletteforkload
name = "Omelette Du Fromage"
desc = "That's all you can say!"
New()
..()
reagents.add_reagent("nutriment", 1)
*/
/obj/item/weapon/reagent_containers/food/snacks/muffin
name = "Muffin"