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;
 

code/modules/mob/living/carbon/human/examine.dm

@@ -393,11 +393,11 @@
 	//GS13 EDIT FAT EXAMINE
 	switch(fullness)
 		if(FULLNESS_LEVEL_BLOATED to FULLNESS_LEVEL_BEEG)
-			. += "[t_He] look[p_s()] like [t_He] ate a bit too much.\n"
+			. += span_warning("[t_He] look[p_s()] like [t_He] ate a bit too much.\n")
 		if(FULLNESS_LEVEL_BEEG to FULLNESS_LEVEL_NOMOREPLZ)
-			. += "[t_His] stomach looks very round and very full.\n"
+			. += span_warning("[t_His] stomach looks very round and very full.\n")
 		if(FULLNESS_LEVEL_NOMOREPLZ to INFINITY)
-			. += "[t_His] stomach has been stretched to enormous proportions.\n"
+			. += span_boldwarning("[t_His] stomach has been stretched to enormous proportions.\n")
 
 	if(nutrition < NUTRITION_LEVEL_STARVING - 50)
 		. += "[t_He] [t_is] severely malnourished.\n"

code/modules/mob/living/carbon/human/species.dm

@@ -1608,8 +1608,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 				H.remove_movespeed_modifier(/datum/movespeed_modifier/hunger)
 
 	switch(H.nutrition)
-		if(NUTRITION_LEVEL_FULL to INFINITY)
-			H.throw_alert("nutrition", /atom/movable/screen/alert/fat)
+		//if(NUTRITION_LEVEL_FULL to INFINITY)
+		//	H.throw_alert("nutrition", /atom/movable/screen/alert/fat)
 		if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FULL)
 			H.clear_alert("nutrition")
 		if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
@@ -1617,6 +1617,22 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		if(0 to NUTRITION_LEVEL_STARVING)
 			H.throw_alert("nutrition", /atom/movable/screen/alert/starving)
 
+	//GS13 Port - Add back the fullness Alerts
+	switch(H.fullness)
+		if(0 to FULLNESS_LEVEL_BLOATED)
+			H.clear_alert("fullness")
+		if(FULLNESS_LEVEL_BLOATED to FULLNESS_LEVEL_BEEG)
+			H.throw_alert("fullness", /atom/movable/screen/alert/gs13/bloated)
+		if(FULLNESS_LEVEL_BEEG to FULLNESS_LEVEL_NOMOREPLZ)
+			H.throw_alert("fullness", /atom/movable/screen/alert/gs13/stuffed)
+		if(FULLNESS_LEVEL_NOMOREPLZ to INFINITY)
+			H.throw_alert("fullness", /atom/movable/screen/alert/gs13/beegbelly)
+
+	//GS13 - Update here for changing belly to match stuffed-ness
+	var/obj/item/organ/genital/belly/B= H.getorganslot("belly")
+	if(!isnull(B) && istype(B))
+		B.update()
+
 	//GS13 EDIT
 	switch(H.fatness)
 		if(FATNESS_LEVEL_BLOB to INFINITY)

code/modules/mob/mob_defines.dm

@@ -78,6 +78,7 @@
 	var/dizziness = 0//Carbon
 	var/jitteriness = 0//Carbon
 	var/nutrition = NUTRITION_LEVEL_START_MIN // randomised in Initialize
+	var/thirst = THIRST_LEVEL_START_MIN	//same for this
 	var/satiety = 0//Carbon
 
 	var/overeatduration = 0		// How long this guy is overeating //Carbon