[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
This commit is contained in:
CitadelStationBot
2018-02-04 22:07:17 -06:00
committed by Poojawa
parent dc06d0373c
commit ee0245c79f
5 changed files with 13 additions and 13 deletions
@@ -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"
+3 -3
View File
@@ -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)
..()
@@ -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
+2 -2
View File
@@ -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)
+2 -2
View File
@@ -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)