From c78f98754a29274c25f873705e0f878d48f00a2a Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Sun, 20 Dec 2015 11:46:42 +0100 Subject: [PATCH] Utensils now respect the lack of mouths, and has a delay on feeding others. --- baystation12.dme | 1 - code/game/objects/items/weapons/kitchen.dm | 0 code/game/objects/items/weapons/material/kitchen.dm | 10 ++++++---- 3 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 code/game/objects/items/weapons/kitchen.dm diff --git a/baystation12.dme b/baystation12.dme index d0c5db16f93..52e65189517 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -653,7 +653,6 @@ #include "code\game\objects\items\weapons\gift_wrappaper.dm" #include "code\game\objects\items\weapons\handcuffs.dm" #include "code\game\objects\items\weapons\improvised_components.dm" -#include "code\game\objects\items\weapons\kitchen.dm" #include "code\game\objects\items\weapons\manuals.dm" #include "code\game\objects\items\weapons\mop.dm" #include "code\game\objects\items\weapons\paint.dm" diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 6d0504a195e..5b3f77c7edf 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -34,20 +34,22 @@ else return ..() - if(!M.can_eat(src)) - return - if (reagents.total_volume > 0) reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST) if(M == user) + if(!M.can_eat(loaded)) + return M.visible_message("\The [user] eats some [loaded] from \the [src].") else + user.visible_message("\The [user] begins to feed \the [M]!") + if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS))) + return M.visible_message("\The [user] feeds some [loaded] to \the [M] with \the [src].") playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1) overlays.Cut() return else - user << "You don't have anything on \the [src]." //if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK GODDAMNIT + user << "You don't have anything on \the [src]." //if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK return /obj/item/weapon/material/kitchen/utensil/fork