Merge pull request #13374 from BlueWildrose/slimepersondiets

Slimepeople diet preference changes

code/__DEFINES/food.dm

@@ -12,6 +12,7 @@
 #define TOXIC 		(1<<11)
 #define PINEAPPLE	(1<<12)
 #define BREAKFAST	(1<<13)
+#define ANTITOXIC 	(1<<14)
 
 #define DRINK_NICE	1
 #define DRINK_GOOD	2

code/modules/food_and_drinks/food/snacks_cake.dm

@@ -133,7 +133,7 @@
 	slices_num = 5
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
 	tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
-	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
+	foodtype = GRAIN | DAIRY | FRUIT | SUGAR | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/cakeslice/lime
 	name = "lime cake slice"
@@ -141,7 +141,7 @@
 	icon_state = "limecake_slice"
 	filling_color = "#00FF00"
 	tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
-	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
+	foodtype = GRAIN | DAIRY | FRUIT | SUGAR | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/store/cake/lemon
 	name = "lemon cake"

code/modules/food_and_drinks/food/snacks_frozen.dm

@@ -103,7 +103,7 @@
 	icon_state = "lime_sc"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/limejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "limes" = 5)
-	foodtype = FRUIT
+	foodtype = FRUIT | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/snowcones/lemon
 	name = "lemon snowcone"
@@ -191,7 +191,7 @@
 	icon_state = "fruitsalad_sc"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/limejuice = 5, /datum/reagent/consumable/orangejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "limes" = 5, "lemons" = 5, "citrus" = 5, "salad" = 5)
-	foodtype = FRUIT
+	foodtype = FRUIT | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/snowcones/pineapple
 	name = "pineapple snowcone"

code/modules/food_and_drinks/food/snacks_other.dm

@@ -232,7 +232,7 @@
 	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2) //lollipop, but vitamins = toxins
 	filling_color = "#00800"
 	tastes = list("cobwebs" = 1, "sugar" = 2)
-	foodtype = JUNKFOOD | SUGAR
+	foodtype = JUNKFOOD | SUGAR | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/tobiko
 	name = "tobiko"
@@ -451,7 +451,7 @@
 	var/mutable_appearance/head
 	var/headcolor = rgb(0, 0, 0)
 	tastes = list("candy" = 1)
-	foodtype = JUNKFOOD | SUGAR
+	foodtype = JUNKFOOD | SUGAR | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/lollipop/Initialize()
 	. = ..()
@@ -756,4 +756,4 @@
 	bitesize = 2
 	name = "hot-cross bun"
 	desc = "The Cross represents the Assistants that died for your sins."
-	icon_state = "hotcrossbun"
+	icon_state = "hotcrossbun"

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -509,7 +509,7 @@
 	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/omnizine = 3)
 	cooked_type = null
 	tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
-	foodtype = GRAIN
+	foodtype = GRAIN | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/dankpocket
 	name = "\improper Dank-pocket"
@@ -556,9 +556,11 @@
 		name = "exceptional plump helmet biscuit"
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
 		bonus_reagents = list(/datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+		foodtype += ANTITOXIC
 	. = ..()
 	if(fey)
 		reagents.add_reagent(/datum/reagent/medicine/omnizine, 5)
+		foodtype += ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/cracker
 	name = "cracker"

code/modules/food_and_drinks/food/snacks_pie.dm

@@ -171,8 +171,10 @@
 		name = "exceptional plump pie"
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
 		bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
+		foodtype += ANTITOXIC
 	if(fey)
 		reagents.add_reagent(/datum/reagent/medicine/omnizine, 5)
+		foodtype += ANTITOXIC
 
 
 /obj/item/reagent_containers/food/snacks/pie/xemeatpie

code/modules/food_and_drinks/food/snacks_pizza.dm

@@ -109,7 +109,7 @@
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
-	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
+	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket
 	name = "donkpocket pizza slice"
@@ -117,7 +117,7 @@
 	icon_state = "donkpocketpizzaslice"
 	filling_color = "#FFA500"
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
-	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
+	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/pizza/dank
 	name = "dank pizza"
@@ -127,7 +127,7 @@
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
 	list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
-	foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
+	foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/pizzaslice/dank
 	name = "dank pizza slice"
@@ -135,7 +135,7 @@
 	icon_state = "dankpizzaslice"
 	filling_color = "#2E8B57"
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
-	foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
+	foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/pizza/sassysage
 	name = "sassysage pizza"
@@ -187,6 +187,7 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/arnold
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
+	
 
 /obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm
 	var/obj/item/bodypart/l_arm = user.get_bodypart(BODY_ZONE_L_ARM)
@@ -244,4 +245,4 @@
 	icon_state = "meatpizzaslice"
 	filling_color = "#A52A2A"
 	tastes = list("cardboard" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2)
-	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT
+	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT

code/modules/food_and_drinks/food/snacks_salad.dm

@@ -20,7 +20,7 @@
 	bonus_reagents = list(/datum/reagent/medicine/omnizine = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
 	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/medicine/omnizine = 8, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("leaves" = 1)
-	foodtype = VEGETABLES
+	foodtype = VEGETABLES | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/salad/herbsalad
 	name = "herb salad"
@@ -38,7 +38,7 @@
 	bonus_reagents = list(/datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1)
-	foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT
+	foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/salad/oatmeal
 	name = "oatmeal"
@@ -133,7 +133,7 @@
 	trash = /obj/item/reagent_containers/glass/bowl
 	list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/medicine/earthsblood = 3, /datum/reagent/medicine/omnizine = 5, /datum/reagent/drug/happiness = 2)
 	tastes = list("hope" = 1)
-	foodtype = VEGETABLES
+	foodtype = VEGETABLES | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/salad/gumbo
 	name = "black eyed gumbo"

code/modules/food_and_drinks/food/snacks_soup.dm

@@ -89,7 +89,7 @@
 	icon_state = "nettlesoup"
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("nettles" = 1)
-	foodtype = VEGETABLES
+	foodtype = VEGETABLES | ANTITOXIC
 
 /obj/item/reagent_containers/food/snacks/soup/mystery
 	name = "mystery soup"

code/modules/food_and_drinks/food/snacks_vend.dm

@@ -89,7 +89,7 @@
 	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/doctor_delight = 5)
 	filling_color = "#F5F5DC"
 	tastes = list("sweetness" = 3, "cake" = 1)
-	foodtype = GRAIN | FRUIT | VEGETABLES
+	foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC
 	custom_price = PRICE_CHEAP
 
 /obj/item/reagent_containers/food/snacks/energybar

code/modules/hydroponics/grown/ambrosia.dm

@@ -49,6 +49,7 @@
 	seed = /obj/item/seeds/ambrosia/deus
 	name = "ambrosia deus branch"
 	desc = "Eating this makes you feel immortal!"
+	foodtype = VEGETABLES | ANTITOXIC
 	icon_state = "ambrosiadeus"
 	filling_color = "#008B8B"
 	wine_power = 50

code/modules/hydroponics/grown/cannabis.dm

@@ -104,6 +104,7 @@
 	seed = /obj/item/seeds/cannabis/death
 	name = "death cannabis leaf"
 	desc = "Looks a bit dark. Oh well."
+	foodtype = VEGETABLES | TOXIC
 	icon_state = "blackcannabis"
 	wine_power = 40
 
@@ -111,6 +112,7 @@
 	seed = /obj/item/seeds/cannabis/white
 	name = "white cannabis leaf"
 	desc = "It feels smooth and nice to the touch."
+	foodtype = VEGETABLES | ANTITOXIC
 	icon_state = "whitecannabis"
 	wine_power = 10
 

code/modules/hydroponics/grown/citrus.dm

@@ -29,6 +29,7 @@
 	seed = /obj/item/seeds/lime
 	name = "lime"
 	desc = "It's so sour, your face will twist."
+	foodtype = FRUIT | ANTITOXIC
 	icon_state = "lime"
 	filling_color = "#00FF00"
 	juice_results = list(/datum/reagent/consumable/limejuice = 0)

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -18,7 +18,8 @@
 	var/datum/action/innate/regenerate_limbs/regenerate_limbs
 	var/datum/action/innate/slime_change/slime_change	//CIT CHANGE
 	liked_food = TOXIC | MEAT
-	toxic_food = null
+	disliked_food = null
+	toxic_food = ANTITOXIC
 	coldmod = 6   // = 3x cold damage
 	heatmod = 0.5 // = 1/4x heat damage
 	burnmod = 0.5 // = 1/2x generic burn damage