From c526b9c29a95b487f4762e16795c502cebb9ca03 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 3 May 2014 21:09:55 +0930 Subject: [PATCH] Lousy goddamn indentation. --- .../reagent_containers/food/drinks.dm | 18 +++++++------- .../reagent_containers/food/snacks.dm | 24 +++++++++---------- .../reagents/reagent_containers/pill.dm | 16 ++++++------- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index f5ad9391f6..d09acc8e15 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) @@ -42,10 +42,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 7d8eca5676..89abf284c5 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 1cdcf8cc49..2ada558367 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -22,10 +22,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 @@ -38,10 +38,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)