From 2672e10dc4dc8ea262f91b61b84b6620fa5f2c15 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 27 Apr 2019 21:28:06 -0400
Subject: [PATCH] Conflict Resolution
---
code/modules/food/food/snacks.dm | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 3265cf1ada6..909460957f9 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -83,7 +83,6 @@
if (fullness > 150 && fullness <= 350)
to_chat(M, "You take a bite of [src].")
if (fullness > 350 && fullness <= 550)
-<<<<<<< HEAD
M << "You unwillingly chew a bit of [src]."
if (fullness > 550 && fullness <= 650)
M << "You swallow some more of the [src], causing your belly to swell out a little."
@@ -97,11 +96,6 @@
M << "You barely glug down the bite of [src], causing undigested food to force into your intestines. You can't take much more of this!"
if (fullness > 6000) // There has to be a limit eventually.
M << "Your stomach blorts and aches, prompting you to stop. You literally cannot force any more of [src] to go down your throat."
-=======
- to_chat(M, "You unwillingly chew a bit of [src].")
- if (fullness > (550 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat
- to_chat(M, "You cannot force any more of [src] to go down your throat.")
->>>>>>> 8d3a72a... Merge pull request #6129 from Heroman3003/mask-helmet-eating
return 0
/*if (fullness > (550 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat
M << "You cannot force any more of [src] to go down your throat."
@@ -3900,4 +3894,4 @@
. = ..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 4)
- bitesize = 3
\ No newline at end of file
+ bitesize = 3