From ee0245c79ff97c49eef674288b42be5e76b71531 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Sun, 4 Feb 2018 22:07:17 -0600
Subject: [PATCH] [MIRROR] Tomatoes and other foods found to have girl parts;
 removed from vegetable piles (#5226)

* Merge pull request #35122 from CosmicScientist/you-say-tomaetoe-i-say-tomato-youre-wrong

Tomatoes and other foods found to have girl parts; removed from vegetable piles

* Tomatoes and other foods found to have girl parts; removed from vegetable piles
---
 code/modules/food_and_drinks/food/snacks/meat.dm | 8 ++++----
 code/modules/hydroponics/grown/chili.dm          | 6 +++---
 code/modules/hydroponics/grown/cocoa_vanilla.dm  | 4 ++--
 code/modules/hydroponics/grown/pumpkin.dm        | 4 ++--
 code/modules/hydroponics/grown/tomato.dm         | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index 6dcad1d683..7cee86bd38 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -170,7 +170,7 @@
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/killertomato
 	slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/killertomato
 	tastes = list("tomato" = 1)
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/meat/slab/bear
 	name = "bear meat"
@@ -281,7 +281,7 @@
 /obj/item/reagent_containers/food/snacks/meat/steak/killertomato
 	name = "killer tomato steak"
 	tastes = list("tomato" = 1)
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/meat/steak/bear
 	name = "bear steak"
@@ -344,7 +344,7 @@
 	name = "raw killer tomato cutlet"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/killertomato
 	tastes = list("tomato" = 1)
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/meat/rawcutlet/bear
 	name = "raw bear cutlet"
@@ -383,7 +383,7 @@
 /obj/item/reagent_containers/food/snacks/meat/cutlet/killertomato
 	name = "killer tomato cutlet"
 	tastes = list("tomato" = 1)
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/meat/cutlet/bear
 	name = "bear cutlet"
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index 382efa2a26..88cb95dedd 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -25,7 +25,7 @@
 	icon_state = "chilipepper"
 	filling_color = "#FF0000"
 	bitesize_mod = 2
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 
 // Ice Chili
 /obj/item/seeds/chili/ice
@@ -49,7 +49,7 @@
 	icon_state = "icepepper"
 	filling_color = "#0000CD"
 	bitesize_mod = 2
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 
 // Ghost Chili
 /obj/item/seeds/chili/ghost
@@ -75,7 +75,7 @@
 	var/mob/living/carbon/human/held_mob
 	filling_color = "#F8F8FF"
 	bitesize_mod = 4
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user)
 	..()
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index f872758a65..c53709480a 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -25,7 +25,7 @@
 	icon_state = "cocoapod"
 	filling_color = "#FFD700"
 	bitesize_mod = 2
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 
 // Vanilla Pod
 /obj/item/seeds/cocoapod/vanillapod
@@ -45,4 +45,4 @@
 	desc = "Fattening... Mmmmm... vanilla."
 	icon_state = "vanillapod"
 	filling_color = "#FFD700"
-	foodtype = VEGETABLES
+	foodtype = FRUIT
diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm
index 7113a8feab..2b0ffddfe7 100644
--- a/code/modules/hydroponics/grown/pumpkin.dm
+++ b/code/modules/hydroponics/grown/pumpkin.dm
@@ -23,7 +23,7 @@
 	icon_state = "pumpkin"
 	filling_color = "#FFA500"
 	bitesize_mod = 2
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 	juice_results = list("pumpkinjuice" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -54,5 +54,5 @@
 	icon_state = "blumpkin"
 	filling_color = "#87CEFA"
 	bitesize_mod = 2
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 	juice_results = list("blumpkinjuice" = 0)
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index 4d066e769e..0f5b969b3b 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -22,7 +22,7 @@
 	splat_type = /obj/effect/decal/cleanable/tomato_smudge
 	filling_color = "#FF6347"
 	bitesize_mod = 2
-	foodtype = VEGETABLES
+	foodtype = FRUIT
 	grind_results = list("ketchup" = 0)
 	juice_results = list("tomatojuice" = 0)
 
@@ -45,7 +45,7 @@
 	icon_state = "bloodtomato"
 	splat_type = /obj/effect/gibspawner/generic
 	filling_color = "#FF0000"
-	foodtype = VEGETABLES | GROSS
+	foodtype = FRUIT | GROSS
 	grind_results = list("ketchup" = 0, "blood" = 0)