diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 667860b8f97..25a4fd2f47a 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -28,11 +28,11 @@ if(M == user) - if(istype(M,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(H.species.flags & IS_SYNTHETIC) - H << "\red You have a monitor for a head, where do you think you're going to put that?" - return + if(istype(M,/mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(H.species.flags & IS_SYNTHETIC) + H << "\red You have a monitor for a head, where do you think you're going to put that?" + return M << "\blue You swallow a gulp of [src]." if(reagents.total_volume) @@ -44,10 +44,10 @@ return 1 else if( istype(M, /mob/living/carbon/human) ) - var/mob/living/carbon/human/H = M - if(H.species.flags & IS_SYNTHETIC) - H << "\red They have a monitor for a head, where do you think you're going to put that?" - return + var/mob/living/carbon/human/H = M + if(H.species.flags & IS_SYNTHETIC) + H << "\red They have a monitor for a head, where do you think you're going to put that?" + return for(var/mob/O in viewers(world.view, user)) O.show_message("\red [user] attempts to feed [M] [src].", 1) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index b185ed5621d..3d758ca64a7 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -39,15 +39,13 @@ return 0 if(istype(M, /mob/living/carbon)) + var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25) if(M == user) //If you're eating it yourself - - if(istype(M,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(H.species.flags & IS_SYNTHETIC) - H << "\red You have a monitor for a head, where do you think you're going to put that?" - return - . - var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25) + if(istype(M,/mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(H.species.flags & IS_SYNTHETIC) + H << "\red You have a monitor for a head, where do you think you're going to put that?" + return if (fullness <= 50) M << "\red You hungrily chew out a piece of [src] and gobble it!" if (fullness > 50 && fullness <= 150) @@ -61,13 +59,13 @@ return 0 else if(istype(M,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(H.species.flags & IS_SYNTHETIC) - H << "\red They have a monitor for a head, where do you think you're going to put that?" - return + var/mob/living/carbon/human/H = M + if(H.species.flags & IS_SYNTHETIC) + H << "\red They have a monitor for a head, where do you think you're going to put that?" + return if(!istype(M, /mob/living/carbon/slime)) //If you're feeding it to someone else. - var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25) + if (fullness <= (550 * (1 + M.overeatduration / 1000))) for(var/mob/O in viewers(world.view, user)) O.show_message("\red [user] attempts to feed [M] [src].", 1) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index d2a84bb8bd6..3ad309c6d90 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -21,10 +21,10 @@ if(M == user) if(istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(H.species.flags & IS_SYNTHETIC) - H << "\red You have a monitor for a head, where do you think you're going to put that?" - return + var/mob/living/carbon/human/H = M + if(H.species.flags & IS_SYNTHETIC) + H << "\red You have a monitor for a head, where do you think you're going to put that?" + return M << "\blue You swallow [src]." M.drop_from_inventory(src) //icon update @@ -39,10 +39,10 @@ else if(istype(M, /mob/living/carbon/human) ) - var/mob/living/carbon/human/H = M - if(H.species.flags & IS_SYNTHETIC) - H << "\red They have a monitor for a head, where do you think you're going to put that?" - return + var/mob/living/carbon/human/H = M + if(H.species.flags & IS_SYNTHETIC) + H << "\red They have a monitor for a head, where do you think you're going to put that?" + return for(var/mob/O in viewers(world.view, user)) O.show_message("\red [user] attempts to force [M] to swallow [src].", 1)