diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index b5fa85548be..ece8538d6ee 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -3,6 +3,12 @@
// Data from the seeds carry over to these grown foods
// ***********************************************************
+// A few defines for use in calculating our plant's bite size.
+/// When calculating bite size, potency is multiplied by this number.
+#define BITE_SIZE_POTENCY_MULTIPLIER 0.05
+/// When calculating bite size, max_volume is multiplied by this number.
+#define BITE_SIZE_VOLUME_MULTIPLIER 0.01
+
// Base type. Subtypes are found in /grown dir. Lavaland-based subtypes can be found in mining/ash_flora.dm
/obj/item/food/grown
icon = 'icons/obj/hydroponics/harvest.dmi'
@@ -13,8 +19,8 @@
var/obj/item/seeds/seed = null
///Name of the plant
var/plantname = ""
- /// If set, bitesize = 1 + round(reagents.total_volume / bite_consumption_mod)
- var/bite_consumption_mod = 0
+ /// The modifier applied to the plant's bite size. If a plant has a large amount of reagents naturally, this should be increased to match.
+ var/bite_consumption_mod = 1
///the splat it makes when it splats lol
var/splat_type = /obj/effect/decal/cleanable/food/plant_smudge
@@ -49,6 +55,11 @@
for(var/datum/plant_gene/trait/trait in seed.genes)
trait.on_new_plant(src, loc)
+ // Set our default bitesize: bite size = 1 + (potency * 0.05) * (max_volume * 0.01) * modifier
+ // A 100 potency, non-densified plant = 1 + (5 * 1 * modifier) = 6u bite size
+ // For reference, your average 100 potency tomato has 14u of reagents - So, with no modifier it is eaten in 3 bites
+ bite_consumption = 1 + round(max((seed.potency * BITE_SIZE_POTENCY_MULTIPLIER), 1) * (max_volume * BITE_SIZE_VOLUME_MULTIPLIER) * bite_consumption_mod)
+
. = ..() //Only call it here because we want all the genes and shit to be applied before we add edibility. God this code is a mess.
seed.prepare_result(src)
@@ -63,7 +74,7 @@
eat_time = eat_time,\
tastes = tastes,\
eatverbs = eatverbs,\
- bite_consumption = bite_consumption_mod ? 1 + round(max_volume / bite_consumption_mod) : bite_consumption,\
+ bite_consumption = bite_consumption,\
microwaved_type = microwaved_type,\
junkiness = junkiness)
@@ -105,3 +116,6 @@
juice_results[juice_results[i]] = nutriment
reagents.del_reagent(/datum/reagent/consumable/nutriment)
reagents.del_reagent(/datum/reagent/consumable/nutriment/vitamin)
+
+#undef BITE_SIZE_POTENCY_MULTIPLIER
+#undef BITE_SIZE_VOLUME_MULTIPLIER
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index ea2b72fb19c..87a0536a54f 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -5,7 +5,7 @@
desc = "This is a plant."
icon_state = "ambrosiavulgaris"
slot_flags = ITEM_SLOT_HEAD
- bite_consumption_mod = 2
+ bite_consumption_mod = 3
foodtypes = VEGETABLES
tastes = list("ambrosia" = 1)
diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm
index 4df82ad56e6..9cd7881a408 100644
--- a/code/modules/hydroponics/grown/apple.dm
+++ b/code/modules/hydroponics/grown/apple.dm
@@ -21,7 +21,7 @@
name = "apple"
desc = "It's a little piece of Eden."
icon_state = "apple"
- bite_consumption = 100 // Always eat the apple in one bite
+ bite_consumption_mod = 100 // Always eat apples in one bite
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/applejuice = 0)
tastes = list("apple" = 1)
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index dead8131949..b07cf3318c6 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -23,7 +23,7 @@
icon_state = "banana"
inhand_icon_state = "banana"
trash_type = /obj/item/grown/bananapeel
- bite_consumption = 5
+ bite_consumption_mod = 3
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/banana = 0)
distill_reagent = /datum/reagent/consumable/ethanol/bananahonk
diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm
index 57db631a444..2778a81d708 100644
--- a/code/modules/hydroponics/grown/beans.dm
+++ b/code/modules/hydroponics/grown/beans.dm
@@ -23,7 +23,6 @@
desc = "It's pretty bland, but oh the possibilities..."
gender = PLURAL
icon_state = "soybeans"
- bite_consumption_mod = 2
foodtypes = VEGETABLES
grind_results = list(/datum/reagent/consumable/soymilk = 0)
tastes = list("soy" = 1)
@@ -47,7 +46,6 @@
name = "koibean"
desc = "Something about these seems fishy."
icon_state = "koibeans"
- bite_consumption_mod = 2
foodtypes = VEGETABLES
tastes = list("koi" = 1)
wine_power = 40
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index 5af275ea535..c9848a1fa5b 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -24,7 +24,6 @@
desc = "Nutritious!"
icon_state = "berrypile"
gender = PLURAL
- bite_consumption_mod = 2
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/berryjuice = 0)
tastes = list("berry" = 1)
@@ -47,6 +46,7 @@
name = "bunch of poison-berries"
desc = "Taste so good, you might die!"
icon_state = "poisonberrypile"
+ bite_consumption_mod = 3
foodtypes = FRUIT | TOXIC
juice_results = list(/datum/reagent/consumable/poisonberryjuice = 0)
tastes = list("poison-berry" = 1)
@@ -72,6 +72,7 @@
name = "bunch of death-berries"
desc = "Taste so good, you will die!"
icon_state = "deathberrypile"
+ bite_consumption_mod = 3
foodtypes = FRUIT | TOXIC
tastes = list("death-berry" = 1)
distill_reagent = null
@@ -97,6 +98,7 @@
seed = /obj/item/seeds/berry/glow
name = "bunch of glow-berries"
desc = "Nutritious!"
+ bite_consumption_mod = 3
icon_state = "glowberrypile"
foodtypes = FRUIT
tastes = list("glow-berry" = 1)
@@ -234,5 +236,6 @@
seed = /obj/item/seeds/grape/green
name = "bunch of green grapes"
icon_state = "greengrapes"
+ bite_consumption_mod = 3
tastes = list("green grape" = 1)
distill_reagent = /datum/reagent/consumable/ethanol/cognac
diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index 874f4c0ebe1..63540f379f8 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -88,7 +88,7 @@
name = "cannabis leaf"
desc = "Recently legalized in most galaxies."
icon_state = "cannabis"
- bite_consumption_mod = 2
+ bite_consumption_mod = 4
foodtypes = VEGETABLES //i dont really know what else weed could be to be honest
tastes = list("cannabis" = 1)
wine_power = 20
@@ -119,5 +119,6 @@
name = "omega cannabis leaf"
desc = "You feel dizzy looking at it. What the fuck?"
icon_state = "ocannabis"
+ bite_consumption_mod = 2 // Ingesting like 40 units of drugs in 1 bite at 100 potency
max_volume = 420
wine_power = 90
diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm
index c4f952f58fd..88573a6ca83 100644
--- a/code/modules/hydroponics/grown/cereals.dm
+++ b/code/modules/hydroponics/grown/cereals.dm
@@ -20,7 +20,7 @@
desc = "Sigh... wheat... a-grain?"
gender = PLURAL
icon_state = "wheat"
- bite_consumption_mod = 2
+ bite_consumption_mod = 0.5 // Chewing on wheat grains?
foodtypes = GRAIN
grind_results = list(/datum/reagent/consumable/flour = 0)
tastes = list("wheat" = 1)
@@ -42,7 +42,7 @@
desc = "Eat oats, do squats."
gender = PLURAL
icon_state = "oat"
- bite_consumption_mod = 2
+ bite_consumption_mod = 0.5
foodtypes = GRAIN
grind_results = list(/datum/reagent/consumable/flour = 0)
tastes = list("oat" = 1)
@@ -66,7 +66,7 @@
desc = "Rice to meet you."
gender = PLURAL
icon_state = "rice"
- bite_consumption_mod = 2
+ bite_consumption_mod = 0.5
foodtypes = GRAIN
grind_results = list(/datum/reagent/consumable/rice = 0)
tastes = list("rice" = 1)
@@ -87,7 +87,7 @@
desc = "Some blood-drenched wheat stalks. You can crush them into what passes for meat if you squint hard enough."
icon_state = "meatwheat"
gender = PLURAL
- bite_consumption_mod = 2
+ bite_consumption_mod = 0.5
seed = /obj/item/seeds/wheat/meat
foodtypes = MEAT | GRAIN
grind_results = list(/datum/reagent/consumable/flour = 0, /datum/reagent/blood = 0)
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index 4cd516ec59d..ea213f35b67 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -50,7 +50,7 @@
name = "chilly pepper"
desc = "It's a mutant strain of chili."
icon_state = "icepepper"
- bite_consumption_mod = 2
+ bite_consumption_mod = 5
foodtypes = FRUIT
wine_power = 30
@@ -77,8 +77,9 @@
name = "ghost chili"
desc = "It seems to be vibrating gently."
icon_state = "ghostchilipepper"
+ bite_consumption_mod = 5
var/mob/living/carbon/human/held_mob
- bite_consumption_mod = 4
+ bite_consumption_mod = 2
foodtypes = FRUIT
wine_power = 50
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index 0dfe1b5f5d6..d41cea8fd0e 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -4,7 +4,6 @@
name = "citrus"
desc = "It's so sour, your face will twist."
icon_state = "lime"
- bite_consumption_mod = 2
foodtypes = FRUIT
wine_power = 30
@@ -106,7 +105,6 @@
name = "Combustible Lemon"
desc = "Made for burning houses down."
icon_state = "firelemon"
- bite_consumption_mod = 2
foodtypes = FRUIT
wine_power = 70
@@ -176,6 +174,7 @@
name = "extradimensional orange"
desc = "You can hardly wrap your head around this thing."
icon_state = "orang"
+ bite_consumption_mod = 2
juice_results = list(/datum/reagent/consumable/orangejuice = 0)
distill_reagent = /datum/reagent/toxin/mindbreaker
tastes = list("polygons" = 1, "bluespace" = 1, "the true nature of reality" = 1)
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index 6e1880637c6..f0f89a5674c 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -46,6 +46,7 @@
name = "vanilla pod"
desc = "Fattening... Mmmmm... vanilla."
icon_state = "vanillapod"
+ bite_consumption_mod = 2
foodtypes = FRUIT
tastes = list("vanilla" = 1)
distill_reagent = /datum/reagent/consumable/vanilla //Takes longer, but you can get even more vanilla from it.
@@ -75,6 +76,7 @@
name = "bungo fruit"
desc = "A strange fruit, tough leathery skin protects its juicy flesh and large poisonous seed."
icon_state = "bungo"
+ bite_consumption_mod = 2
trash_type = /obj/item/food/grown/bungopit
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/bungojuice = 0)
@@ -85,6 +87,7 @@
seed = /obj/item/seeds/cocoapod/bungotree
name = "bungo pit"
icon_state = "bungopit"
+ bite_consumption_mod = 5
desc = "A large seed, it is said to be potent enough to be able to stop a mans heart."
w_class = WEIGHT_CLASS_TINY
throwforce = 5
diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm
index f47aa78cd5b..d49a1898319 100644
--- a/code/modules/hydroponics/grown/eggplant.dm
+++ b/code/modules/hydroponics/grown/eggplant.dm
@@ -20,7 +20,6 @@
name = "eggplant"
desc = "Maybe there's a chicken inside?"
icon_state = "eggplant"
- bite_consumption_mod = 2
foodtypes = FRUIT
wine_power = 20
@@ -43,6 +42,5 @@
desc = "There MUST be a chicken inside."
icon_state = "eggyplant"
trash_type = /obj/item/food/egg
- bite_consumption_mod = 2
foodtypes = MEAT
distill_reagent = /datum/reagent/consumable/ethanol/eggnog
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index f2b063fc39e..6e0525fbb46 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -24,7 +24,7 @@
desc = "Long-used as a symbol of rest, peace, and death."
icon_state = "poppy"
slot_flags = ITEM_SLOT_HEAD
- bite_consumption_mod = 3
+ bite_consumption_mod = 2
foodtypes = VEGETABLES | GROSS
distill_reagent = /datum/reagent/consumable/ethanol/vermouth
@@ -80,7 +80,7 @@
name = "spaceman's trumpet"
desc = "A vivid flower that smells faintly of freshly cut grass. Touching the flower seems to stain the skin some time after contact, yet most other surfaces seem to be unaffected by this phenomenon."
icon_state = "spacemanstrumpet"
- bite_consumption_mod = 3
+ bite_consumption_mod = 2
foodtypes = VEGETABLES
// Geranium
@@ -146,7 +146,7 @@
desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten'd not thy breath.\""
icon_state = "harebell"
slot_flags = ITEM_SLOT_HEAD
- bite_consumption_mod = 3
+ bite_consumption_mod = 2
distill_reagent = /datum/reagent/consumable/ethanol/vermouth
// Sunflower
@@ -211,7 +211,6 @@
desc = "Store in a location at least 50 yards away from werewolves."
icon_state = "moonflower"
slot_flags = ITEM_SLOT_HEAD
- bite_consumption_mod = 2
distill_reagent = /datum/reagent/consumable/ethanol/absinthe //It's made from flowers.
// Novaflower
@@ -311,7 +310,7 @@
lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_MASK
- bite_consumption_mod = 3
+ bite_consumption_mod = 2
foodtypes = VEGETABLES | GROSS
/obj/item/food/grown/rose/Initialize(mapload, obj/item/seeds/new_seed)
diff --git a/code/modules/hydroponics/grown/garlic.dm b/code/modules/hydroponics/grown/garlic.dm
index d7861d41369..ea228e09b9d 100644
--- a/code/modules/hydroponics/grown/garlic.dm
+++ b/code/modules/hydroponics/grown/garlic.dm
@@ -16,6 +16,5 @@
name = "garlic"
desc = "Delicious, but with a potentially overwhelming odor."
icon_state = "garlic"
- bite_consumption_mod = 2
tastes = list("garlic" = 1)
wine_power = 10
diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm
index 0a5cc48a234..f92053ec69c 100644
--- a/code/modules/hydroponics/grown/grass_carpet.dm
+++ b/code/modules/hydroponics/grown/grass_carpet.dm
@@ -24,7 +24,7 @@
name = "grass"
desc = "Green and lush."
icon_state = "grassclump"
- bite_consumption_mod = 2
+ bite_consumption_mod = 0.5 // Grazing on grass
var/stacktype = /obj/item/stack/tile/grass
var/tile_coefficient = 0.02 // 1/50
wine_power = 15
@@ -59,6 +59,7 @@
name = "fairygrass"
desc = "Blue, glowing, and smells fainly of mushrooms."
icon_state = "fairygrassclump"
+ bite_consumption_mod = 1
stacktype = /obj/item/stack/tile/fairygrass
// Carpet
diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm
index f5cfe395116..f035d56ed6f 100644
--- a/code/modules/hydroponics/grown/kudzu.dm
+++ b/code/modules/hydroponics/grown/kudzu.dm
@@ -102,7 +102,6 @@
name = "kudzu pod"
desc = "Pueraria Virallis: An invasive species with vines that rapidly creep and wrap around whatever they contact."
icon_state = "kudzupod"
- bite_consumption_mod = 2
foodtypes = VEGETABLES | GROSS
tastes = list("kudzu" = 1)
wine_power = 20
diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm
index c266804d7f8..53903473de1 100644
--- a/code/modules/hydroponics/grown/melon.dm
+++ b/code/modules/hydroponics/grown/melon.dm
@@ -27,8 +27,8 @@
name = "watermelon"
desc = "It's full of watery goodness."
icon_state = "watermelon"
+ bite_consumption_mod = 2
w_class = WEIGHT_CLASS_NORMAL
- bite_consumption_mod = 3
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/watermelonjuice = 0)
wine_power = 40
@@ -58,10 +58,10 @@
name = "holymelon"
desc = "The water within this melon has been blessed by some deity that's particularly fond of watermelon."
icon_state = "holymelon"
+ bite_consumption_mod = 2
wine_power = 70 //Water to wine, baby.
wine_flavor = "divinity"
-
/obj/item/food/grown/holymelon/make_dryable()
return //No drying
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index 1251a0b30c9..159a1dafb8f 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -96,7 +96,7 @@
name = "galaxythistle flower head"
desc = "This spiny cluster of florets reminds you of the highlands."
icon_state = "galaxythistle"
- bite_consumption_mod = 3
+ bite_consumption_mod = 2
foodtypes = VEGETABLES
wine_power = 35
tastes = list("thistle" = 2, "artichoke" = 1)
@@ -127,7 +127,6 @@
name = "cabbage"
desc = "Ewwwwwwwwww. Cabbage."
icon_state = "cabbage"
- bite_consumption_mod = 2
foodtypes = VEGETABLES
wine_power = 20
@@ -206,7 +205,7 @@
desc = "You think you can hear the hissing of a tiny fuse."
icon_state = "cherry_bomb"
seed = /obj/item/seeds/cherry/bomb
- bite_consumption_mod = 2
+ bite_consumption_mod = 3
max_volume = 125 //Gives enough room for the gunpowder at max potency
max_integrity = 40
wine_power = 80
@@ -253,7 +252,7 @@
name = "aloe"
desc = "Cut leaves from the aloe plant."
icon_state = "aloe"
- bite_consumption_mod = 5
+ bite_consumption_mod = 3
foodtypes = VEGETABLES
juice_results = list(/datum/reagent/consumable/aloejuice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/tequila
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 5cebcca4b8b..dfd0a3d3bd9 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -1,6 +1,6 @@
/obj/item/food/grown/mushroom
name = "mushroom"
- bite_consumption_mod = 2
+ bite_consumption_mod = 3
foodtypes = VEGETABLES
wine_power = 40
@@ -31,7 +31,6 @@
desc = "Ganoderma lucidum: A special fungus known for its medicinal and stress relieving properties."
icon_state = "reishi"
-
// Fly Amanita
/obj/item/seeds/amanita
name = "pack of fly amanita mycelium"
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 410a53e42a8..e09899bfc6f 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -37,6 +37,7 @@
desc = "It's probably not wise to touch it with bare hands..."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "nettle"
+ bite_consumption_mod = 2
lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi'
damtype = BURN
@@ -84,6 +85,7 @@
name = "\improper deathnettle"
desc = "The glowing nettle incites rage in you just from looking at it!"
icon_state = "deathnettle"
+ bite_consumption_mod = 4 // I guess if you really wanted to
force = 30
wound_bonus = CANT_WOUND
throwforce = 15
diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm
index b1349d20357..e035e77ea67 100644
--- a/code/modules/hydroponics/grown/onion.dm
+++ b/code/modules/hydroponics/grown/onion.dm
@@ -22,7 +22,6 @@
name = "onion"
desc = "Nothing to cry over."
icon_state = "onion"
- bite_consumption_mod = 2
tastes = list("onions" = 1)
wine_power = 30
diff --git a/code/modules/hydroponics/grown/peas.dm b/code/modules/hydroponics/grown/peas.dm
index 222f379225f..79327beb5ac 100644
--- a/code/modules/hydroponics/grown/peas.dm
+++ b/code/modules/hydroponics/grown/peas.dm
@@ -22,7 +22,6 @@
name = "peapod"
desc = "Finally... peas."
icon_state = "peas"
- bite_consumption_mod = 1
foodtypes = VEGETABLES
tastes = list ("peas" = 1, "chalky saltiness" = 1)
wine_power = 50
@@ -54,7 +53,6 @@
name = "pod of laughin' peas"
desc = "Ridens Cicer, guaranteed to improve your mood dramatically upon consumption!"
icon_state = "laughpeas"
- bite_consumption_mod = 2
foodtypes = VEGETABLES
juice_results = list (/datum/reagent/consumable/laughsyrup = 0)
tastes = list ("a prancing rabbit" = 1) //Vib Ribbon sends her regards.. wherever she is.
@@ -87,7 +85,7 @@
name = "cluster of world peas"
desc = "A plant discovered through extensive genetic engineering, and iterative graft work. It's rumored to bring peace to any who consume it. In the wider AgSci community, it's attained the nickname of 'Pax Mundi'." //at last... world peas. I'm not sorry.
icon_state = "worldpeas"
- bite_consumption_mod = 4
+ bite_consumption_mod = 2
foodtypes = VEGETABLES
tastes = list ("numbing tranquility" = 2, "warmth" = 1)
wine_power = 100
diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm
index ed7dd2061a0..30470df2403 100644
--- a/code/modules/hydroponics/grown/pineapple.dm
+++ b/code/modules/hydroponics/grown/pineapple.dm
@@ -20,6 +20,7 @@
name = "pineapples"
desc = "Blorble."
icon_state = "pineapple"
+ bite_consumption_mod = 2
force = 4
throwforce = 8
hitsound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index e6ccde5dd4e..114b8532384 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -24,7 +24,7 @@
name = "potato"
desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
icon_state = "potato"
- bite_consumption = 100
+ bite_consumption_mod = 100
foodtypes = VEGETABLES
juice_results = list(/datum/reagent/consumable/potato_juice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/vodka
@@ -33,7 +33,7 @@
name = "potato wedges"
desc = "Slices of neatly cut potato."
icon_state = "potato_wedges"
- bite_consumption = 100
+ bite_consumption_mod = 100
/obj/item/food/grown/potato/attackby(obj/item/W, mob/user, params)
diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm
index 75024e6a143..df481072a53 100644
--- a/code/modules/hydroponics/grown/pumpkin.dm
+++ b/code/modules/hydroponics/grown/pumpkin.dm
@@ -52,7 +52,7 @@
name = "blumpkin"
desc = "The pumpkin's toxic sibling."
icon_state = "blumpkin"
- bite_consumption_mod = 2
+ bite_consumption_mod = 3
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/blumpkinjuice = 0)
wine_power = 50
diff --git a/code/modules/hydroponics/grown/random.dm b/code/modules/hydroponics/grown/random.dm
index 821e55d9fb2..498ba2a783e 100644
--- a/code/modules/hydroponics/grown/random.dm
+++ b/code/modules/hydroponics/grown/random.dm
@@ -27,7 +27,6 @@
name = "strange plant"
desc = "What could this even be?"
icon_state = "crunchy"
- bite_consumption_mod = 2
/obj/item/food/grown/random/Initialize()
. = ..()
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index c41574a1e68..c740919af67 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -52,7 +52,6 @@
name = "parsnip"
desc = "Closely related to carrots."
icon_state = "parsnip"
- bite_consumption_mod = 2
foodtypes = VEGETABLES
juice_results = list(/datum/reagent/consumable/parsnipjuice = 0)
wine_power = 35
@@ -80,7 +79,7 @@
name = "white-beet"
desc = "You can't beat white-beet."
icon_state = "whitebeet"
- bite_consumption_mod = 2
+ bite_consumption_mod = 3
foodtypes = VEGETABLES
wine_power = 40
diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm
index f3d4cd6d08a..5b38e97d9db 100644
--- a/code/modules/hydroponics/grown/tea_coffee.dm
+++ b/code/modules/hydroponics/grown/tea_coffee.dm
@@ -40,6 +40,7 @@
seed = /obj/item/seeds/tea/astra
name = "Tea Astra tips"
icon_state = "tea_astra_leaves"
+ bite_consumption_mod = 2
grind_results = list(/datum/reagent/toxin/teapowder = 0, /datum/reagent/medicine/salglu_solution = 0)
@@ -68,7 +69,6 @@
name = "coffee arabica beans"
desc = "Dry them out to make coffee."
icon_state = "coffee_arabica"
- bite_consumption_mod = 2
dry_grind = TRUE
grind_results = list(/datum/reagent/toxin/coffeepowder = 0)
distill_reagent = /datum/reagent/consumable/ethanol/kahlua
diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm
index 372bfaf84aa..285557094ff 100644
--- a/code/modules/hydroponics/grown/tobacco.dm
+++ b/code/modules/hydroponics/grown/tobacco.dm
@@ -39,5 +39,6 @@
name = "space tobacco leaves"
desc = "Dry them out to make some space-smokes."
icon_state = "stobacco_leaves"
+ bite_consumption_mod = 2
distill_reagent = null
wine_power = 50
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index 907c3b7c94e..9b874076677 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -22,7 +22,6 @@
desc = "I say to-mah-to, you say tom-mae-to."
icon_state = "tomato"
splat_type = /obj/effect/decal/cleanable/food/tomato_smudge
- bite_consumption_mod = 2
foodtypes = FRUIT
grind_results = list(/datum/reagent/consumable/ketchup = 0)
juice_results = list(/datum/reagent/consumable/tomatojuice = 0)
@@ -45,6 +44,7 @@
name = "blood-tomato"
desc = "So bloody...so...very...bloody....AHHHH!!!!"
icon_state = "bloodtomato"
+ bite_consumption_mod = 3
splat_type = /obj/effect/gibspawner/generic
foodtypes = FRUIT | GROSS
grind_results = list(/datum/reagent/consumable/ketchup = 0, /datum/reagent/blood = 0)
@@ -71,6 +71,7 @@
name = "blue-tomato"
desc = "I say blue-mah-to, you say blue-mae-to."
icon_state = "bluetomato"
+ bite_consumption_mod = 2
splat_type = /obj/effect/decal/cleanable/oil
distill_reagent = /datum/reagent/consumable/laughter
@@ -94,6 +95,7 @@
name = "\improper bluespace tomato"
desc = "So lubricated, you might slip through space-time."
icon_state = "bluespacetomato"
+ bite_consumption_mod = 3
distill_reagent = null
wine_power = 80
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index e2144de0b3d..94a4e7a714a 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -270,7 +270,6 @@
desc = "A spikey, round cluster of prickly star cacti. And no, it's not called a star cactus because it's in space."
icon_state = "starcactus"
filling_color = "#1c801c"
- bite_consumption_mod = 3
foodtypes = VEGETABLES
distill_reagent = /datum/reagent/consumable/ethanol/tequila