From f001077b1a148165c8def6ecabfa7d1f911cbf9b Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Sat, 30 Jan 2016 15:54:39 -0800 Subject: [PATCH] fixes the extraneous line removals hopefully --- code/modules/hydroponics/grown.dm | 197 +++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 7b37ba7f0b8..27f97bb5770 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -102,11 +102,14 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/popcorn filling_color = "#FFFF00" trash = /obj/item/weapon/grown/corncob + /obj/item/weapon/reagent_containers/food/snacks/grown/corn/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + + /obj/item/weapon/reagent_containers/food/snacks/grown/cherries seed = /obj/item/seeds/cherryseed name = "cherries" @@ -114,22 +117,27 @@ icon_state = "cherry" gender = PLURAL filling_color = "#FF0000" + /obj/item/weapon/reagent_containers/food/snacks/grown/cherries/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 15), 1)) reagents.add_reagent("sugar", 1 + round((potency / 15), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries seed = /obj/item/seeds/bluecherryseed name = "blue cherries" desc = "They're cherries that are blue." icon_state = "bluecherry" filling_color = "#6495ED" + /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 15), 1)) reagents.add_reagent("sugar", 1 + round((potency / 50), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + + /obj/item/weapon/reagent_containers/food/snacks/grown/poppy seed = /obj/item/seeds/poppyseed name = "poppy" @@ -137,23 +145,27 @@ icon_state = "poppy" slot_flags = SLOT_HEAD filling_color = "#FF6347" + /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 20), 1)) reagents.add_reagent("salglu_solution", 1 + round((potency / 20), 1)) bitesize = 1 + round(reagents.total_volume / 3, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily seed = /obj/item/seeds/lilyseed name = "lily" desc = "A beautiful orange flower" icon_state = "lily" filling_color = "#FFA500" + /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium seed = /obj/item/seeds/geraniumseed name = "geranium" desc = "A beautiful blue flower" icon_state = "geranium" filling_color = "#008B8B" + /obj/item/weapon/reagent_containers/food/snacks/grown/harebell seed = /obj/item/seeds/harebell name = "harebell" @@ -204,12 +216,14 @@ icon_state = "grapes" dried_type = /obj/item/weapon/reagent_containers/food/snacks/no_raisin filling_color = "#FF1493" + /obj/item/weapon/reagent_containers/food/snacks/grown/grapes/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) reagents.add_reagent("sugar", 1 + round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green seed = /obj/item/seeds/greengrapeseed name = "bunch of green grapes" @@ -217,20 +231,26 @@ icon_state = "greengrapes" dried_type = /obj/item/weapon/reagent_containers/food/snacks/no_raisin filling_color = "#7FFF00" + /obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green/add_juice() ..() reagents.add_reagent("salglu_solution", 3 + round((potency / 5), 1)) + + /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage seed = /obj/item/seeds/cabbageseed name = "cabbage" desc = "Ewwwwwwwwww. Cabbage." icon_state = "cabbage" filling_color = "#90EE90" + /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + + /obj/item/weapon/reagent_containers/food/snacks/grown/berries seed = /obj/item/seeds/berryseed name = "bunch of berries" @@ -238,30 +258,36 @@ icon_state = "berrypile" gender = PLURAL filling_color = "#FF00FF" + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison seed = /obj/item/seeds/poisonberryseed name = "bunch of poison-berries" desc = "Taste so good, you could die!" icon_state = "poisonberrypile" filling_color = "#C71585" + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison/add_juice() ..() reagents.add_reagent("toxin", 3 + round(potency / 5, 1)) + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/death seed = /obj/item/seeds/deathberryseed name = "bunch of death-berries" desc = "Taste so good, you could die!" icon_state = "deathberrypile" filling_color = "#708090" + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/death/add_juice() ..() reagents.add_reagent("toxin", 3 + round(potency / 3, 1)) reagents.add_reagent("lexorin", 1 + round(potency / 5, 1)) + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow seed = /obj/item/seeds/glowberryseed name = "bunch of glow-berries" @@ -270,66 +296,83 @@ var/brightness_on = 2 //luminosity when on icon_state = "glowberrypile" filling_color = "#7CFC00" + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/add_juice() ..() reagents.add_reagent("uranium", 3 + round(potency / 5, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/Destroy() if(istype(loc,/mob)) loc.AddLuminosity(round(-potency / 5,1)) return ..() + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/pickup(mob/user) src.SetLuminosity(0) user.AddLuminosity(round(potency / 5,1)) + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/dropped(mob/user) user.AddLuminosity(round(-potency / 5,1)) src.SetLuminosity(round(potency / 5,1)) + + /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod seed = /obj/item/seeds/cocoapodseed name = "cocoa pod" desc = "Fattening... Mmmmm... chucklate." icon_state = "cocoapod" filling_color = "#FFD700" + /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) reagents.add_reagent("cocoa", 4 + round((potency / 5), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod seed = /obj/item/seeds/vanillapodseed name = "vanilla pod" desc = "Fattening... Mmmmm... vanilla." icon_state = "vanillapod" filling_color = "#FFD700" + /obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) reagents.add_reagent("vanilla", 4 + round((potency / 5), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane seed = /obj/item/seeds/sugarcaneseed name = "sugarcane" desc = "Sickly sweet." icon_state = "sugarcane" filling_color = "#FFD700" + /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane/add_juice() if(..()) reagents.add_reagent("sugar", 4 + round((potency / 5), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia //abstract type name = "ambrosia branch" desc = "This is a plant." icon_state = "ambrosiavulgaris" slot_flags = SLOT_HEAD filling_color = "#008000" + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/add_juice() if(..()) reagents.add_reagent("nutriment", 1) bitesize = 1 + round(reagents.total_volume / 2, 1) + + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris seed = /obj/item/seeds/ambrosiavulgarisseed name = "ambrosia vulgaris branch" desc = "This is a plant containing various healing chemicals." + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris/add_juice() ..() reagents.add_reagent("space_drugs", 1 + round(potency / 8, 1)) @@ -337,51 +380,66 @@ reagents.add_reagent("salglu_solution", 1 + round(potency / 10, 1)) reagents.add_reagent("toxin", 1 + round(potency / 10, 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) + + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus seed = /obj/item/seeds/ambrosiadeusseed name = "ambrosia deus branch" desc = "Eating this makes you feel immortal!" icon_state = "ambrosiadeus" filling_color = "#008B8B" + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus/add_juice() ..() reagents.add_reagent("omnizine", 1 + round(potency / 8, 1)) reagents.add_reagent("synaptizine", 1 + round(potency / 8, 1)) reagents.add_reagent("space_drugs", 1 + round(potency / 10, 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) + + /obj/item/weapon/reagent_containers/food/snacks/grown/apple seed = /obj/item/seeds/appleseed name = "apple" desc = "It's a little piece of Eden." icon_state = "apple" filling_color = "#FF4500" + /obj/item/weapon/reagent_containers/food/snacks/grown/apple/add_juice() if(..()) reagents.maximum_volume = 20 reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = reagents.maximum_volume // Always eat the apple in one + + /obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned seed = /obj/item/seeds/poisonedappleseed name = "apple" desc = "It's a little piece of Eden." icon_state = "apple" + /obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned/add_juice() ..() reagents.add_reagent("cyanide", 1 + round((potency / 5), 1)) + + /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold seed = /obj/item/seeds/goldappleseed name = "golden apple" desc = "Emblazoned upon the apple is the word 'Kallisti'." icon_state = "goldapple" filling_color = "#FFD700" + /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold/add_juice() ..() reagents.add_reagent("gold", 1 + round((potency / 5), 1)) + /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold/attackby(var/obj/item/O as obj, var/mob/user as mob, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Mineral Content: [reagents.get_reagent_amount("gold")]%" + + /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon seed = /obj/item/seeds/watermelonseed name = "watermelon" @@ -392,11 +450,13 @@ dried_type = null w_class = 3 filling_color = "#008000" + /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 6), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/holymelon seed = /obj/item/seeds/holymelonseed name = "holymelon" @@ -404,23 +464,27 @@ icon_state = "holymelon" filling_color = "#FFD700" dried_type = null + /obj/item/weapon/reagent_containers/food/snacks/grown/holymelon/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 15), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) reagents.add_reagent("holywater", 1 + round((potency / 6), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin seed = /obj/item/seeds/pumpkinseed name = "pumpkin" desc = "It's large and scary." icon_state = "pumpkin" filling_color = "#FFA500" + /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 6), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() if(W.is_sharp()) @@ -428,88 +492,105 @@ new /obj/item/clothing/head/hardhat/pumpkinhead (user.loc) qdel(src) return + /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin seed = /obj/item/seeds/blumpkinseed name = "blumpkin" desc = "The pumpkin's toxic sibling." icon_state = "blumpkin" filling_color = "#87CEFA" + /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 6), 1)) reagents.add_reagent("ammonia", 1 + round((potency / 6), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/ //abstract type seed = /obj/item/seeds/limeseed name = "citrus" desc = "It's so sour, your face will twist." icon_state = "lime" + /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 20), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime seed = /obj/item/seeds/limeseed name = "lime" desc = "It's so sour, your face will twist." icon_state = "lime" filling_color = "#00FF00" + /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon seed = /obj/item/seeds/lemonseed name = "lemon" desc = "When life gives you lemons, be grateful they aren't limes." icon_state = "lemon" filling_color = "#FFD700" + /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange seed = /obj/item/seeds/orangeseed name = "orange" desc = "It's an tangy fruit." icon_state = "orange" filling_color = "#FFA500" + + /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet seed = /obj/item/seeds/whitebeetseed name = "white-beet" desc = "You can't beat white-beet." icon_state = "whitebeet" filling_color = "#F4A460" + /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet/add_juice() if(..()) reagents.add_reagent("nutriment", round((potency / 20), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) reagents.add_reagent("sugar", 1 + round((potency / 5), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/sweetpotato seed = /obj/item/seeds/sweetpotatoseed name = "sweet potato" desc = "It's sweet." icon_state = "sweetpotato" + /obj/item/weapon/reagent_containers/food/snacks/grown/sweetpotato/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 10), 1)) reagents.add_reagent("sugar", 1 + round((potency / 10), 1)) bitesize = reagents.total_volume + /obj/item/weapon/reagent_containers/food/snacks/grown/parsnip seed = /obj/item/seeds/parsnipseed name = "parsnip" desc = "Closely related to carrots." icon_state = "parsnip" + /obj/item/weapon/reagent_containers/food/snacks/grown/parsnip/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 20), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 20), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/redbeet seed = /obj/item/seeds/redbeetseed name = "red beet" desc = "You can't beat red beet." icon_state = "redbeet" + /obj/item/weapon/reagent_containers/food/snacks/grown/redbeet/add_juice() if(..()) reagents.add_reagent("nutriment", round((potency / 20), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 20), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/banana seed = /obj/item/seeds/bananaseed name = "banana" @@ -519,12 +600,14 @@ item_state = "banana" trash = /obj/item/weapon/grown/bananapeel filling_color = "#FFFF00" + /obj/item/weapon/reagent_containers/food/snacks/grown/banana/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) reagents.add_reagent("banana", 1 + round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 5 + /obj/item/weapon/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user) user.visible_message("[user] is aiming the [src.name] at themself! It looks like \he's trying to commit suicide.") playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) @@ -533,6 +616,7 @@ sleep(25) user.visible_message("[user] laughs so hard they begin to suffocate!") return (OXYLOSS) + /obj/item/weapon/reagent_containers/food/snacks/grown/mimana seed = /obj/item/seeds/mimanaseed name = "mimana" @@ -540,44 +624,54 @@ icon_state = "mimana" trash = /obj/item/weapon/grown/bananapeel/mimanapeel filling_color = "#FFFFEE" + /obj/item/weapon/reagent_containers/food/snacks/grown/mimana/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) reagents.add_reagent("nothing", 2 + round((potency / 10), 1)) reagents.add_reagent("mutetoxin", 2 + round((potency / 10), 1)) bitesize = 5 + /obj/item/weapon/reagent_containers/food/snacks/grown/chili seed = /obj/item/seeds/chiliseed name = "chili" desc = "It's spicy! Wait... IT'S BURNING ME!!" icon_state = "chilipepper" filling_color = "#FF0000" + /obj/item/weapon/reagent_containers/food/snacks/grown/chili/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 25), 1)) reagents.add_reagent("capsaicin", 3+round(potency / 5, 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/chili/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Capsaicin: [reagents.get_reagent_amount("capsaicin")]%" + + /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper seed = /obj/item/seeds/icepepperseed name = "ice pepper" desc = "It's a mutant strain of chili" icon_state = "icepepper" filling_color = "#0000CD" + /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/add_juice() ..() reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 50), 1)) reagents.add_reagent("frostoil", 3+round(potency / 5, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Frost Oil: [reagents.get_reagent_amount("frostoil")]%" + + /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili seed = /obj/item/seeds/chilighost name = "ghost chili" @@ -585,21 +679,25 @@ icon_state = "ghostchilipepper" var/mob/held_mob filling_color = "#F8F8FF" + /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/add_juice() ..() reagents.add_reagent("nutriment", 1 + round((potency / 25), 1)) reagents.add_reagent("capsaicin", 8+round(potency / 2, 1)) reagents.add_reagent("condensedcapsaicin", 4+round(potency / 4, 1)) bitesize = 1 + round(reagents.total_volume / 4, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Capsaicin: [reagents.get_reagent_amount("capsaicin")]%" + /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user) ..() if( istype(src.loc, /mob) ) held_mob = src.loc SSobj.processing |= src + /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/process() if(held_mob && src.loc == held_mob) if( (held_mob.l_hand == src) || (held_mob.r_hand == src)) @@ -611,24 +709,30 @@ else held_mob = null ..() + /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant seed = /obj/item/seeds/eggplantseed name = "eggplant" desc = "Maybe there's a chicken inside?" icon_state = "eggplant" filling_color = "#800080" + /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + + /obj/item/weapon/reagent_containers/food/snacks/grown/shell/ var/inside_type = null + /obj/item/weapon/reagent_containers/food/snacks/grown/shell/attack_self(mob/user as mob) if(inside_type) new inside_type(user.loc) user.unEquip(src) qdel(src) + obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy seed = /obj/item/seeds/eggyseed name = "Egg-plant" @@ -636,10 +740,13 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy icon_state = "eggyplant" inside_type = /obj/item/weapon/reagent_containers/food/snacks/egg filling_color = "#F8F8FF" + obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() ..() reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + + /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans seed = /obj/item/seeds/soyaseed name = "soybeans" @@ -647,23 +754,27 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() gender = PLURAL icon_state = "soybeans" filling_color = "#F0E68C" + /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 20), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/koibeans seed = /obj/item/seeds/koiseed name = "koibean" desc = "Something about these seems fishy." icon_state = "koibeans" filling_color = "#F0E68C" + /obj/item/weapon/reagent_containers/food/snacks/grown/koibeans/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 30), 1)) reagents.add_reagent("carpotoxin", 1 + round((potency / 20), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/moonflower seed = /obj/item/seeds/moonflowerseed name = "moonflower" @@ -671,12 +782,14 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "moonflower" slot_flags = SLOT_HEAD filling_color = "#E6E6FA" + /obj/item/weapon/reagent_containers/food/snacks/grown/moonflower/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) reagents.add_reagent("moonshine", 1 + round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 50), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + //tomaters /obj/item/weapon/reagent_containers/food/snacks/grown/tomato seed = /obj/item/seeds/tomatoseed @@ -685,21 +798,25 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "tomato" var/splat = /obj/effect/decal/cleanable/tomato_smudge filling_color = "#FF6347" + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/proc/squish(atom/target) var/turf/T = get_turf(target) new splat(T) visible_message("The [src.name] has been squashed.","You hear a smack.") for(var/atom/A in get_turf(target)) reagents.reaction(A) + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/throw_impact(atom/hit_atom) if(!..()) //was it caught by a mob? squish(hit_atom) qdel(src) + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer seed = /obj/item/seeds/killertomatoseed name = "killer-tomato" @@ -707,16 +824,19 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "killertomato" var/awakening = 0 filling_color = "#FF0000" + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone) if(awakening) user << "The tomato is twitching and shaking, preventing you from eating it." return ..() + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user) if(awakening || istype(user.loc,/turf/space)) return user << "You begin to awaken the Killer Tomato..." awakening = 1 + spawn(30) if(!gc_destroyed) var/mob/living/simple_animal/hostile/killertomato/K = new /mob/living/simple_animal/hostile/killertomato(get_turf(src.loc)) @@ -729,6 +849,9 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() if(user) user.unEquip(src) qdel(src) + + + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood seed = /obj/item/seeds/bloodtomatoseed name = "blood-tomato" @@ -736,9 +859,12 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "bloodtomato" splat = /obj/effect/gibspawner/generic filling_color = "#FF0000" + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood/add_juice(loc, potency = 10) ..() reagents.add_reagent("blood", 1 + round((potency / 5)), list("blood_type"="O-")) + + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue seed = /obj/item/seeds/bluetomatoseed name = "blue-tomato" @@ -746,29 +872,35 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "bluetomato" splat = /obj/effect/decal/cleanable/oil filling_color = "#0000FF" + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/add_juice() ..() reagents.add_reagent("lube", 1 + round((potency / 5), 1)) + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/Crossed(AM as mob|obj) if (istype(AM, /mob/living/carbon)) var/mob/living/carbon/M = AM var/stun = Clamp(potency / 10, 1, 10) var/weaken = Clamp(potency / 20, 0.5, 5) M.slip(stun, weaken, src) + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace seed = /obj/item/seeds/bluespacetomatoseed name = "blue-space tomato" desc = "So lubricated, you might slip through space-time." icon_state = "bluespacetomato" origin_tech = "bluespace=3" + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/add_juice() ..() reagents.add_reagent("singulo", 1 + round((potency / 5), 1)) + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(mob/user) squish(user) user.unEquip(src) src.visible_message("[user] squashes the [src.name].","You hear a smack.") qdel(src) + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/squish(atom/squishee) ..() var/teleport_radius = potency / 10 @@ -776,6 +908,8 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() var/turf/T = get_turf(squishee) new /obj/effect/decal/cleanable/molten_item(T) //Leave a pile of goo behind for dramatic effect... do_teleport(squishee, get_turf(squishee), teleport_radius) + + /obj/item/weapon/reagent_containers/food/snacks/grown/wheat seed = /obj/item/seeds/wheatseed name = "wheat" @@ -783,10 +917,12 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() gender = PLURAL icon_state = "wheat" filling_color = "#F0E68C" + /obj/item/weapon/reagent_containers/food/snacks/grown/wheat/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/oat seed = /obj/item/seeds/oatseed name = "oat" @@ -794,10 +930,12 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() gender = PLURAL icon_state = "oat" filling_color = "#556B2F" + /obj/item/weapon/reagent_containers/food/snacks/grown/oat/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/rice seed = /obj/item/seeds/riceseed name = "rice" @@ -805,20 +943,24 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() gender = PLURAL icon_state = "rice" filling_color = "#FAFAD2" + /obj/item/weapon/reagent_containers/food/snacks/grown/rice/add_juice() if(..()) reagents.add_reagent("rice", 1 + round((potency / 6), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/grass seed = /obj/item/seeds/grassseed name = "grass" desc = "Green and lush." icon_state = "grassclump" filling_color = "#32CD32" + /obj/item/weapon/reagent_containers/food/snacks/grown/grass/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user) user << "You prepare the astroturf." var/grassAmt = 1 + round(potency / 50) // The grass we're holding @@ -837,11 +979,13 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() grassAmt -= GT.max_amount qdel(src) return + /obj/item/weapon/reagent_containers/food/snacks/grown/carpet seed = /obj/item/seeds/carpetseed name = "carpet" desc = "The textile industry's dark secret." icon_state = "carpetclump" + /obj/item/weapon/reagent_containers/food/snacks/grown/carpet/attack_self(mob/user) user << "You roll out the red carpet." var/carpetAmt = 1 + round(potency / 50) // The carpet we're holding @@ -868,23 +1012,28 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "kudzupod" var/list/mutations = list() filling_color = "#6B8E23" + /obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) reagents.add_reagent("charcoal", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + + /obj/item/weapon/reagent_containers/food/snacks/grown/carrot seed = /obj/item/seeds/carrotseed name = "carrot" desc = "It's good for the eyes!" icon_state = "carrot" filling_color = "#FFA500" + /obj/item/weapon/reagent_containers/food/snacks/grown/carrot/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 20), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) reagents.add_reagent("oculine", 3+round(potency / 5, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/kitchen/knife) || istype(I, /obj/item/weapon/hatchet)) user << "You sharpen the carrot into a shiv with [I]." @@ -893,95 +1042,114 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() user.unEquip(src) user.put_in_hands(Shiv) qdel(src) + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom name = "mushroom" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi seed = /obj/item/seeds/reishimycelium name = "reishi" desc = "Ganoderma lucidum: A special fungus known for its medicinal and stress relieving properties." icon_state = "reishi" filling_color = "#FF4500" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/add_juice() ..() reagents.add_reagent("nutriment", 1) reagents.add_reagent("charcoal", 3+round(potency / 3, 1)) reagents.add_reagent("morphine", 3+round(potency / 3, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Anti-Toxin: [reagents.get_reagent_amount("charcoal")]%" user << "- Morphine: [reagents.get_reagent_amount("morphine")]%" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita seed = /obj/item/seeds/amanitamycelium name = "fly amanita" desc = "Amanita Muscaria: Learn poisonous mushrooms by heart. Only pick mushrooms you know." icon_state = "amanita" filling_color = "#FF0000" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/add_juice() ..() reagents.add_reagent("nutriment", 1) reagents.add_reagent("amatoxin", 3+round(potency / 3, 1)) reagents.add_reagent("mushroomhallucinogen", 1 + round(potency / 25, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Amatoxins: [reagents.get_reagent_amount("amatoxin")]%" user << "- Mushroom Hallucinogen: [reagents.get_reagent_amount("mushroomhallucinogen")]%" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel seed = /obj/item/seeds/angelmycelium name = "destroying angel" desc = "Amanita Virosa: Deadly poisonous basidiomycete fungus filled with alpha amatoxins." icon_state = "angel" filling_color = "#C0C0C0" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/add_juice() ..() reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) reagents.add_reagent("amatoxin", 13+round(potency / 3, 1)) reagents.add_reagent("mushroomhallucinogen", 1 + round(potency / 25, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Amatoxins: [reagents.get_reagent_amount("amatoxin")]%" user << "- Mushroom Hallucinogen: [reagents.get_reagent_amount("mushroomhallucinogen")]%" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap seed = /obj/item/seeds/libertymycelium name = "liberty-cap" desc = "Psilocybe Semilanceata: Liberate yourself!" icon_state = "libertycap" filling_color = "#DAA520" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/add_juice(loc, potency = 15) ..() reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) reagents.add_reagent("mushroomhallucinogen", 3+round(potency / 5, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Mushroom Hallucinogen: [reagents.get_reagent_amount("mushroomhallucinogen")]%" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet seed = /obj/item/seeds/plumpmycelium name = "plump-helmet" desc = "Plumus Hellmus: Plump, soft and s-so inviting~" icon_state = "plumphelmet" filling_color = "#9370DB" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet/add_juice() ..() reagents.add_reagent("nutriment", 2+round((potency / 10), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom seed = /obj/item/seeds/walkingmushroommycelium name = "walking mushroom" desc = "Plumus Locomotus: The beginning of the great walk." icon_state = "walkingmushroom" filling_color = "#9370DB" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/add_juice() ..() reagents.add_reagent("nutriment", 2+round((potency / 10), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user) if(istype(user.loc,/turf/space)) return @@ -993,16 +1161,20 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() M.health = M.maxHealth qdel(src) user << "You plant the walking mushroom." + + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle seed = /obj/item/seeds/chantermycelium name = "chanterelle cluster" desc = "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!" icon_state = "chanterelle" filling_color = "#FFA500" + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle/add_juice() ..() reagents.add_reagent("nutriment", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom seed = /obj/item/seeds/glowshroom name = "glowshroom cluster" @@ -1010,6 +1182,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "glowshroom" filling_color = "#00FA9A" var/effect_path = /obj/effect/glowshroom + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/New(var/loc, var/new_potency = 10) ..() if(lifespan == 0) //basically, if you're spawning these via admin or on the map, then set up some default stats. @@ -1062,6 +1235,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "glowcap" filling_color = "#00FA9A" effect_path = /obj/effect/glowshroom/glowcap + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap/On_Consume() if(!reagents.total_volume) var/batteries_recharged = 0 @@ -1076,12 +1250,14 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() if(batteries_recharged) usr << "Battery has recovered." ..() + /obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit seed = /obj/item/seeds/cashseed name = "Money Fruit" desc = "Looks like a lemon with someone buldging from the inside." icon_state = "moneyfruit" inside_type = null + /obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit/add_juice() ..() reagents.add_reagent("nutriment", 1 + round((potency / 20), 1)) @@ -1103,6 +1279,8 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() inside_type = /obj/item/stack/spacecash/c500 else inside_type = /obj/item/stack/spacecash/c1000 + + /obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit seed = /obj/item/seeds/gatfruit name = "gatfruit" @@ -1110,6 +1288,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "gatfruit" origin_tech = "combat=3" trash = /obj/item/weapon/gun/projectile/revolver + /obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit/add_juice() if(..()) reagents.add_reagent("sulfur", 1 + round((potency / 10), 1)) @@ -1117,69 +1296,85 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("nitrogen", 1 + round((potency / 15), 1)) reagents.add_reagent("potassium", 1 + round((potency / 20), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/coffee //abstract type seed = /obj/item/seeds/coffee_arabica_seed name = "coffee beans" desc = "Dry them out to make coffee." icon_state = "coffee_arabica" filling_color = "#DC143C" + /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/add_juice() if(..()) reagents.add_reagent("coffeepowder", 1 + round((potency / 10), 2)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) + /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/arabica seed = /obj/item/seeds/coffee_arabica_seed name = "coffee arabica beans" desc = "Dry them out to make coffee." icon_state = "coffee_arabica" + /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta seed = /obj/item/seeds/coffee_robusta_seed name = "coffee robusta beans" desc = "Dry them out to make coffee." icon_state = "coffee_robusta" + /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta/add_juice(loc, potency = 20) ..() reagents.add_reagent("morphine", 1 + round((potency / 20), 1)) + /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco seed = /obj/item/seeds/tobacco_seed name = "tobacco leaves" desc = "Dry them out to make some smokes." icon_state = "tobacco_leaves" filling_color = "#008000" + /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 40), 1)) reagents.add_reagent("nicotine", 1 + round((potency / 40), 1)) + + /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space seed = /obj/item/seeds/tobacco_space_seed name = "space tobacco leaves" desc = "Dry them out to make some space-smokes." icon_state = "stobacco_leaves" filling_color = "#008000" + /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space/add_juice() ..() reagents.add_reagent("salbutamol", 1 + round((potency / 20), 1)) reagents.add_reagent("nicotine", 1 + round((potency / 20), 1)) + /obj/item/weapon/reagent_containers/food/snacks/grown/tea //abstract type seed = /obj/item/seeds/tea_aspera_seed name = "Tea tips" desc = "These aromatic tips of the tea plant can be dried to make tea." icon_state = "tea_aspera_leaves" + /obj/item/weapon/reagent_containers/food/snacks/grown/tea/add_juice() if(..()) reagents.add_reagent("teapowder", 1 + round((potency / 10), 2)) reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) + + /obj/item/weapon/reagent_containers/food/snacks/grown/tea/aspera seed = /obj/item/seeds/tea_aspera_seed name = "Tea Aspera tips" filling_color = "#008000" + /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra seed = /obj/item/seeds/tea_astra_seed name = "Tea Astra tips" desc = "These aromatic tips of the tea plant can be dried to make tea." icon_state = "tea_astra_leaves" filling_color = "#4582B4" + /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra/add_juice() ..() - reagents.add_reagent("salglu_solution", 1 + round((potency / 20), 1)) \ No newline at end of file + reagents.add_reagent("salglu_solution", 1 + round((potency / 20), 1))