Initial commit

code/modules/food_and_drinks/drinks/drinks.dm

@@ -46,6 +46,13 @@
 	checkLiked(fraction, M)
 	reagents.reaction(M, INGEST, fraction)
 	reagents.trans_to(M, gulp_size, log = TRUE)
+	//GS13 Port - Fullness
+	if(iscarbon(M))
+		var/mob/living/carbon/human/human_eater = M
+		if(HAS_TRAIT(M, TRAIT_VORACIOUS))
+			human_eater.fullness += min(gulp_size * 0.67, reagents.total_volume * 0.67)
+		else
+			human_eater.fullness += min(gulp_size, reagents.total_volume) // GS13 drinks will fill your stomach
 	playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
 	return TRUE
 

code/modules/food_and_drinks/food/snacks.dm

@@ -114,7 +114,7 @@ All foods are distributed among various categories. Use common sense.
 			return FALSE
 
 		//GS13 EDIT, FULNESS
-		var/fullness = M.nutrition + 10
+		var/fullness = 0
 		//for(var/datum/reagent/consumable/C in M.reagents.reagent_list) //we add the nutrition value of what we're currently digesting
 		//	fullness += C.nutriment_factor * C.volume / C.metabolization_rate
 		//GS13 Edit
@@ -137,6 +137,8 @@ All foods are distributed among various categories. Use common sense.
 			else if(fullness > (FULLNESS_LEVEL_BEEG * (1 + M.overeatduration / 2000)))	// The more you eat - the more you can eat
 				user.visible_message("<span class='warning'>[user] cannot force any more of \the [src] to go down [user.p_their()] throat!</span>", "<span class='danger'>You cannot force any more of \the [src] to go down your throat!</span>")
 				return FALSE
+			if(HAS_TRAIT(M, TRAIT_VORACIOUS))
+				M.SetNextAction(CLICK_CD_MELEE * 0.5) //nom nom nom
 		else
 			if(!isbrain(M))		//If you're feeding it to someone else.
 				if(fullness <= (FULLNESS_LEVEL_BEEG * (1 + M.overeatduration / 1000)))
@@ -164,6 +166,7 @@ All foods are distributed among various categories. Use common sense.
 			var/bitevolume = 1
 			if(HAS_TRAIT(M, TRAIT_VORACIOUS))
 				bitevolume = bitevolume * 0.67
+			human_eater.fullness += bitevolume;
 			if(istype(human_eater))
 				human_eater.fullness += bitevolume;