Fixing conflicts

code/__DEFINES/food.dm

@@ -0,0 +1,11 @@
+#define MEAT 1
+#define VEGETABLES 2
+#define RAW 4
+#define JUNKFOOD 8
+#define GRAIN 16
+#define FRUIT 32
+#define DAIRY 64
+#define FRIED 128
+#define ALCOHOL 256
+#define GROSS 512
+#define TOXIC 1024

code/_onclick/hud/alert.dm

@@ -166,6 +166,21 @@
 	desc = "You're severely malnourished. The hunger pains make moving around a chore."
 	icon_state = "starving"
 
+/obj/screen/alert/gross
+	name = "Grossed out."
+	desc = "That was kind of gross..."
+	icon_state = "gross"
+
+/obj/screen/alert/verygross
+	name = "Very grossed out."
+	desc = "I'm not feeling very well.."
+	icon_state = "gross2"
+
+/obj/screen/alert/disgusted
+	name = "DISGUSTED"
+	desc = "ABSOLUTELY DISGUSTIN'"
+	icon_state = "gross3"
+
 /obj/screen/alert/hot
 	name = "Too Hot"
 	desc = "You're flaming hot! Get somewhere cooler and take off any insulating clothing like a fire suit."

code/game/objects/effects/spawners/lootdrop.dm

@@ -46,7 +46,7 @@
 			/obj/item/trash/cheesie = 1,
 			/obj/item/trash/candy = 1,
 			/obj/item/trash/chips = 1,
-			/obj/item/trash/deadmouse = 1,
+			/obj/item/weapon/reagent_containers/food/snacks/deadmouse = 1,
 			/obj/item/trash/pistachios = 1,
 			/obj/item/trash/plate = 1,
 			/obj/item/trash/popcorn = 1,

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -548,6 +548,24 @@
 	beakers += B1
 	beakers += B2
 
+/obj/item/weapon/grenade/chem_grenade/pukonium
+	name = "pukonium grenade"
+	desc = "Filled with some of the most rancid stuff ever, will probably make anyone within a mile of it dry heave."
+	stage = READY
+
+/obj/item/weapon/grenade/chem_grenade/pukonium/New()
+	..()
+	var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
+	var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
+
+	B1.reagents.add_reagent("pukonium", 60)
+	B1.reagents.add_reagent("potassium", 40)
+	B2.reagents.add_reagent("phosphorus", 40)
+	B2.reagents.add_reagent("sugar", 40)
+
+	beakers += B1
+	beakers += B2
+
 #undef EMPTY
 #undef WIRED
 #undef READY

code/modules/food_and_drinks/food/snacks_other.dm

@@ -161,6 +161,7 @@
 	trash = /obj/item/trash/plate
 	list_reagents = list("minttoxin" = 1)
 	filling_color = "#800000"
+	foodtype = TOXIC
 
 /obj/item/weapon/reagent_containers/food/snacks/eggwrap
 	name = "egg wrap"

code/modules/hydroponics/grown/mushrooms.dm

@@ -25,6 +25,7 @@
 
 
 
+
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi
 	seed = /obj/item/seeds/reishi
 	name = "reishi"

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

@@ -225,6 +225,13 @@
 		else
 			msg += "[t_He] [t_is] quite chubby.\n"
 
+	if(disgust >= DISGUST_LEVEL_DISGUSTED)
+		msg += "[t_He] looks disgusted.\n"
+	else if(disgust >= DISGUST_LEVEL_VERYGROSS)
+		msg += "[t_He] looks really grossed out.\n"
+	else if(disgust >= DISGUST_LEVEL_GROSS)
+		msg += "[t_He] looks a bit grossed out.\n"
+
 	if(blood_volume < BLOOD_VOLUME_SAFE)
 		msg += "[t_He] [t_has] pale skin.\n"
 

code/modules/mob/living/carbon/status_procs.dm

@@ -63,6 +63,43 @@
 		clear_fullscreen("high")
 		clear_alert("high")
 
+/mob/living/carbon/adjust_disgust(amount)
+	var/old_disgust = disgust
+	if(amount>0)
+		disgust = min(disgust+amount, DISGUST_LEVEL_MAXEDOUT)
+		switch(disgust)
+			if(0 to DISGUST_LEVEL_GROSS)
+				clear_alert("disgust")
+			if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS)
+				throw_alert("disgust", /obj/screen/alert/gross)
+			if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED)
+				throw_alert("disgust", /obj/screen/alert/verygross)
+			if(DISGUST_LEVEL_DISGUSTED to INFINITY)
+				throw_alert("disgust", /obj/screen/alert/disgusted)
+
+	else if(old_disgust)
+		disgust = max(disgust+amount, 0)
+		switch(disgust)
+			if(0 to DISGUST_LEVEL_GROSS)
+				clear_alert("disgust")
+			if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS)
+				throw_alert("disgust", /obj/screen/alert/gross)
+			if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED)
+				throw_alert("disgust", /obj/screen/alert/verygross)
+			if(DISGUST_LEVEL_DISGUSTED to INFINITY)
+				throw_alert("disgust", /obj/screen/alert/disgusted)
+
+/mob/living/carbon/set_disgust(amount)
+	disgust = amount
+	switch(disgust)
+		if(0 to DISGUST_LEVEL_GROSS)
+			clear_alert("disgust")
+		if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS)
+			throw_alert("disgust", /obj/screen/alert/gross)
+		if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED)
+			throw_alert("disgust", /obj/screen/alert/verygross)
+		if(DISGUST_LEVEL_DISGUSTED to INFINITY)
+			throw_alert("disgust", /obj/screen/alert/disgusted)
 
 /mob/living/carbon/cure_blind()
 	if(disabilities & BLIND)

code/modules/mob/living/death.dm

@@ -61,6 +61,7 @@
 	if(!gibbed)
 		GLOB.dead_mob_list += src
 	set_drugginess(0)
+	set_disgust(0)
 	SetSleeping(0, 0)
 	blind_eyes(1)
 	reset_perspective(null)

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -42,7 +42,7 @@
 /mob/living/simple_animal/mouse/death(gibbed, toast)
 	if(!ckey)
 		..(1)
-		var/obj/item/trash/deadmouse/M = new(src.loc)
+		var/obj/item/weapon/reagent_containers/food/snacks/deadmouse/M = new(src.loc)
 		M.icon_state = icon_dead
 		M.name = name
 		if(toast)
@@ -100,8 +100,12 @@
 	response_harm   = "splats"
 	gold_core_spawnable = 0
 
-/obj/item/trash/deadmouse
+/obj/item/weapon/reagent_containers/food/snacks/deadmouse
 	name = "dead mouse"
-	desc = "It looks like somebody dropped the bass on it."
+	desc = "It looks like somebody dropped the bass on it. A lizard's favorite meal."
 	icon = 'icons/mob/animal.dmi'
 	icon_state = "mouse_gray_dead"
+	bitesize = 3
+	eatverb = "devours"
+	list_reagents = list("nutriment" = 3, "vitamin" = 2)
+	foodtype = GROSS | MEAT | RAW

code/modules/mob/mob_defines.dm

@@ -46,6 +46,7 @@
 	var/cultslurring = 0	//Carbon
 	var/real_name = null
 	var/druggy = 0			//Carbon
+	var/disgust = 0 		//Carbon
 	var/confused = 0		//Carbon
 	var/resting = 0			//Carbon
 	var/lying = 0

code/modules/mob/status_procs.dm

@@ -219,6 +219,14 @@
 /mob/proc/set_drugginess(amount)
 	return
 
+/////////////////////////////////// GROSSED OUT ////////////////////////////////////
+
+/mob/proc/adjust_disgust(amount)
+	return
+
+/mob/proc/set_disgust(amount)
+	return
+
 /////////////////////////////////// BLIND DISABILITY ////////////////////////////////////
 
 /mob/proc/cure_blind() //when we want to cure the BLIND disability only.

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -52,6 +52,7 @@
 	M.SetUnconscious(0, 0)
 	M.silent = 0
 	M.dizziness = 0
+	M.disgust = 0
 	M.drowsyness = 0
 	M.stuttering = 0
 	M.slurring = 0

code/modules/surgery/organs/organ_internal.dm

@@ -74,6 +74,7 @@
 	icon_state = "appendix"
 	icon = 'icons/obj/surgery.dmi'
 	list_reagents = list("nutriment" = 5)
+	foodtype = RAW | MEAT | GROSS
 
 
 /obj/item/organ/Destroy()