diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index c67acb3e10..c19c50da2f 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -1593,12 +1593,19 @@ 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 = 'kitchen.dmi' W.icon_state = "forkloaded" if (herp) world << "[user] takes a piece of omelette with his fork!" else viewers(3,user) << "[user] takes a piece of omelette with his fork!" + reagents.remove_reagent("nutriment", 1) + if (reagents.total_volume <= 0) + del(src) + /obj/item/weapon/reagent_containers/food/snacks/omeletteforkload diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 25e15da1ce..9a174ca059 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -22,6 +22,20 @@ KNIFE if(!istype(M, /mob)) return + if (src.icon_state == "forkloaded") //This is a poor way of handling it, but a proper rewrite of the fork to allow for a more varied foodening can happen when I'm in the mood. --NEO + if(M == user) + for(var/mob/O in viewers(M, null)) + O.show_message(text("\blue [] eats a delicious forkful of omelette!", user), 1) + M.reagents.add_reagent("nutriment", 1) + else + for(var/mob/O in viewers(M, null)) + O.show_message(text("\blue [] feeds [] a delicious forkful of omelette!", user, M), 1) + M.reagents.add_reagent("nutriment", 1) + src.icon_state = "fork" + return + + + if((usr.mutations & 16) && prob(50)) M << "\red You stab yourself in the eye." M.sdisabilities |= 1