From 1a2c2c0764bedc641b88381bc0bb5743278bf760 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sun, 8 Dec 2024 05:51:35 +0100 Subject: [PATCH] plants --- code/__defines/_fruits.dm | 99 +++++++++ code/__defines/plants.dm | 6 +- code/global_vr.dm | 76 +++---- code/modules/clothing/head/flowercrowns.dm | 6 +- code/modules/clothing/spacesuits/breaches.dm | 2 +- code/modules/fishing/fishing_rod.dm | 6 +- code/modules/food/food/snacks.dm | 78 +++---- code/modules/food/food/snacks/meat.dm | 2 +- code/modules/food/food/snacks_vr.dm | 16 +- code/modules/food/food/superfoods.dm | 18 +- code/modules/food/recipes_fryer.dm | 12 +- code/modules/food/recipes_grill.dm | 4 +- code/modules/food/recipes_microwave.dm | 112 +++++------ code/modules/food/recipes_microwave_vr.dm | 28 +-- code/modules/food/recipes_oven.dm | 68 +++---- code/modules/hydroponics/fruit_spawner.dm | 150 +++++++------- code/modules/hydroponics/grown.dm | 18 +- code/modules/hydroponics/grown_predefined.dm | 4 +- code/modules/hydroponics/grown_sif.dm | 6 +- code/modules/hydroponics/seed_datums_vr.dm | 12 +- code/modules/hydroponics/seed_packets.dm | 190 +++++++++--------- code/modules/hydroponics/seed_packets_vr.dm | 5 - code/modules/hydroponics/seedtypes/amauri.dm | 6 +- .../modules/hydroponics/seedtypes/ambrosia.dm | 20 +- code/modules/hydroponics/seedtypes/apples.dm | 18 +- code/modules/hydroponics/seedtypes/banana.dm | 6 +- code/modules/hydroponics/seedtypes/berries.dm | 20 +- code/modules/hydroponics/seedtypes/cabbage.dm | 6 +- code/modules/hydroponics/seedtypes/carrots.dm | 6 +- code/modules/hydroponics/seedtypes/celery.dm | 8 +- .../modules/hydroponics/seedtypes/cherries.dm | 4 +- code/modules/hydroponics/seedtypes/chili.dm | 16 +- code/modules/hydroponics/seedtypes/citrus.dm | 18 +- code/modules/hydroponics/seedtypes/cocoa.dm | 4 +- code/modules/hydroponics/seedtypes/corn.dm | 6 +- code/modules/hydroponics/seedtypes/diona.dm | 6 +- code/modules/hydroponics/seedtypes/durian.dm | 8 +- .../modules/hydroponics/seedtypes/eggplant.dm | 14 +- code/modules/hydroponics/seedtypes/flowers.dm | 36 ++-- code/modules/hydroponics/seedtypes/gelthi.dm | 6 +- code/modules/hydroponics/seedtypes/gnomes.dm | 6 +- code/modules/hydroponics/seedtypes/grapes.dm | 8 +- code/modules/hydroponics/seedtypes/grass.dm | 18 +- code/modules/hydroponics/seedtypes/jurlmah.dm | 4 +- code/modules/hydroponics/seedtypes/kudzu.dm | 6 +- code/modules/hydroponics/seedtypes/lettuce.dm | 10 +- .../hydroponics/seedtypes/malanitear.dm | 4 +- .../hydroponics/seedtypes/mushrooms.dm | 42 ++-- code/modules/hydroponics/seedtypes/nettles.dm | 12 +- code/modules/hydroponics/seedtypes/onion.dm | 6 +- code/modules/hydroponics/seedtypes/peanuts.dm | 6 +- .../hydroponics/seedtypes/pineapple.dm | 18 +- code/modules/hydroponics/seedtypes/potato.dm | 6 +- code/modules/hydroponics/seedtypes/pumpkin.dm | 6 +- code/modules/hydroponics/seedtypes/rhubarb.dm | 8 +- code/modules/hydroponics/seedtypes/rice.dm | 6 +- .../hydroponics/seedtypes/selemhand.dm | 4 +- code/modules/hydroponics/seedtypes/soybean.dm | 4 +- .../hydroponics/seedtypes/sugarcane.dm | 4 +- code/modules/hydroponics/seedtypes/surik.dm | 6 +- code/modules/hydroponics/seedtypes/telriis.dm | 6 +- code/modules/hydroponics/seedtypes/thaadra.dm | 4 +- code/modules/hydroponics/seedtypes/tobacco.dm | 8 +- .../modules/hydroponics/seedtypes/tomatoes.dm | 20 +- code/modules/hydroponics/seedtypes/vale.dm | 6 +- code/modules/hydroponics/seedtypes/vanilla.dm | 8 +- code/modules/hydroponics/seedtypes/wabback.dm | 10 +- .../hydroponics/seedtypes/watermelon.dm | 6 +- code/modules/hydroponics/seedtypes/weeds.dm | 6 +- code/modules/hydroponics/seedtypes/wheat.dm | 6 +- .../hydroponics/seedtypes/whitebeets.dm | 4 +- .../modules/hydroponics/seedtypes/wurmwoad.dm | 6 +- .../hydroponics/spreading/spreading.dm | 2 +- code/modules/hydroponics/trays/tray.dm | 2 +- code/modules/materials/materials/plastic.dm | 2 +- code/modules/materials/sheets/plastic.dm | 4 +- .../carbon/human/species/station/alraune.dm | 2 +- .../silicon/robot/dogborg/dog_sleeper_vr.dm | 6 +- .../subtypes/animal/farm animals/chicken.dm | 2 +- .../subtypes/animal/sif/glitterfly.dm | 2 +- .../simple_mob/subtypes/plant/tomato.dm | 2 +- code/modules/organs/subtypes/diona.dm | 2 +- .../projectiles/guns/launcher/crossbow.dm | 2 +- vorestation.dme | 2 +- 84 files changed, 765 insertions(+), 665 deletions(-) create mode 100644 code/__defines/_fruits.dm delete mode 100644 code/modules/hydroponics/seed_packets_vr.dm diff --git a/code/__defines/_fruits.dm b/code/__defines/_fruits.dm new file mode 100644 index 00000000000..f8d36bab40b --- /dev/null +++ b/code/__defines/_fruits.dm @@ -0,0 +1,99 @@ +#define PLANT_AMBROSIA "ambrosia" +#define PLANT_APPLE "apple" +#define PLANT_BANANA "banana" +#define PLANT_BERRIES "berries" +#define PLANT_CABBAGE "cabbage" +#define PLANT_CARROT "carrot" +#define PLANT_CELERY "celery" +#define PLANT_CHERRY "cherry" +#define PLANT_CHILI "chili" +#define PLANT_COCOA "cocoa" +#define PLANT_CORN "corn" +#define PLANT_DURIAN "durian" +#define PLANT_EGGPLANT "eggplant" +#define PLANT_GRAPES "grapes" +#define PLANT_GREENGRAPES "greengrapes" +#define PLANT_HAREBELLS "harebells" +#define PLANT_LAVENDER "lavender" +#define PLANT_LEMON "lemon" +#define PLANT_LETTUCE "lettuce" +#define PLANT_LIME "lime" +#define PLANT_ONION "onion" +#define PLANT_ORANGE "orange" +#define PLANT_PEANUT "peanut" +#define PLANT_POPPIES "poppies" +#define PLANT_POTATO "potato" +#define PLANT_PUMPKIN "pumpkin" +#define PLANT_RICE "rice" +#define PLANT_ROSE "rose" +#define PLANT_RHUBARB "rhubarb" +#define PLANT_SOYBEAN "soybean" +#define PLANT_SPINEAPPLE "spineapple" +#define PLANT_SUGARCANE "sugarcane" +#define PLANT_SUNFLOWERS "sunflowers" +#define PLANT_TOMATO "tomato" +#define PLANT_VANILLA "vanilla" +#define PLANT_WATERMELON "watermelon" +#define PLANT_WHEAT "wheat" +#define PLANT_WHITEBEET "whitebeet" +#define PLANT_DIONA "diona" +#define PLANT_GHOSTCHILI "ghostchili" +#define PLANT_PLASTIC "plastic" +#define PLANT_SHAND "shand" +#define PLANT_MTEAR "mtear" +#define PLANT_GLOWBERRIES "glowberries" +#define PLANT_PEPPERCORNS "peppercorns" +#define PLANT_BLOODTOMATO "bloodtomato" +#define PLANT_KILLERTOMATO "killertomato" +#define PLANT_BLUETOMATO "bluetomato" +#define PLANT_BLUESPACETOMATO "bluespacetomato" +#define PLANT_ICECHILI "icechili" +#define PLANT_REISHI "reishi" +#define PLANT_AMANITA "amanita" +#define PLANT_DESTROYINGANGEL "destroyingangel" +#define PLANT_LIBERTYCAP "libertycap" +#define PLANT_MUSHROOMS "mushrooms" +#define PLANT_TOWERCAP "towercap" +#define PLANT_REDCAP "redcap" +#define PLANT_GLOWSHROOM "glowshroom" +#define PLANT_PLUMPHELMET "plumphelmet" +#define PLANT_SPORESHROOM "sporeshroom" +#define PLANT_NETTLE "nettle" +#define PLANT_DEATHNETTLE "deathnettle" +#define PLANT_WEEDS "weeds" +#define PLANT_MOLD "mold" +#define PLANT_POISONAPPLE "poisonapple" +#define PLANT_GOLDAPPLE "goldapple" +#define PLANT_AMBROSIADEUS "ambrosiadeus" +#define PLANT_AMBROSIAGAIA "ambrosiagaia" +#define PLANT_AMBROSIAINFERNUS "ambrosiainfernus" +#define PLANT_POISONBERRIES "poisonberries" +#define PLANT_DEATHBERRIES "deathberries" +#define PLANT_GRASS "grass" +#define PLANT_CARPET "carpet" +#define PLANT_TOBACCO "tobacco" +#define PLANT_KUDZU "kudzu" +#define PLANT_JURLMAH "jurlmah" +#define PLANT_AMAURI "amauri" +#define PLANT_GELTHI "gelthi" +#define PLANT_VALE "vale" +#define PLANT_SURIK "surik" +#define PLANT_TELRIIS "telriis" +#define PLANT_THAADRA "thaadra" +#define PLANT_WHITEWABBACK "whitewabback" +#define PLANT_BLACKWABBACK "blackwabback" +#define PLANT_WILDWABBACK "wildwabback" +#define PLANT_SIFLETTUCE "siflettuce" +#define PLANT_EGGPLANT "egg-plant" +#define PLANT_PINEAPPLE "pineapple" +#define PLANT_BLOODROSE "bloodrose" +#define PLANT_GNOMES "gnomes" +#define PLANT_SIFBULB "sifbulb" +#define PLANT_WURMWOAD "wurmwoad" +#define PLANT_MICROM "microm" + + + + + +#define PLANT_MEGAM "megam" diff --git a/code/__defines/plants.dm b/code/__defines/plants.dm index cd4dc9e701c..910e6c41932 100644 --- a/code/__defines/plants.dm +++ b/code/__defines/plants.dm @@ -106,9 +106,9 @@ GLOBAL_LIST_INIT(plant_item_products, list( )) GLOBAL_LIST_INIT(forbidden_plant_growth_sprites, list( - "gnomes" + PLANT_GNOMES )) GLOBAL_LIST_INIT(forbidden_plant_product_sprites, list( - "gnomes" - )) \ No newline at end of file + PLANT_GNOMES + )) diff --git a/code/global_vr.dm b/code/global_vr.dm index 6293c2197fd..65b574c8056 100644 --- a/code/global_vr.dm +++ b/code/global_vr.dm @@ -6,44 +6,44 @@ var/list/eventdestinations = list() // List of scatter landmarks for VOREStation var/list/eventabductors = list() // List of scatter landmarks for VOREStation abductor portals var/global/list/acceptable_fruit_types= list( - "ambrosia", - "apple", - "banana", - "berries", - "cabbage", - "carrot", - "celery", - "cherry", - "chili", - "cocoa", - "corn", - "durian", - "eggplant", - "grapes", - "greengrapes", - "harebells", - "lavender", - "lemon", - "lettuce", - "lime", - "onion", - "orange", - "peanut", - "poppies", - "potato", - "pumpkin", - "rice", - "rose", - "rhubarb", - "soybean", - "spineapple", - "sugarcane", - "sunflowers", - "tomato", - "vanilla", - "watermelon", - "wheat", - "whitebeet") + PLANT_AMBROSIA, + PLANT_APPLE, + PLANT_BANANA, + PLANT_BERRIES, + PLANT_CABBAGE, + PLANT_CARROT, + PLANT_CELERY, + PLANT_CHERRY, + PLANT_CHILI, + PLANT_COCOA, + PLANT_CORN, + PLANT_DURIAN, + PLANT_EGGPLANT, + PLANT_GRAPES, + PLANT_GREENGRAPES, + PLANT_HAREBELLS, + PLANT_LAVENDER, + PLANT_LEMON, + PLANT_LETTUCE, + PLANT_LIME, + PLANT_ONION, + PLANT_ORANGE, + PLANT_PEANUT, + PLANT_POPPIES, + PLANT_POTATO, + PLANT_PUMPKIN, + PLANT_RICE, + PLANT_ROSE, + PLANT_ROSE, + PLANT_SOYBEAN, + PLANT_SPINEAPPLE, + PLANT_SUGARCANE, + PLANT_SUNFLOWERS, + PLANT_TOMATO, + PLANT_VANILLA, + PLANT_WATERMELON, + PLANT_WHEAT, + PLANT_WHITEBEET) // Some "scary" sounds. var/static/list/scawwySownds = list( diff --git a/code/modules/clothing/head/flowercrowns.dm b/code/modules/clothing/head/flowercrowns.dm index 53ee01141f3..db795863e0e 100644 --- a/code/modules/clothing/head/flowercrowns.dm +++ b/code/modules/clothing/head/flowercrowns.dm @@ -12,13 +12,13 @@ if(G.seed.kitchen_tag == "poppy") to_chat(user, "You attach the poppy to the circlet and create a beautiful flower crown.") complete = new /obj/item/clothing/head/poppy_crown(get_turf(user)) - else if(G.seed.kitchen_tag == "sunflower") + else if(G.seed.kitchen_tag == PLANT_SUNFLOWERS) to_chat(user, "You attach the sunflower to the circlet and create a beautiful flower crown.") complete = new /obj/item/clothing/head/sunflower_crown(get_turf(user)) - else if(G.seed.kitchen_tag == "lavender") + else if(G.seed.kitchen_tag == PLANT_LAVENDER) to_chat(user, "You attach the lavender to the circlet and create a beautiful flower crown.") complete = new /obj/item/clothing/head/lavender_crown(get_turf(user)) - else if(G.seed.kitchen_tag == "rose") + else if(G.seed.kitchen_tag == PLANT_ROSE) to_chat(user, "You attach the rose to the circlet and create a beautiful flower crown.") complete = new /obj/item/clothing/head/rose_crown(get_turf(user)) user.drop_from_inventory(W) diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm index aa6e0649ea6..85e61c40525 100644 --- a/code/modules/clothing/spacesuits/breaches.dm +++ b/code/modules/clothing/spacesuits/breaches.dm @@ -183,7 +183,7 @@ var/global/list/breach_burn_descriptors = list( switch(W.get_material_name()) if(MAT_STEEL) repair_power = 2 - if("plastic") + if(MAT_PLASTIC) repair_power = 1 if(!repair_power) diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index 817da5baf8c..f741d6b8881 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -17,7 +17,7 @@ attack_verb = list("whipped", "battered", "slapped", "fished", "hooked") hitsound = 'sound/weapons/punchmiss.ogg' applies_material_colour = TRUE - default_material = "wood" + default_material = MAT_WOOD can_dull = FALSE var/strung = TRUE var/line_break = TRUE @@ -116,7 +116,7 @@ item_state = "fishing_rod" reach = 4 attackspeed = 2 SECONDS - default_material = "titanium" + default_material = MAT_TITANIUM toolspeed = 0.75 @@ -126,6 +126,6 @@ /obj/item/material/fishing_rod/modern/cheap //A rod sold by the fishing vendor. Done so that the rod sold by mining reward vendors doesn't loose its value. name = "cheap fishing rod" desc = "Mass produced, but somewhat reliable." - default_material = "plastic" + default_material = MAT_PLASTIC toolspeed = 0.9 diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 5b48d1d1e81..504093aef7c 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -1063,7 +1063,7 @@ filling_color = "#DB0000" center_of_mass = list("x"=17, "y"=16) nutriment_amt = 3 - nutriment_desc = list("raw" = 2, "tomato" = 3) + nutriment_desc = list("raw" = 2, PLANT_TOMATO = 3) bitesize = 6 /obj/item/reagent_containers/food/snacks/bearmeat @@ -1454,7 +1454,7 @@ filling_color = "#4D2F5E" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 6 - nutriment_desc = list(REAGENT_ID_CHEESE = 3, "eggplant" = 3) + nutriment_desc = list(REAGENT_ID_CHEESE = 3, PLANT_EGGPLANT = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/soylentgreen @@ -1701,7 +1701,7 @@ filling_color = "#FAA005" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 3 - nutriment_desc = list("carrot" = 3, "salt" = 1) + nutriment_desc = list(PLANT_CARROT = 3, "salt" = 1) bitesize = 2 /obj/item/reagent_containers/food/snacks/carrotfries/Initialize() @@ -1959,7 +1959,7 @@ filling_color = "#A36A1F" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 2 - nutriment_desc = list("tortilla" = 3, "corn" = 3) + nutriment_desc = list("tortilla" = 3, PLANT_CORN = 3) bitesize = 4 /obj/item/reagent_containers/food/snacks/enchiladas/Initialize() @@ -2090,7 +2090,7 @@ trash = /obj/item/trash/plate center_of_mass = list("x"=16, "y"=10) nutriment_amt = 8 - nutriment_desc = list("soy" = 4, "tomato" = 4) + nutriment_desc = list("soy" = 4, PLANT_TOMATO = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/boiledspagetti @@ -2149,7 +2149,7 @@ filling_color = "#DE4545" center_of_mass = list("x"=16, "y"=10) nutriment_amt = 6 - nutriment_desc = list("tomato" = 3, "noodles" = 3) + nutriment_desc = list(PLANT_TOMATO = 3, "noodles" = 3) bitesize = 4 /obj/item/reagent_containers/food/snacks/pastatomato/Initialize() @@ -2207,7 +2207,7 @@ filling_color = "#F21873" center_of_mass = list("x"=15, "y"=13) nutriment_amt = 3 - nutriment_desc = list("apple" = 3, "caramel" = 3, "sweetness" = 2) + nutriment_desc = list(PLANT_APPLE = 3, "caramel" = 3, "sweetness" = 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/candiedapple @@ -2218,7 +2218,7 @@ filling_color = "#F21873" center_of_mass = list("x"=15, "y"=13) nutriment_amt = 3 - nutriment_desc = list("apple" = 3, "sweetness" = 2) + nutriment_desc = list(PLANT_APPLE = 3, "sweetness" = 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/applepie @@ -2228,7 +2228,7 @@ filling_color = "#E0EDC5" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 4 - nutriment_desc = list("sweetness" = 2, "apple" = 2, "pie" = 2) + nutriment_desc = list("sweetness" = 2, PLANT_APPLE = 2, "pie" = 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/cherrypie @@ -2238,7 +2238,7 @@ filling_color = "#FF525A" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 4 - nutriment_desc = list("sweetness" = 2, "cherry" = 2, "pie" = 2) + nutriment_desc = list("sweetness" = 2, PLANT_CHERRY = 2, "pie" = 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/twobread @@ -2381,7 +2381,7 @@ filling_color = "#76B87F" center_of_mass = list("x"=17, "y"=11) nutriment_amt = 8 - nutriment_desc = list("salad" = 2, "tomato" = 2, "carrot" = 2, "apple" = 2) + nutriment_desc = list("salad" = 2, PLANT_TOMATO = 2, PLANT_CARROT = 2, PLANT_APPLE = 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/validsalad @@ -2407,7 +2407,7 @@ filling_color = "#FFFF00" center_of_mass = list("x"=16, "y"=18) nutriment_amt = 8 - nutriment_desc = list("apple" = 8) + nutriment_desc = list(PLANT_APPLE = 8) bitesize = 3 /obj/item/reagent_containers/food/snacks/appletart/Initialize() @@ -2484,7 +2484,7 @@ trash = /obj/item/trash/snack_bowl filling_color = "#AFC4B5" center_of_mass = list("x"=16, "y"=8) - nutriment_desc = list("carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2) + nutriment_desc = list(PLANT_CARROT = 2, PLANT_CORN = 2, PLANT_EGGPLANT = 2, PLANT_POTATO = 2) bitesize = 5 eating_sound = 'sound/items/drink.ogg' @@ -2500,7 +2500,7 @@ filling_color = "#AFC4B5" center_of_mass = list("x"=16, "y"=7) nutriment_amt = 8 - nutriment_desc = list("salad" = 4, REAGENT_ID_EGG = 2, "potato" = 2) + nutriment_desc = list("salad" = 4, REAGENT_ID_EGG = 2, PLANT_POTATO = 2) bitesize = 5 eating_sound = 'sound/items/drink.ogg' @@ -2653,7 +2653,7 @@ filling_color = "#9E673A" center_of_mass = list("x"=16, "y"=5) nutriment_amt = 6 - nutriment_desc = list("tomato" = 2, "potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2) + nutriment_desc = list(PLANT_TOMATO = 2, PLANT_POTATO = 2, PLANT_CARROT = 2, PLANT_EGGPLANT = 2, "mushroom" = 2) drop_sound = 'sound/items/drop/shovel.ogg' pickup_sound = 'sound/items/pickup/shovel.ogg' bitesize = 10 @@ -2944,7 +2944,7 @@ slices_num = 5 filling_color = "#FFD675" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "carrot" = 15) + nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_CARROT = 15) nutriment_amt = 25 bitesize = 2 @@ -3085,7 +3085,7 @@ slices_num = 5 filling_color = "#FADA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "orange" = 15) + nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_ORANGE = 15) nutriment_amt = 20 /obj/item/reagent_containers/food/snacks/slice/orangecake @@ -3109,7 +3109,7 @@ slices_num = 5 filling_color = "#CBFA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "lime" = 15) + nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_LIME = 15) nutriment_amt = 20 /obj/item/reagent_containers/food/snacks/slice/limecake @@ -3133,7 +3133,7 @@ slices_num = 5 filling_color = "#FAFA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "lemon" = 15) + nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_LEMON = 15) nutriment_amt = 20 @@ -3255,7 +3255,7 @@ slices_num = 5 filling_color = "#EBF5B8" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "apple" = 15) + nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_APPLE = 15) nutriment_amt = 15 /obj/item/reagent_containers/food/snacks/slice/applecake @@ -3279,7 +3279,7 @@ slices_num = 5 filling_color = "#F5B951" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("pie" = 5, REAGENT_ID_CREAM = 5, "pumpkin" = 5) + nutriment_desc = list("pie" = 5, REAGENT_ID_CREAM = 5, PLANT_PUMPKIN = 5) nutriment_amt = 15 /obj/item/reagent_containers/food/snacks/slice/pumpkinpie @@ -3331,7 +3331,7 @@ slices_num = 5 filling_color = "#F5B951" nutriment_amt = 16 - nutriment_desc = list("lime" = 12, "graham crackers" = 4) + nutriment_desc = list(PLANT_LIME = 12, "graham crackers" = 4) center_of_mass = list("x"=16, "y"=10) /obj/item/reagent_containers/food/snacks/sliceable/keylimepie/Initialize() @@ -3345,7 +3345,7 @@ trash = /obj/item/trash/plate filling_color = "#F5B951" bitesize = 3 - nutriment_desc = list("lime" = 1) + nutriment_desc = list(PLANT_LIME = 1) center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/keylimepieslice/filled @@ -3463,7 +3463,7 @@ icon = 'icons/obj/food.dmi' icon_state = "lasagna" nutriment_amt = 5 - nutriment_desc = list("tomato" = 4, "meat" = 2) + nutriment_desc = list(PLANT_TOMATO = 4, "meat" = 2) /obj/item/reagent_containers/food/snacks/lasagna/Initialize() . = ..() @@ -3656,7 +3656,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/slice/margherita slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 15) + nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 15) nutriment_amt = 35 bitesize = 2 @@ -3684,7 +3684,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/pineappleslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "ham" = 10) + nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, "ham" = 10) nutriment_amt = 30 bitesize = 2 @@ -3703,7 +3703,7 @@ center_of_mass = list("x"=18, "y"=13) /obj/item/reagent_containers/food/snacks/pineappleslice/filled - nutriment_desc = list("pizza crust" = 5, "tomato" = 5) + nutriment_desc = list("pizza crust" = 5, PLANT_TOMATO = 5) nutriment_amt = 5 /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza @@ -3713,7 +3713,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/slice/meatpizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 15, "meat" = 10) + nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 15, "meat" = 10) nutriment_amt = 10 bitesize = 2 @@ -3741,7 +3741,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/slice/mushroompizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 5, "mushroom" = 10) + nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 5, "mushroom" = 10) nutriment_amt = 35 bitesize = 2 @@ -3768,7 +3768,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/slice/vegetablepizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5) + nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 5, PLANT_EGGPLANT = 5, PLANT_CARROT = 5, PLANT_CORN = 5) nutriment_amt = 25 bitesize = 2 @@ -4233,11 +4233,11 @@ // potato + knife = raw sticks /obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/W, mob/user) - if(seed && seed.kitchen_tag && seed.kitchen_tag == "potato" && istype(W,/obj/item/material/knife)) + if(seed && seed.kitchen_tag && seed.kitchen_tag == PLANT_POTATO && istype(W,/obj/item/material/knife)) new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src)) to_chat(user, span_notice("You cut the potato.")) qdel(src) - else if(seed && seed.kitchen_tag && seed.kitchen_tag == "sunflower" && istype(W,/obj/item/material/knife)) + else if(seed && seed.kitchen_tag && seed.kitchen_tag == PLANT_SUNFLOWERS && istype(W,/obj/item/material/knife)) new /obj/item/reagent_containers/food/snacks/rawsunflower(get_turf(src)) to_chat(user, span_notice("You remove the seeds from the flower, slightly damaging them.")) qdel(src) @@ -4497,7 +4497,7 @@ filling_color = "#E0CF9B" center_of_mass = list("x"=17, "y"=4) nutriment_amt = 6 - nutriment_desc = list("sweetness" = 2, "muffin" = 2, "berries" = 2) + nutriment_desc = list("sweetness" = 2, "muffin" = 2, PLANT_BERRIES = 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/berrymuffin/berry/Initialize() @@ -4515,7 +4515,7 @@ filling_color = "#799ACE" center_of_mass = list("x"=17, "y"=4) nutriment_amt = 6 - nutriment_desc = list("spookiness" = 4, "muffin" = 1, "berries" = 1) + nutriment_desc = list("spookiness" = 4, "muffin" = 1, PLANT_BERRIES = 1) bitesize = 2 /obj/item/reagent_containers/food/snacks/ghostmuffin/berry/Initialize() @@ -4533,7 +4533,7 @@ filling_color = "#799ACE" center_of_mass = list("x"=17, "y"=16) nutriment_amt = 8 - nutriment_desc = list(REAGENT_ID_EGG = 4, "chili" = 4) + nutriment_desc = list(REAGENT_ID_EGG = 4, PLANT_CHILI = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/devilledegg/Initialize() @@ -6259,7 +6259,7 @@ icon_state = "fruitbar" trash = /obj/item/trash/candy/fruitbar nutriment_amt = 13 - nutriment_desc = list("apricot" = 2, REAGENT_ID_SUGAR = 2, "dates" = 2, "cranberry" = 2, "apple" = 2) + nutriment_desc = list("apricot" = 2, REAGENT_ID_SUGAR = 2, "dates" = 2, "cranberry" = 2, PLANT_APPLE = 2) bitesize = 6 /obj/item/reagent_containers/food/snacks/fruitbar/Initialize() @@ -6718,7 +6718,7 @@ trash = /obj/item/trash/saturno filling_color = "#dca319" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("salt" = 4, "peanut" = 2, "wood?" = 1) + nutriment_desc = list("salt" = 4, PLANT_PEANUT = 2, "wood?" = 1) nutriment_amt = 5 bitesize = 2 @@ -6754,7 +6754,7 @@ trash = /obj/item/trash/mars filling_color = "#d2c63f" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("eggs" = 4, "potato" = 4, REAGENT_ID_MUSTARD = 2) + nutriment_desc = list("eggs" = 4, PLANT_POTATO = 4, REAGENT_ID_MUSTARD = 2) nutriment_amt = 8 bitesize = 2 @@ -7102,7 +7102,7 @@ canned_open_state = "appleberry-open" filling_color = "#FFFFFF" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("apple" = 1, "sweetness" = 1) + nutriment_desc = list(PLANT_APPLE = 1, "sweetness" = 1) bitesize = 2 /obj/item/reagent_containers/food/snacks/canned/appleberry/Initialize() diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index 485b4ab093b..ed846dd21b3 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -89,7 +89,7 @@ filling_color = "#DB0000" center_of_mass = list("x"=17, "y"=16) nutriment_amt = 3 - nutriment_desc = list("raw" = 2, "tomato" = 3) + nutriment_desc = list("raw" = 2, PLANT_TOMATO = 3) bitesize = 6 /obj/item/reagent_containers/food/snacks/bearmeat diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 17cc46f6a9f..3437b29ee9b 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -256,7 +256,7 @@ icon_state = "lobster_cooked" trash = /obj/item/trash/plate nutriment_amt = 20 - nutriment_desc = list("lemon" = 2, "lobster" = 5, "salad" = 2) + nutriment_desc = list(PLANT_LEMON = 2, "lobster" = 5, "salad" = 2) /obj/item/reagent_containers/food/snacks/lobstercooked/Initialize() . = ..() @@ -639,7 +639,7 @@ icon = 'icons/obj/food_vr.dmi' icon_state = "grub_pink" nutriment_amt = 5 - nutriment_desc = list("cherry" = 4, "goo" = 1) + nutriment_desc = list(PLANT_CHERRY = 4, "goo" = 1) /obj/item/reagent_containers/food/snacks/grub_pink/Initialize() . = ..() @@ -953,7 +953,7 @@ icon_state = "jaffacake" nutriment_amt = 1 bitesize = 2 - nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "orange" = 4, "cake" = 3) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, PLANT_ORANGE = 4, "cake" = 3) /obj/item/reagent_containers/food/snacks/bourbon/Initialize() . = ..() @@ -986,7 +986,7 @@ /obj/item/reagent_containers/food/snacks/winegum/orange icon_state = "winegum_orange" - nutriment_desc = list(REAGENT_ID_SUGAR = 5, "orange" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, PLANT_ORANGE = 2) /obj/item/reagent_containers/food/snacks/winegum/black icon_state = "winegum_black" @@ -994,11 +994,11 @@ /obj/item/reagent_containers/food/snacks/winegum/green icon_state = "winegum_green" - nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lime" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, PLANT_LIME = 2) /obj/item/reagent_containers/food/snacks/winegum/yellow icon_state = "winegum_yellow" - nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lemon" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, PLANT_LEMON = 2) /obj/item/reagent_containers/food/snacks/winegum/white icon_state = "winegum_white" @@ -1030,7 +1030,7 @@ package_trash = /obj/item/trash/pasty package_open_state = "pasty_open" nutriment_amt = 4 - nutriment_desc = list("pastry" = 5, "meat" = 5, "onion" = 2, "potato" = 3) + nutriment_desc = list("pastry" = 5, "meat" = 5, PLANT_ONION = 2, PLANT_POTATO = 3) /obj/item/reagent_containers/food/snacks/packaged/pasty/Initialize() . = ..() @@ -1184,7 +1184,7 @@ w_class = ITEMSIZE_TINY nutriment_amt = 1 bitesize = 2 - nutriment_desc = list(REAGENT_ID_SUGAR = 5, "rhubarb" = 2, "custard" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, PLANT_ROSE = 2, "custard" = 2) var/list/color_options = list("rhubarbcustard_1","rhubarbcustard_2") /obj/item/reagent_containers/food/snacks/rhubarbcustard/Initialize() diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm index 696a13581ad..ed06f1a4abd 100644 --- a/code/modules/food/food/superfoods.dm +++ b/code/modules/food/food/superfoods.dm @@ -2,7 +2,7 @@ /datum/recipe/chaoscake_layerone reagents = list(REAGENT_ID_FLOUR = 30,REAGENT_ID_MILK = 20, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 9) - fruit = list("poisonberries" = 2, "cherries" = 2) + fruit = list(PLANT_POISONBERRIES = 2, "cherries" = 2) items = list( /obj/item/reagent_containers/food/snacks/meat/, /obj/item/reagent_containers/food/snacks/meat/, @@ -24,7 +24,7 @@ /datum/recipe/chaoscake_layerthree reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_DEATHBELL = 10) - fruit = list("grapes" = 3) + fruit = list(PLANT_GRAPES = 3) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough, @@ -34,7 +34,7 @@ /datum/recipe/chaoscake_layerfour reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_MILKSHAKE = 30) - fruit = list("rice" = 3) + fruit = list(PLANT_RICE = 3) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough, @@ -44,13 +44,13 @@ /datum/recipe/chaoscake_layerfive reagents = list(REAGENT_ID_FLOUR = 20, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_BLOOD = 30) - fruit = list("tomato" = 2) + fruit = list(PLANT_TOMATO = 2) items = list() //supposed to be made with lobster, still has to be ported. result = /obj/item/chaoscake_layer/five /datum/recipe/chaoscake_layersix reagents = list(REAGENT_ID_FLOUR = 20, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_SPRINKLES = 5) - fruit = list("apple" = 2) + fruit = list(PLANT_APPLE = 2) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough, @@ -63,7 +63,7 @@ /datum/recipe/chaoscake_layerseven reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_DEVILSKISS = 20) - fruit = list("potato" = 1) + fruit = list(PLANT_POTATO = 1) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough, @@ -73,7 +73,7 @@ /datum/recipe/chaoscake_layereight reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_CREAM = 20) - fruit = list("lemon" = 1) + fruit = list(PLANT_LEMON = 1) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough, @@ -83,7 +83,7 @@ /datum/recipe/chaoscake_layernine reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_BLOOD = 10) - fruit = list("goldapple" = 1) + fruit = list(PLANT_GOLDAPPLE = 1) items = list() result = /obj/item/chaoscake_layer/nine @@ -334,7 +334,7 @@ icon_state = "big_veggie_slice" /datum/recipe/theonepizza - fruit = list("tomato" = 5, "mushroom" = 5, "eggplant" = 1, "carrot" = 1, "corn" = 1) + fruit = list(PLANT_TOMATO = 5, "mushroom" = 5, PLANT_EGGPLANT = 1, PLANT_CARROT = 1, PLANT_CORN = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/sliceable/flatdough, diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index f137dd6c78e..22f5b7fa30a 100644 --- a/code/modules/food/recipes_fryer.dm +++ b/code/modules/food/recipes_fryer.dm @@ -15,7 +15,7 @@ /datum/recipe/jpoppers appliance = FRYER - fruit = list("chili" = 1) + fruit = list(PLANT_CHILI = 1) coating = /datum/reagent/nutriment/coating/batter result = /obj/item/reagent_containers/food/snacks/jalapeno_poppers result_quantity = 2 @@ -40,7 +40,7 @@ /datum/recipe/onionrings appliance = FRYER coating = /datum/reagent/nutriment/coating/batter - fruit = list("onion" = 1) + fruit = list(PLANT_ONION = 1) result = /obj/item/reagent_containers/food/snacks/onionrings result_quantity = 2 @@ -48,7 +48,7 @@ //==================== /datum/recipe/cubancarp appliance = FRYER - fruit = list("chili" = 1) + fruit = list(PLANT_CHILI = 1) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/carpmeat @@ -92,7 +92,7 @@ /datum/recipe/friedmushroom appliance = FRYER - fruit = list("plumphelmet" = 1) + fruit = list(PLANT_PLUMPHELMET = 1) coating = /datum/reagent/nutriment/coating/beerbatter reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/friedmushroom @@ -110,7 +110,7 @@ items = list( /obj/item/reagent_containers/food/snacks/sausage ) - fruit = list("corn" = 1) + fruit = list(PLANT_CORN = 1) coating = /datum/reagent/nutriment/coating/batter result = /obj/item/reagent_containers/food/snacks/corn_dog @@ -177,7 +177,7 @@ /datum/recipe/pisanggoreng appliance = FRYER - fruit = list("banana" = 2) + fruit = list(PLANT_BANANA = 2) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/pisanggoreng coating = /datum/reagent/nutriment/coating/batter diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index 9598c6732fa..1bac99f6031 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -185,7 +185,7 @@ /datum/recipe/superbiteburger appliance = GRILL - fruit = list("tomato" = 1) + fruit = list(PLANT_TOMATO = 1) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 5, REAGENT_ID_BLACKPEPPER = 5) items = list( /obj/item/reagent_containers/food/snacks/bigbiteburger, @@ -281,7 +281,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat ) reagents = list(REAGENT_ID_SPACESPICE = 1) - fruit = list("lettuce" = 1, "lime" = 1) + fruit = list(PLANT_LETTUCE = 1, PLANT_LIME = 1) result = /obj/item/reagent_containers/food/snacks/sliceable/grilled_carp /datum/recipe/grilledcheese diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 635745047db..36170d23607 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -35,7 +35,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/boiledegg /datum/recipe/devilledegg - fruit = list("chili" = 1) + fruit = list(PLANT_CHILI = 1) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_MAYO = 5) items = list( /obj/item/reagent_containers/food/snacks/egg, @@ -76,7 +76,7 @@ I said no! result_quantity = 2 /datum/recipe/eggplantparm - fruit = list("eggplant" = 1) + fruit = list(PLANT_EGGPLANT = 1) items = list( /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge @@ -99,14 +99,14 @@ I said no! result = /obj/item/reagent_containers/food/snacks/soylentgreen /datum/recipe/berryclafoutis - fruit = list("berries" = 1) + fruit = list(PLANT_BERRIES = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough ) result = /obj/item/reagent_containers/food/snacks/berryclafoutis/berry /datum/recipe/poisonberryclafoutis - fruit = list("poisonberries" = 1) + fruit = list(PLANT_POISONBERRIES = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough ) @@ -120,7 +120,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/wingfangchu /datum/recipe/loadedbakedpotato - fruit = list("potato" = 1) + fruit = list(PLANT_POTATO = 1) items = list(/obj/item/reagent_containers/food/snacks/cheesewedge) result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato @@ -153,7 +153,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/blackpudding /datum/recipe/popcorn - fruit = list("corn" = 1) + fruit = list(PLANT_CORN = 1) result = /obj/item/reagent_containers/food/snacks/popcorn /datum/recipe/fortunecookie @@ -183,18 +183,18 @@ I said no! being_cooked.reagents.del_reagent(REAGENT_ID_AMATOXIN) /datum/recipe/meatballsoup - fruit = list("carrot" = 1, "potato" = 1) + fruit = list(PLANT_CARROT = 1, PLANT_POTATO = 1) reagents = list(REAGENT_ID_WATER = 10) items = list(/obj/item/reagent_containers/food/snacks/meatball) result = /obj/item/reagent_containers/food/snacks/meatballsoup /datum/recipe/vegetablesoup - fruit = list("carrot" = 1, "potato" = 1, "corn" = 1, "eggplant" = 1) + fruit = list(PLANT_CARROT = 1, PLANT_POTATO = 1, PLANT_CORN = 1, PLANT_EGGPLANT = 1) reagents = list(REAGENT_ID_WATER = 10) result = /obj/item/reagent_containers/food/snacks/vegetablesoup /datum/recipe/nettlesoup - fruit = list("nettle" = 1, "potato" = 1) + fruit = list(PLANT_NETTLE = 1, PLANT_POTATO = 1) reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_EGG = 3) result = /obj/item/reagent_containers/food/snacks/nettlesoup @@ -203,12 +203,12 @@ I said no! result= /obj/item/reagent_containers/food/snacks/wishsoup /datum/recipe/hotchili - fruit = list("chili" = 1, "tomato" = 1) + fruit = list(PLANT_CHILI = 1, PLANT_TOMATO = 1) items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/hotchili /datum/recipe/coldchili - fruit = list("icechili" = 1, "tomato" = 1) + fruit = list(PLANT_ICECHILI = 1, PLANT_TOMATO = 1) items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/coldchili @@ -245,11 +245,11 @@ I said no! /obj/item/reagent_containers/food/snacks/bacon, /obj/item/reagent_containers/food/snacks/cheesewedge ) - fruit = list("tomato" = 1, "lettuce" = 1) + fruit = list(PLANT_TOMATO = 1, PLANT_LETTUCE = 1) result = /obj/item/reagent_containers/food/snacks/clubsandwich /datum/recipe/tomatosoup - fruit = list("tomato" = 2) + fruit = list(PLANT_TOMATO = 2) reagents = list(REAGENT_ID_WATER = 10) result = /obj/item/reagent_containers/food/snacks/tomatosoup @@ -263,7 +263,7 @@ I said no! result_quantity = 2 /datum/recipe/stew - fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1) + fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, "mushroom" = 1) reagents = list(REAGENT_ID_WATER = 10) items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/stew @@ -293,7 +293,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/milosoup /datum/recipe/stewedsoymeat - fruit = list("carrot" = 1, "tomato" = 1) + fruit = list(PLANT_CARROT = 1, PLANT_TOMATO = 1) items = list( /obj/item/reagent_containers/food/snacks/soydope, /obj/item/reagent_containers/food/snacks/soydope @@ -316,7 +316,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/ricepudding /datum/recipe/pastatomato - fruit = list("tomato" = 2) + fruit = list(PLANT_TOMATO = 2) reagents = list(REAGENT_ID_WATER = 5) items = list(/obj/item/reagent_containers/food/snacks/spagetti) result = /obj/item/reagent_containers/food/snacks/pastatomato @@ -342,12 +342,12 @@ I said no! result = /obj/item/reagent_containers/food/snacks/spesslaw /datum/recipe/candiedapple - fruit = list("apple" = 1) + fruit = list(PLANT_APPLE = 1) reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SUGAR = 5) //Makes sense seeing as how it's just syrup on the exterior result = /obj/item/reagent_containers/food/snacks/candiedapple /datum/recipe/caramelapple - fruit = list("apple" = 1) + fruit = list(PLANT_APPLE = 1) reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5) //Since caramel can be made with milk I thought this was appropriate result = /obj/item/reagent_containers/food/snacks/caramelapple @@ -407,7 +407,7 @@ I said no! result_quantity = 2 /datum/recipe/kudzudonburi - fruit = list("kudzu" = 1) + fruit = list(PLANT_KUDZU = 1) reagents = list(REAGENT_ID_RICE = 10) items = list( /obj/item/reagent_containers/food/snacks/carpmeat @@ -425,7 +425,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/mysterysoup /datum/recipe/plumphelmetbiscuit - fruit = list("plumphelmet" = 1) + fruit = list(PLANT_PLUMPHELMET = 1) reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_FLOUR = 5) result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit result_quantity = 2 @@ -442,12 +442,12 @@ I said no! result = /obj/item/reagent_containers/food/snacks/chawanmushi /datum/recipe/beetsoup - fruit = list("whitebeet" = 1, "cabbage" = 1) + fruit = list(PLANT_WHITEBEET = 1, PLANT_CABBAGE = 1) reagents = list(REAGENT_ID_WATER = 10) result = /obj/item/reagent_containers/food/snacks/beetsoup /datum/recipe/tossedsalad - fruit = list("lettuce" = 2, "tomato" = 1, "carrot" = 1, "apple" = 1) + fruit = list(PLANT_LETTUCE = 2, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_APPLE = 1) result = /obj/item/reagent_containers/food/snacks/tossedsalad /datum/recipe/flowersalad @@ -458,23 +458,23 @@ I said no! result = /obj/item/reagent_containers/food/snacks/flowerchildsalad /datum/recipe/rosesalad - fruit = list("harebell" = 1, "rose" = 1) + fruit = list("harebell" = 1, PLANT_ROSE = 1) items = list( /obj/item/reagent_containers/food/snacks/roastedsunflower ) result = /obj/item/reagent_containers/food/snacks/rosesalad /datum/recipe/aesirsalad - fruit = list("goldapple" = 1, "ambrosiadeus" = 1) + fruit = list(PLANT_GOLDAPPLE = 1, PLANT_AMBROSIADEUS = 1) result = /obj/item/reagent_containers/food/snacks/aesirsalad /datum/recipe/validsalad - fruit = list("potato" = 1, "ambrosia" = 3) + fruit = list(PLANT_POTATO = 1, PLANT_AMBROSIA = 3) items = list(/obj/item/reagent_containers/food/snacks/meatball) result = /obj/item/reagent_containers/food/snacks/validsalad /datum/recipe/dankpocket - fruit = list("ambrosia" = 2) + fruit = list(PLANT_AMBROSIA = 2) items = list( /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/doughslice @@ -498,7 +498,7 @@ I said no! items = list( /obj/item/reagent_containers/food/snacks/spreads ) - fruit = list("potato" = 1) + fruit = list(PLANT_POTATO = 1) result = /obj/item/reagent_containers/food/snacks/mashedpotato /datum/recipe/icecreamsandwich @@ -509,7 +509,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/icecreamsandwich /datum/recipe/onionsoup - fruit = list("onion" = 1) + fruit = list(PLANT_ONION = 1) reagents = list(REAGENT_ID_WATER = 10) result = /obj/item/reagent_containers/food/snacks/soup/onion @@ -563,19 +563,19 @@ I said no! result_quantity = 2 /datum/recipe/roastedpeanuts - fruit = list("peanut" = 2) + fruit = list(PLANT_PEANUT = 2) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_COOKINGOIL = 1) result = /obj/item/reagent_containers/food/snacks/roastedpeanuts result_quantity = 2 /datum/recipe/roastedpeanutscorn - fruit = list("peanut" = 2) + fruit = list(PLANT_PEANUT = 2) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_CORNOIL = 1) result = /obj/item/reagent_containers/food/snacks/roastedpeanuts result_quantity = 2 /datum/recipe/roastedpeanutspeanut - fruit = list("peanut" = 2) + fruit = list(PLANT_PEANUT = 2) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_PEANUTOIL = 1) result = /obj/item/reagent_containers/food/snacks/roastedpeanuts result_quantity = 2 @@ -617,7 +617,7 @@ I said no! items = list( /obj/item/reagent_containers/food/snacks/dough ) - fruit = list("berries" = 1) + fruit = list(PLANT_BERRIES = 1) result = /obj/item/reagent_containers/food/snacks/berrymuffin/berry result_quantity = 2 @@ -626,7 +626,7 @@ I said no! items = list( /obj/item/reagent_containers/food/snacks/dough ) - fruit = list("poisonberries" = 1) + fruit = list(PLANT_POISONBERRIES = 1) result = /obj/item/reagent_containers/food/snacks/berrymuffin/poison result_quantity = 2 @@ -636,7 +636,7 @@ I said no! /obj/item/reagent_containers/food/snacks/dough, /obj/item/ectoplasm ) - fruit = list("berries" = 1) + fruit = list(PLANT_BERRIES = 1) result = /obj/item/reagent_containers/food/snacks/ghostmuffin/berry result_quantity = 2 @@ -646,7 +646,7 @@ I said no! /obj/item/reagent_containers/food/snacks/dough, /obj/item/ectoplasm ) - fruit = list("poisonberries" = 1) + fruit = list(PLANT_POISONBERRIES = 1) result = /obj/item/reagent_containers/food/snacks/ghostmuffin/poison result_quantity = 2 @@ -655,11 +655,11 @@ I said no! items = list( /obj/item/reagent_containers/food/snacks/friedegg ) - fruit = list("cabbage" = 1) + fruit = list(PLANT_CABBAGE = 1) result = /obj/item/reagent_containers/food/snacks/eggroll /datum/recipe/fruitsalad - fruit = list("orange" = 1, "apple" = 1, "grapes" = 1, "watermelon" = 1) + fruit = list(PLANT_ORANGE = 1, PLANT_APPLE = 1, PLANT_GRAPES = 1, PLANT_WATERMELON = 1) result = /obj/item/reagent_containers/food/snacks/fruitsalad /datum/recipe/eggbowl @@ -674,7 +674,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/porkbowl /datum/recipe/cubannachos - fruit = list("chili" = 1) + fruit = list(PLANT_CHILI = 1) reagents = list(REAGENT_ID_KETCHUP = 5) items = list( /obj/item/reagent_containers/food/snacks/tortilla @@ -682,7 +682,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/cubannachos /datum/recipe/curryrice - fruit = list("chili" = 1) + fruit = list(PLANT_CHILI = 1) reagents = list(REAGENT_ID_RICE = 10) result = /obj/item/reagent_containers/food/snacks/curryrice @@ -764,7 +764,7 @@ I said no! /datum/recipe/greencurry reagents = list(REAGENT_ID_CREAM = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_RICE = 5) - fruit = list("chili" = 1) + fruit = list(PLANT_CHILI = 1) items = list( /obj/item/reagent_containers/food/snacks/tofu, /obj/item/reagent_containers/food/snacks/tofu @@ -774,25 +774,25 @@ I said no! /datum/recipe/yellowcurry reagents = list(REAGENT_ID_CREAM = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_RICE = 5) - fruit = list("peanut" = 2, "potato" = 1) + fruit = list(PLANT_PEANUT = 2, PLANT_POTATO = 1) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/yellowcurry /datum/recipe/bearchili - fruit = list("chili" = 1, "tomato" = 1) + fruit = list(PLANT_CHILI = 1, PLANT_TOMATO = 1) items = list(/obj/item/reagent_containers/food/snacks/bearmeat) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/bearchili /datum/recipe/bearstew - fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1) + fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, "mushroom" = 1) reagents = list(REAGENT_ID_WATER = 10) items = list(/obj/item/reagent_containers/food/snacks/bearmeat) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/bearstew /datum/recipe/bibimbap - fruit = list("carrot" = 1, "cabbage" = 1, "mushroom" = 1) + fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1, "mushroom" = 1) reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_SPACESPICE = 2) items = list( /obj/item/reagent_containers/food/snacks/egg, @@ -803,13 +803,13 @@ I said no! /datum/recipe/friedrice reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SOYSAUCE = 5) - fruit = list("carrot" = 1, "cabbage" = 1) + fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/friedrice /datum/recipe/lomein reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SOYSAUCE = 5) - fruit = list("carrot" = 1, "cabbage" = 1) + fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1) items = list( /obj/item/reagent_containers/food/snacks/spagetti ) @@ -817,7 +817,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/lomein /datum/recipe/chickennoodlesoup - fruit = list("carrot" = 1) + fruit = list(PLANT_CARROT = 1) reagents = list(REAGENT_ID_WATER = 10) items = list( /obj/item/reagent_containers/food/snacks/spagetti, /obj/item/reagent_containers/food/snacks/rawcutlet) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product @@ -888,13 +888,13 @@ I said no! result = /obj/item/reagent_containers/food/snacks/chipplate/nachos /datum/recipe/salsa - fruit = list("chili" = 1, "tomato" = 1, "lime" = 1) + fruit = list(PLANT_CHILI = 1, PLANT_TOMATO = 1, PLANT_LIME = 1) reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_BLACKPEPPER = 1,REAGENT_ID_SODIUMCHLORIDE = 1) result = /obj/item/reagent_containers/food/snacks/dip/salsa reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together. /datum/recipe/guac - fruit = list("chili" = 1, "lime" = 1) + fruit = list(PLANT_CHILI = 1, PLANT_LIME = 1) reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_BLACKPEPPER = 1,REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/tofu @@ -903,7 +903,7 @@ I said no! reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together. /datum/recipe/cheesesauce - fruit = list("chili" = 1, "tomato" = 1) + fruit = list(PLANT_CHILI = 1, PLANT_TOMATO = 1) reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_BLACKPEPPER = 1,REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/cheesewedge @@ -937,7 +937,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/burrito_cheese /datum/recipe/burrito_cheese_spicy - fruit = list("chili" = 2, "soybeans" = 1) + fruit = list(PLANT_CHILI = 2, "soybeans" = 1) items = list( /obj/item/reagent_containers/food/snacks/tortilla, /obj/item/reagent_containers/food/snacks/cheesewedge, @@ -946,7 +946,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy /datum/recipe/burrito_hell - fruit = list("soybeans" = 1, "chili" = 10) + fruit = list("soybeans" = 1, PLANT_CHILI = 10) reagents = list(REAGENT_ID_SPACESPICE = 1) items = list( /obj/item/reagent_containers/food/snacks/tortilla, @@ -976,7 +976,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/cheeseburrito /datum/recipe/fuegoburrito - fruit = list("soybeans" = 1, "chili" = 2) + fruit = list("soybeans" = 1, PLANT_CHILI = 2) items = list( /obj/item/reagent_containers/food/snacks/tortilla ) @@ -1053,7 +1053,7 @@ I said no! /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/cheesewedge ) - fruit = list("cabbage" = 1) + fruit = list(PLANT_CABBAGE = 1) result = /obj/item/reagent_containers/food/snacks/stuffed_meatball result_quantity = 2 @@ -1090,7 +1090,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/nt_muffin /datum/recipe/fish_taco - fruit = list("chili" = 1, "lemon" = 1) + fruit = list(PLANT_CHILI = 1, PLANT_LEMON = 1) items = list( /obj/item/reagent_containers/food/snacks/carpmeat, /obj/item/reagent_containers/food/snacks/tortilla @@ -1098,7 +1098,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/fish_taco /datum/recipe/blt - fruit = list("tomato" = 1, "lettuce" = 1) + fruit = list(PLANT_TOMATO = 1, PLANT_LETTUCE = 1) items = list( /obj/item/reagent_containers/food/snacks/slice/bread, /obj/item/reagent_containers/food/snacks/slice/bread, diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm index a8bd0857841..11059940878 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -11,7 +11,7 @@ // All of this shit needs to be gone through and reorganized into different recipes per machine - Rykka 7/16/2020 /datum/recipe/sushi - fruit = list("cabbage" = 1) + fruit = list(PLANT_CABBAGE = 1) reagents = list(REAGENT_ID_RICE = 20) items = list( /obj/item/reagent_containers/food/snacks/meat, @@ -21,7 +21,7 @@ result = /obj/item/reagent_containers/food/snacks/sliceable/sushi /datum/recipe/goulash - fruit = list("tomato" = 1) + fruit = list(PLANT_TOMATO = 1) items = list( /obj/item/reagent_containers/food/snacks/cutlet, /obj/item/reagent_containers/food/snacks/spagetti @@ -29,7 +29,7 @@ result = /obj/item/reagent_containers/food/snacks/goulash /datum/recipe/donerkebab - fruit = list("tomato" = 1, "cabbage" = 1) + fruit = list(PLANT_TOMATO = 1, PLANT_CABBAGE = 1) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/meatsteak, @@ -39,7 +39,7 @@ /datum/recipe/roastbeef - fruit = list("carrot" = 2, "potato" = 2) + fruit = list(PLANT_CARROT = 2, PLANT_POTATO = 2) items = list( /obj/item/reagent_containers/food/snacks/meat ) @@ -53,7 +53,7 @@ result = /obj/item/reagent_containers/food/snacks/reishicup /datum/recipe/hotandsoursoup - fruit = list("cabbage" = 1, "mushroom" = 1) + fruit = list(PLANT_CABBAGE = 1, "mushroom" = 1) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_BLACKPEPPER = 2, REAGENT_ID_WATER = 10) items = list( /obj/item/reagent_containers/food/snacks/tofu @@ -76,7 +76,7 @@ result = /obj/item/reagent_containers/food/snacks/bugball /datum/recipe/mammi - fruit = list("orange" = 1) + fruit = list(PLANT_ORANGE = 1) reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_FLOUR = 10, REAGENT_ID_MILK = 5, REAGENT_ID_SODIUMCHLORIDE = 1) result = /obj/item/reagent_containers/food/snacks/mammi @@ -91,7 +91,7 @@ result = /obj/item/reagent_containers/food/snacks/makaroni /datum/recipe/carpsushi - fruit = list("cabbage" = 1) + fruit = list(PLANT_CABBAGE = 1) reagents = list(REAGENT_ID_RICE = 20) items = list( /obj/item/reagent_containers/food/snacks/carpmeat, @@ -101,7 +101,7 @@ result = /obj/item/reagent_containers/food/snacks/sliceable/sushi /datum/recipe/lobster - fruit = list("lemon" = 1, "lettuce" = 1) + fruit = list(PLANT_LEMON = 1, PLANT_LETTUCE = 1) items = list( /obj/item/reagent_containers/food/snacks/lobster ) @@ -114,7 +114,7 @@ result = /obj/item/reagent_containers/food/snacks/cuttlefishcooked /datum/recipe/monkfish - fruit = list("chili" = 1, "onion" = 1) + fruit = list(PLANT_CHILI = 1, PLANT_ONION = 1) items = list( /obj/item/reagent_containers/food/snacks/monkfishfillet ) @@ -129,7 +129,7 @@ /datum/recipe/sharkdip reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1) - fruit = list("chili" = 1) + fruit = list(PLANT_CHILI = 1) items = list( /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat ) @@ -137,7 +137,7 @@ /datum/recipe/sharkcubes reagents = list(REAGENT_ID_SOYSAUCE = 5, REAGENT_ID_SODIUMCHLORIDE = 1) - fruit = list("potato" = 1) + fruit = list(PLANT_POTATO = 1) items = list( /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat ) @@ -151,7 +151,7 @@ result = /obj/item/storage/box/wings/tray /datum/recipe/bucket - fruit = list("durian" = 1) + fruit = list(PLANT_DURIAN = 1) items = list( /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -168,14 +168,14 @@ result = /obj/item/reagent_containers/food/snacks/grub_pink /datum/recipe/grub_blue - fruit = list("berries" = 1) + fruit = list(PLANT_BERRIES = 1) items = list( /obj/item/reagent_containers/food/snacks/grub ) result = /obj/item/reagent_containers/food/snacks/grub_blue /datum/recipe/grub_purple - fruit = list("grapes" = 1) + fruit = list(PLANT_GRAPES = 1) items = list( /obj/item/reagent_containers/food/snacks/grub ) diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index e5c84673c04..01268e6ff99 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -10,7 +10,7 @@ /datum/recipe/dionaroast appliance = OVEN - fruit = list("apple" = 1) + fruit = list(PLANT_APPLE = 1) reagents = list(REAGENT_ID_PACID = 5) //It dissolves the carapace. Still poisonous, though. items = list(/obj/item/holder/diona) result = /obj/item/reagent_containers/food/snacks/dionaroast @@ -18,7 +18,7 @@ /datum/recipe/monkeysdelight appliance = OVEN - fruit = list("banana" = 1) + fruit = list(PLANT_BANANA = 1) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1, REAGENT_ID_FLOUR = 10) items = list( /obj/item/reagent_containers/food/snacks/monkeycube @@ -46,7 +46,7 @@ /datum/recipe/turkey appliance = OVEN - fruit = list("potato" = 1) + fruit = list(PLANT_POTATO = 1) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1) items = list( /obj/item/reagent_containers/food/snacks/rawturkey, @@ -66,7 +66,7 @@ /datum/recipe/zestfish appliance = OVEN - fruit = list("lemon" = 1) + fruit = list(PLANT_LEMON = 1) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3) items = list( /obj/item/reagent_containers/food/snacks/carpmeat @@ -75,7 +75,7 @@ /datum/recipe/limezestfish appliance = OVEN - fruit = list("lime" = 1) + fruit = list(PLANT_LIME = 1) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3) items = list( /obj/item/reagent_containers/food/snacks/carpmeat @@ -181,7 +181,7 @@ /datum/recipe/bananabread appliance = OVEN - fruit = list("banana" = 1) + fruit = list(PLANT_BANANA = 1) reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 15) items = list( /obj/item/reagent_containers/food/snacks/dough, @@ -227,7 +227,7 @@ /datum/recipe/pie appliance = OVEN - fruit = list("banana" = 1) + fruit = list(PLANT_BANANA = 1) reagents = list(REAGENT_ID_SUGAR = 5) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/reagent_containers/food/snacks/pie @@ -249,26 +249,26 @@ /datum/recipe/plump_pie appliance = OVEN - fruit = list("plumphelmet" = 1) + fruit = list(PLANT_PLUMPHELMET = 1) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/reagent_containers/food/snacks/plump_pie /datum/recipe/applepie appliance = OVEN - fruit = list("apple" = 1) + fruit = list(PLANT_APPLE = 1) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/reagent_containers/food/snacks/applepie /datum/recipe/pumpkinpie appliance = OVEN - fruit = list("pumpkin" = 1) + fruit = list(PLANT_PUMPKIN = 1) reagents = list(REAGENT_ID_SUGAR = 5) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie /datum/recipe/appletart appliance = OVEN - fruit = list("goldapple" = 1) + fruit = list(PLANT_GOLDAPPLE = 1) reagents = list(REAGENT_ID_SUGAR = 10) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/reagent_containers/food/snacks/appletart @@ -277,7 +277,7 @@ /datum/recipe/keylimepie appliance = OVEN - fruit = list("lime" = 2) + fruit = list(PLANT_LIME = 2) reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10) result = /obj/item/reagent_containers/food/snacks/sliceable/keylimepie reagent_mix = RECIPE_REAGENT_REPLACE //No raw egg in finished product, protein after cooking causes magic meatballs otherwise @@ -336,13 +336,13 @@ /datum/recipe/cosmicbrownies appliance = OVEN reagents = list(REAGENT_ID_BROWNIEMIX = 10, REAGENT_ID_EGG = 3) - fruit = list("ambrosia" = 1) + fruit = list(PLANT_AMBROSIA = 1) reagent_mix = RECIPE_REAGENT_REPLACE //No egg or mix in final recipe result = /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies /datum/recipe/buchedenoel appliance = OVEN - fruit = list("berries" = 2) + fruit = list(PLANT_BERRIES = 2) reagents = list(REAGENT_ID_CAKEBATTER = 20, REAGENT_ID_CREAM = 10, REAGENT_ID_COCO = 5) result = /obj/item/reagent_containers/food/snacks/sliceable/buchedenoel @@ -357,7 +357,7 @@ /datum/recipe/jaffacake appliance = OVEN - fruit = list("orange" = 1) + fruit = list(PLANT_ORANGE = 1) reagents = list(REAGENT_ID_CAKEBATTER = 15, REAGENT_ID_COCO = 10) result = /obj/item/reagent_containers/food/snacks/jaffacake result_quantity = 6 @@ -366,7 +366,7 @@ //========================= /datum/recipe/pizzamargherita appliance = OVEN - fruit = list("tomato" = 1) + fruit = list(PLANT_TOMATO = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/cheesewedge, @@ -378,7 +378,7 @@ /datum/recipe/meatpizza appliance = OVEN - fruit = list("tomato" = 1) + fruit = list(PLANT_TOMATO = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/meat, @@ -390,7 +390,7 @@ /datum/recipe/syntipizza appliance = OVEN - fruit = list("tomato" = 1) + fruit = list(PLANT_TOMATO = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/meat/syntiflesh, @@ -402,7 +402,7 @@ /datum/recipe/mushroompizza appliance = OVEN - fruit = list("mushroom" = 5, "tomato" = 1) + fruit = list("mushroom" = 5, PLANT_TOMATO = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/cheesewedge @@ -413,7 +413,7 @@ /datum/recipe/vegetablepizza appliance = OVEN - fruit = list("eggplant" = 1, "carrot" = 1, "corn" = 1, "tomato" = 1) + fruit = list(PLANT_EGGPLANT = 1, PLANT_CARROT = 1, PLANT_CORN = 1, PLANT_TOMATO = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/cheesewedge @@ -422,7 +422,7 @@ /datum/recipe/pineapplepizza appliance = OVEN - fruit = list("tomato" = 1) + fruit = list(PLANT_TOMATO = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/cheesewedge, @@ -436,7 +436,7 @@ /datum/recipe/enchiladas appliance = OVEN - fruit = list("chili" = 2) + fruit = list(PLANT_CHILI = 2) items = list( /obj/item/reagent_containers/food/snacks/cutlet, /obj/item/reagent_containers/food/snacks/tortilla @@ -454,7 +454,7 @@ /datum/recipe/cake/carrot appliance = OVEN - fruit = list("carrot" = 3) + fruit = list(PLANT_CARROT = 3) reagents = list(REAGENT_ID_CAKEBATTER = 30) result = /obj/item/reagent_containers/food/snacks/sliceable/carrotcake @@ -468,25 +468,25 @@ result = /obj/item/reagent_containers/food/snacks/sliceable/cheesecake /datum/recipe/cake/peanut - fruit = list("peanut" = 1) + fruit = list(PLANT_PEANUT = 1) reagents = list(REAGENT_ID_CAKEBATTER = 30, REAGENT_ID_PEANUTBUTTER = 5) result = /obj/item/reagent_containers/food/snacks/sliceable/peanutcake /datum/recipe/cake/orange appliance = OVEN - fruit = list("orange" = 2) + fruit = list(PLANT_ORANGE = 2) reagents = list(REAGENT_ID_CAKEBATTER = 30) result = /obj/item/reagent_containers/food/snacks/sliceable/orangecake /datum/recipe/cake/lime appliance = OVEN - fruit = list("lime" = 2) + fruit = list(PLANT_LIME = 2) reagents = list(REAGENT_ID_CAKEBATTER = 30) result = /obj/item/reagent_containers/food/snacks/sliceable/limecake /datum/recipe/cake/lemon appliance = OVEN - fruit = list("lemon" = 2) + fruit = list(PLANT_LEMON = 2) reagents = list(REAGENT_ID_CAKEBATTER = 30) result = /obj/item/reagent_containers/food/snacks/sliceable/lemoncake @@ -503,7 +503,7 @@ /datum/recipe/cake/apple appliance = OVEN - fruit = list("apple" = 2) + fruit = list(PLANT_APPLE = 2) reagents = list(REAGENT_ID_CAKEBATTER = 30) result = /obj/item/reagent_containers/food/snacks/sliceable/applecake @@ -525,7 +525,7 @@ /datum/recipe/pancakes/berry appliance = OVEN - fruit = list("berries" = 2) + fruit = list(PLANT_BERRIES = 2) reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 15) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, @@ -536,7 +536,7 @@ /datum/recipe/lasagna appliance = OVEN - fruit = list("tomato" = 2, "eggplant" = 1) + fruit = list(PLANT_TOMATO = 2, PLANT_EGGPLANT = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/sliceable/flatdough, @@ -582,7 +582,7 @@ /datum/recipe/bacon_flatbread appliance = OVEN - fruit = list("tomato" = 2) + fruit = list(PLANT_TOMATO = 2) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/cheesewedge, @@ -651,13 +651,13 @@ /datum/recipe/loadedbakedpotatooven appliance = OVEN - fruit = list("potato" = 1) + fruit = list(PLANT_POTATO = 1) items = list(/obj/item/reagent_containers/food/snacks/cheesewedge) result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato /datum/recipe/meatbun appliance = OVEN - fruit = list("cabbage" = 1) + fruit = list(PLANT_CABBAGE = 1) reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/meatball, @@ -703,7 +703,7 @@ /datum/recipe/veggiemomo appliance = OVEN reagents = list(REAGENT_ID_SPACESPICE = 2, REAGENT_ID_WATER = 5) - fruit = list("carrot" = 1, "cabbage" = 1) + fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1) items = list( /obj/item/reagent_containers/food/snacks/doughslice, /obj/item/reagent_containers/food/snacks/doughslice, diff --git a/code/modules/hydroponics/fruit_spawner.dm b/code/modules/hydroponics/fruit_spawner.dm index 4ebbff50d17..eaaa92f1bed 100644 --- a/code/modules/hydroponics/fruit_spawner.dm +++ b/code/modules/hydroponics/fruit_spawner.dm @@ -17,312 +17,312 @@ /obj/fruitspawner/cabbage name = "cabbage spawner" - seedtype = "cabbage" + seedtype = PLANT_CABBAGE icon_state = "cabbage" /obj/fruitspawner/ambrosia name = "ambrosia spawner" - seedtype = "ambrosia" + seedtype = PLANT_AMBROSIA icon_state = "ambrosia" /obj/fruitspawner/apple name = "apple spawner" - seedtype = "apple" + seedtype = PLANT_APPLE icon_state = "apple" /obj/fruitspawner/banana name = "banana spawner" - seedtype = "banana" + seedtype = PLANT_BANANA icon_state = "bananas" /obj/fruitspawner/berry name = "berry spawner" - seedtype = "berries" + seedtype = PLANT_BERRIES icon_state = "berry" /obj/fruitspawner/carrot name = "carrot spawner" - seedtype = "carrot" + seedtype = PLANT_CARROT icon_state = "carrot" /obj/fruitspawner/celery name = "celery spawner" - seedtype = "celery" + seedtype = PLANT_CELERY icon_state = "stalk" /obj/fruitspawner/cherry name = "cherry spawner" - seedtype = "cherry" + seedtype = PLANT_CHERRY icon_state = "cherry" /obj/fruitspawner/chili name = "chili spawner" - seedtype = "chili" + seedtype = PLANT_CHILI icon_state = "chili" /obj/fruitspawner/icechili name = "icechili spawner" - seedtype = "icechili" + seedtype = PLANT_ICECHILI icon_state = "chili" /obj/fruitspawner/ghostchili name = "ghost chili spawner" - seedtype = "ghostchili" + seedtype = PLANT_GHOSTCHILI icon_state = "chili" /obj/fruitspawner/lime name = "lime spawner" - seedtype = "lime" + seedtype = PLANT_LIME icon_state = "treefruit" /obj/fruitspawner/lemon name = "lemon spawner" - seedtype = "lemon" + seedtype = PLANT_LEMON icon_state = "lemon" /obj/fruitspawner/orange name = "orange spawner" - seedtype = "orange" + seedtype = PLANT_ORANGE icon_state = "treefruit" /obj/fruitspawner/cocoa name = "cocoa spawner" - seedtype = "cocoa" + seedtype = PLANT_COCOA icon_state = "treefruit" /obj/fruitspawner/corn name = "corn spawner" - seedtype = "corn" + seedtype = PLANT_CORN icon_state = "corn" /obj/fruitspawner/diona name = "diona spawner" - seedtype = "diona" + seedtype = PLANT_DIONA icon_state = "diona" /obj/fruitspawner/durian name = "durian spawner" - seedtype = "durian" + seedtype = PLANT_DURIAN icon_state = "spinefruit" /obj/fruitspawner/eggplant name = "eggplant spawner" - seedtype = "eggplant" + seedtype = PLANT_EGGPLANT icon_state = "eggplant" /obj/fruitspawner/harebells name = "harebells spawner" - seedtype = "harebells" + seedtype = PLANT_HAREBELLS icon_state = "flower5" /obj/fruitspawner/poppies name = "poppies spawner" - seedtype = "poppies" + seedtype = PLANT_POPPIES icon_state = "flower3" /obj/fruitspawner/sunflowers name = "sunflowers spawner" - seedtype = "sunflowers" + seedtype = PLANT_SUNFLOWERS icon_state = "flower2" /obj/fruitspawner/lavender name = "lavender spawner" - seedtype = "lavender" + seedtype = PLANT_LAVENDER icon_state = "flower6" /obj/fruitspawner/rose name = "rose spawner" - seedtype = "rose" + seedtype = PLANT_ROSE icon_state = "flowers" /obj/fruitspawner/bloodrose name = "bloodrose spawner" - seedtype = "bloodrose" + seedtype = PLANT_BLOODROSE icon_state = "flowers" /obj/fruitspawner/gnomes name = "gnomes spawner" - seedtype = "gnomes" + seedtype = PLANT_GNOMES icon_state = "gnomes" /obj/fruitspawner/grapes name = "grapes spawner" - seedtype = "grapes" + seedtype = PLANT_GRAPES icon_state = "grapes" /obj/fruitspawner/greengrapes name = "greengrapes spawner" - seedtype = "greengrapes" + seedtype = PLANT_GREENGRAPES icon_state = "grapes" /obj/fruitspawner/grass name = "grass spawner" - seedtype = "grass" + seedtype = PLANT_GRASS icon_state = "grass" /obj/fruitspawner/carpet name = "carpet spawner" - seedtype = "carpet" + seedtype = PLANT_CARPET icon_state = "grass" /obj/fruitspawner/kudzu name = "kudzu spawner" - seedtype = "kudzu" + seedtype = PLANT_KUDZU icon_state = "treefruit" /obj/fruitspawner/lettuce name = "lettuce spawner" - seedtype = "lettuce" + seedtype = PLANT_LETTUCE icon_state = "lettuce" /obj/fruitspawner/siflettuce name = "siflettuce spawner" - seedtype = "siflettuce" + seedtype = PLANT_SIFLETTUCE icon_state = "lettuce" /obj/fruitspawner/mtear name = "mtear spawner" - seedtype = "mtear" + seedtype = PLANT_MTEAR icon_state = "alien4" /obj/fruitspawner/mushrooms name = "chanterelle spawner" - seedtype = "mushrooms" + seedtype = PLANT_MUSHROOMS icon_state = "mushroom4" /obj/fruitspawner/mold name = "mold spawner" - seedtype = "mold" + seedtype = PLANT_MOLD icon_state = "mushroom5" /obj/fruitspawner/plumphelmet name = "plumphelmet spawner" - seedtype = "plumphelmet" + seedtype = PLANT_PLUMPHELMET icon_state = "mushroom10" /obj/fruitspawner/reishi name = "reishi spawner" - seedtype = "reishi" + seedtype = PLANT_REISHI icon_state = "mushroom11" /obj/fruitspawner/libertycap name = "libertycap spawner" - seedtype = "libertycap" + seedtype = PLANT_LIBERTYCAP icon_state = "mushroom8" /obj/fruitspawner/amanita name = "amanita spawner" - seedtype = "amanita" + seedtype = PLANT_AMANITA icon_state = "mushroom" /obj/fruitspawner/destroyingangel name = "destroyingangel spawner" - seedtype = "destroyingangel" + seedtype = PLANT_DESTROYINGANGEL icon_state = "mushroom3" /obj/fruitspawner/towercap name = "towercap spawner" - seedtype = "towercap" + seedtype = PLANT_TOWERCAP icon_state = "mushroom7" /obj/fruitspawner/redcap name = "redcap spawner" - seedtype = "redcap" + seedtype = PLANT_REDCAP icon_state = "mushroom7" /obj/fruitspawner/glowshroom name = "glowshroom spawner" - seedtype = "glowshroom" + seedtype = PLANT_GLOWSHROOM icon_state = "mushroom2" /obj/fruitspawner/plastic name = "plastic spawner" - seedtype = "plastic" + seedtype = PLANT_PLASTIC icon_state = "mushroom6" /obj/fruitspawner/sporeshroom name = "sporeshroom spawner" - seedtype = "sporeshroom" + seedtype = PLANT_SPORESHROOM icon_state = "mushroom5" /obj/fruitspawner/nettle name = "nettle spawner" - seedtype = "nettle" + seedtype = PLANT_NETTLE icon_state = "nettles" /obj/fruitspawner/deathnettle name = "deathnettle spawner" - seedtype = "deathnettle" + seedtype = PLANT_DEATHNETTLE icon_state = "nettles" /obj/fruitspawner/onion name = "onion spawner" - seedtype = "onion" + seedtype = PLANT_ONION icon_state = "onion" /obj/fruitspawner/peanut name = "peanut spawner" - seedtype = "peanut" + seedtype = PLANT_PEANUT icon_state = "nuts" /obj/fruitspawner/pineapple name = "pineapple spawner" - seedtype = "pineapple" + seedtype = PLANT_PINEAPPLE icon_state = "pineapple" /obj/fruitspawner/spineapple name = "spineapple spawner" - seedtype = "spineapple" + seedtype = PLANT_SPINEAPPLE icon_state = "pineapple" /obj/fruitspawner/potato name = "potato spawner" - seedtype = "potato" + seedtype = PLANT_POTATO icon_state = "potato" /obj/fruitspawner/pumpkin name = "pumpkin spawner" - seedtype = "pumpkin" + seedtype = PLANT_PUMPKIN icon_state = "vine2" /obj/fruitspawner/rhubarb name = "rhubarb spawner" - seedtype = "rhubarb" + seedtype = PLANT_ROSE icon_state = "stalk" /obj/fruitspawner/rice name = "rice spawner" - seedtype = "rice" + seedtype = PLANT_RICE icon_state = "rice" /obj/fruitspawner/shand name = "selems hand spawner" - seedtype = "shand" + seedtype = PLANT_SHAND icon_state = "alien3" /obj/fruitspawner/soybean name = "soybean spawner" - seedtype = "soybean" + seedtype = PLANT_SOYBEAN icon_state = "bean" /obj/fruitspawner/sugarcane name = "sugarcane spawner" - seedtype = "sugarcane" + seedtype = PLANT_SUGARCANE icon_state = "stalk" /obj/fruitspawner/telriis name = "telriis spawner" - seedtype = "telriis" + seedtype = PLANT_TELRIIS icon_state = "ambrosia" /obj/fruitspawner/thaadra name = "thaadra spawner" - seedtype = "thaadra" + seedtype = PLANT_THAADRA icon_state = "grass" /obj/fruitspawner/tobacco name = "tobacco spawner" - seedtype = "tobacco" + seedtype = PLANT_TOBACCO icon_state = "leafy" /obj/fruitspawner/stimbush @@ -332,65 +332,65 @@ /obj/fruitspawner/tomato name = "tomato spawner" - seedtype = "tomato" + seedtype = PLANT_TOMATO icon_state = "tomato" /obj/fruitspawner/bloodtomato name = "bloodtomato spawner" - seedtype = "bloodtomato" + seedtype = PLANT_BLOODTOMATO icon_state = "tomato" /obj/fruitspawner/bluetomato name = "bluetomato spawner" - seedtype = "bluetomato" + seedtype = PLANT_BLUETOMATO icon_state = "tomato" /obj/fruitspawner/bluespacetomato name = "bluespacetomato spawner" - seedtype = "bluespacetomato" + seedtype = PLANT_BLUESPACETOMATO icon_state = "tomato" /obj/fruitspawner/vanilla name = "vanilla spawner" - seedtype = "vanilla" + seedtype = PLANT_VANILLA icon_state = "chili" /obj/fruitspawner/whitewabback name = "whitewabback spawner" - seedtype = "whitewabback" + seedtype = PLANT_WHITEWABBACK icon_state = "carrot2" /obj/fruitspawner/blackwabback name = "blackwabback spawner" - seedtype = "blackwabback" + seedtype = PLANT_BLACKWABBACK icon_state = "carrot2" /obj/fruitspawner/wildwabback name = "wildwabback spawner" - seedtype = "wildwabback" + seedtype = PLANT_WILDWABBACK icon_state = "carrot2" /obj/fruitspawner/watermelon name = "watermelon spawner" - seedtype = "watermelon" + seedtype = PLANT_WATERMELON icon_state = "vine" /obj/fruitspawner/weeds name = "weeds spawner" - seedtype = "weeds" + seedtype = PLANT_WEEDS icon_state = "flower4" /obj/fruitspawner/wheat name = "wheat spawner" - seedtype = "wheat" + seedtype = PLANT_WHEAT icon_state = "wheat" /obj/fruitspawner/whitebeet name = "whitebeet spawner" - seedtype = "whitebeet" + seedtype = PLANT_WHITEBEET icon_state = "carrot2" /obj/fruitspawner/wurmwoad name = "wurmwoad spawner" - seedtype = "wurmwoad" + seedtype = PLANT_WURMWOAD icon_state = "eyepod" diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 01d1c0c9b80..7e7629b0dac 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -188,7 +188,7 @@ if(W.sharp) - if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful. + if(seed.kitchen_tag == PLANT_PUMPKIN) // Ugggh these checks are awful. user.show_message(span_notice("You carve a face into [src]!"), 1) new /obj/item/clothing/head/pumpkinhead (user.loc) qdel(src) @@ -214,13 +214,13 @@ qdel(src) return - if(seed.kitchen_tag == "sunflower") + if(seed.kitchen_tag == PLANT_SUNFLOWERS) new /obj/item/reagent_containers/food/snacks/rawsunflower(get_turf(src)) to_chat(user, span_notice("You remove the seeds from the flower, slightly damaging them.")) qdel(src) return - if(seed.kitchen_tag == "potato" || !isnull(seed.chems["potato"])) + if(seed.kitchen_tag == PLANT_POTATO || !isnull(seed.chems[REAGENT_ID_POTATOJUICE])) to_chat(user, span_filter_notice("You slice \the [src] into sticks.")) new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src)) qdel(src) @@ -289,7 +289,7 @@ if(src) qdel(src) return - if(seed.kitchen_tag == "grass") + if(seed.kitchen_tag == PLANT_GRASS) user.show_message(span_notice("You make a grass tile out of \the [src]!"), 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR) if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR) @@ -306,7 +306,7 @@ qdel(src) return - if(seed.kitchen_tag == "carpet") + if(seed.kitchen_tag == PLANT_CARPET) user.show_message(span_notice("You shape some carpet squares out of \the [src] fibers!"), 1) for(var/i=0,i<2,i++) var/obj/item/stack/tile/carpet/G = new (user.loc) @@ -330,13 +330,13 @@ /* if(seed.kitchen_tag) switch(seed.kitchen_tag) - if("shand") + if(PLANT_SHAND) var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc) poultice.heal_brute = potency to_chat(user, span_notice("You mash the leaves into a poultice.")) qdel(src) return - if("mtear") + if(PLANT_MTEAR) var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc) poultice.heal_burn = potency to_chat(user, span_notice("You mash the petals into a poultice.")) @@ -362,10 +362,10 @@ // Predefined types for placing on the map. /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap - plantname = "libertycap" + plantname = PLANT_LIBERTYCAP /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris - plantname = "ambrosia" + plantname = PLANT_AMBROSIA /obj/item/reagent_containers/food/snacks/fruit_slice name = "fruit slice" diff --git a/code/modules/hydroponics/grown_predefined.dm b/code/modules/hydroponics/grown_predefined.dm index 196f72c6678..66e1f8ee331 100644 --- a/code/modules/hydroponics/grown_predefined.dm +++ b/code/modules/hydroponics/grown_predefined.dm @@ -1,5 +1,5 @@ /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris - plantname = "ambrosia" + plantname = PLANT_AMBROSIA /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus - plantname = "ambrosiadeus" + plantname = PLANT_AMBROSIADEUS diff --git a/code/modules/hydroponics/grown_sif.dm b/code/modules/hydroponics/grown_sif.dm index c55600c756b..60541ddc001 100644 --- a/code/modules/hydroponics/grown_sif.dm +++ b/code/modules/hydroponics/grown_sif.dm @@ -21,16 +21,16 @@ . = ..() /obj/item/reagent_containers/food/snacks/grown/sif/sifpod - plantname = "sifbulb" + plantname = PLANT_SIFBULB /obj/item/reagent_containers/food/snacks/grown/sif/wabback plantname = "wabback" /obj/item/reagent_containers/food/snacks/grown/sif/blackwabback - plantname = "blackwabback" + plantname = PLANT_BLACKWABBACK /obj/item/reagent_containers/food/snacks/grown/sif/wildwabback - plantname = "wildwabback" + plantname = PLANT_WILDWABBACK /obj/item/reagent_containers/food/snacks/grown/sif/eyebulbs plantname = "eyebulbs" diff --git a/code/modules/hydroponics/seed_datums_vr.dm b/code/modules/hydroponics/seed_datums_vr.dm index 02c1c9b3706..a6b50a0308a 100644 --- a/code/modules/hydroponics/seed_datums_vr.dm +++ b/code/modules/hydroponics/seed_datums_vr.dm @@ -2,11 +2,11 @@ //Vore Originals /datum/seed/size - name = "microm" + name = PLANT_MICROM seed_name = "Shrinking Mushroom" display_name = "Shrinking mushroom trees" - mutants = list("megam") - kitchen_tag = "microm" + mutants = list(PLANT_MEGAM) + kitchen_tag = PLANT_MICROM chems = list(REAGENT_ID_MICROCILLIN = list(1,20)) /datum/seed/size/New() @@ -22,11 +22,11 @@ /datum/seed/size/megam - name = "megam" + name = PLANT_MEGAM seed_name = "Mega Mushroom" display_name = "Mega mushroom trees" - mutants = list("microm") - kitchen_tag = "megam" + mutants = list(PLANT_MICROM) + kitchen_tag = PLANT_MEGAM chems = list(REAGENT_ID_MACROCILLIN = list(1,20)) /datum/seed/size/megam/New() diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index 15743656174..fec080d8dcc 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -83,277 +83,283 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) . = ..() /obj/item/seeds/replicapod - seed_type = "diona" + seed_type = PLANT_DIONA /obj/item/seeds/chiliseed - seed_type = "chili" + seed_type = PLANT_CHILI /obj/item/seeds/ghostchiliseed - seed_type = "ghostchili" + seed_type = PLANT_GHOSTCHILI /obj/item/seeds/plastiseed - seed_type = "plastic" + seed_type = PLANT_PLASTIC /obj/item/seeds/grapeseed - seed_type = "grapes" + seed_type = PLANT_GRAPES /obj/item/seeds/greengrapeseed - seed_type = "greengrapes" + seed_type = PLANT_GREENGRAPES /obj/item/seeds/peanutseed - seed_type = "peanut" + seed_type = PLANT_PEANUT /obj/item/seeds/cabbageseed - seed_type = "cabbage" + seed_type = PLANT_CABBAGE /obj/item/seeds/shandseed - seed_type = "shand" + seed_type = PLANT_SHAND /obj/item/seeds/mtearseed - seed_type = "mtear" + seed_type = PLANT_MTEAR /obj/item/seeds/berryseed - seed_type = "berries" + seed_type = PLANT_BERRIES /obj/item/seeds/glowberryseed - seed_type = "glowberries" + seed_type = PLANT_GLOWBERRIES /obj/item/seeds/peppercornseed - seed_type = "peppercorns" + seed_type = PLANT_PEPPERCORNS /obj/item/seeds/bananaseed - seed_type = "banana" + seed_type = PLANT_BANANA /obj/item/seeds/eggplantseed - seed_type = "eggplant" + seed_type = PLANT_EGGPLANT /obj/item/seeds/bloodtomatoseed - seed_type = "bloodtomato" + seed_type = PLANT_BLOODTOMATO /obj/item/seeds/tomatoseed - seed_type = "tomato" + seed_type = PLANT_TOMATO /obj/item/seeds/killertomatoseed - seed_type = "killertomato" + seed_type = PLANT_KILLERTOMATO /obj/item/seeds/bluetomatoseed - seed_type = "bluetomato" + seed_type = PLANT_BLUETOMATO /obj/item/seeds/bluespacetomatoseed - seed_type = "bluespacetomato" + seed_type = PLANT_BLUESPACETOMATO /obj/item/seeds/cornseed - seed_type = "corn" + seed_type = PLANT_CORN /obj/item/seeds/poppyseed - seed_type = "poppies" + seed_type = PLANT_POPPIES /obj/item/seeds/potatoseed - seed_type = "potato" + seed_type = PLANT_POTATO /obj/item/seeds/icepepperseed - seed_type = "icechili" + seed_type = PLANT_ICECHILI /obj/item/seeds/soyaseed - seed_type = "soybean" + seed_type = PLANT_SOYBEAN /obj/item/seeds/wheatseed - seed_type = "wheat" + seed_type = PLANT_WHEAT /obj/item/seeds/riceseed - seed_type = "rice" + seed_type = PLANT_RICE /obj/item/seeds/carrotseed - seed_type = "carrot" + seed_type = PLANT_CARROT /obj/item/seeds/reishimycelium - seed_type = "reishi" + seed_type = PLANT_REISHI /obj/item/seeds/amanitamycelium - seed_type = "amanita" + seed_type = PLANT_AMANITA /obj/item/seeds/angelmycelium - seed_type = "destroyingangel" + seed_type = PLANT_DESTROYINGANGEL /obj/item/seeds/libertymycelium - seed_type = "libertycap" + seed_type = PLANT_LIBERTYCAP /obj/item/seeds/chantermycelium - seed_type = "mushrooms" + seed_type = PLANT_MUSHROOMS /obj/item/seeds/towermycelium - seed_type = "towercap" + seed_type = PLANT_TOWERCAP /obj/item/seeds/redtowermycelium - seed_type = "redcap" + seed_type = PLANT_REDCAP /obj/item/seeds/glowshroom - seed_type = "glowshroom" + seed_type = PLANT_GLOWSHROOM /obj/item/seeds/plumpmycelium - seed_type = "plumphelmet" + seed_type = PLANT_PLUMPHELMET /obj/item/seeds/plastellmycelium - seed_type = "plastic" + seed_type = PLANT_PLASTIC /obj/item/seeds/sporemycelium - seed_type = "sporeshroom" + seed_type = PLANT_SPORESHROOM /obj/item/seeds/nettleseed - seed_type = "nettle" + seed_type = PLANT_NETTLE /obj/item/seeds/deathnettleseed - seed_type = "deathnettle" + seed_type = PLANT_DEATHNETTLE /obj/item/seeds/weeds - seed_type = "weeds" + seed_type = PLANT_WEEDS /obj/item/seeds/harebell - seed_type = "harebells" + seed_type = PLANT_HAREBELLS /obj/item/seeds/sunflowerseed - seed_type = "sunflowers" + seed_type = PLANT_SUNFLOWERS /obj/item/seeds/lavenderseed - seed_type = "lavender" + seed_type = PLANT_LAVENDER /obj/item/seeds/brownmold - seed_type = "mold" + seed_type = PLANT_MOLD /obj/item/seeds/appleseed - seed_type = "apple" + seed_type = PLANT_APPLE /obj/item/seeds/poisonedappleseed - seed_type = "poisonapple" + seed_type = PLANT_POISONAPPLE /obj/item/seeds/goldappleseed - seed_type = "goldapple" + seed_type = PLANT_GOLDAPPLE /obj/item/seeds/ambrosiavulgarisseed - seed_type = "ambrosia" + seed_type = PLANT_AMBROSIA /obj/item/seeds/ambrosiadeusseed - seed_type = "ambrosiadeus" + seed_type = PLANT_AMBROSIADEUS /obj/item/seeds/ambrosiagaiaseed - seed_type = "ambrosiagaia" + seed_type = PLANT_AMBROSIAGAIA /obj/item/seeds/ambrosiainfernusseed - seed_type = "ambrosiainfernus" + seed_type = PLANT_AMBROSIAINFERNUS /obj/item/seeds/whitebeetseed - seed_type = "whitebeet" + seed_type = PLANT_WHITEBEET /obj/item/seeds/sugarcaneseed - seed_type = "sugarcane" + seed_type = PLANT_SUGARCANE /obj/item/seeds/watermelonseed - seed_type = "watermelon" + seed_type = PLANT_WATERMELON /obj/item/seeds/pumpkinseed - seed_type = "pumpkin" + seed_type = PLANT_PUMPKIN /obj/item/seeds/limeseed - seed_type = "lime" + seed_type = PLANT_LIME /obj/item/seeds/lemonseed - seed_type = "lemon" + seed_type = PLANT_LEMON /obj/item/seeds/onionseed - seed_type = "onion" + seed_type = PLANT_ONION /obj/item/seeds/orangeseed - seed_type = "orange" + seed_type = PLANT_ORANGE /obj/item/seeds/poisonberryseed - seed_type = "poisonberries" + seed_type = PLANT_POISONBERRIES /obj/item/seeds/deathberryseed - seed_type = "deathberries" + seed_type = PLANT_DEATHBERRIES /obj/item/seeds/grassseed - seed_type = "grass" + seed_type = PLANT_GRASS /obj/item/seeds/carpetseed - seed_type = "carpet" + seed_type = PLANT_CARPET /obj/item/seeds/cocoapodseed - seed_type = "cocoa" + seed_type = PLANT_COCOA /obj/item/seeds/cherryseed - seed_type = "cherry" + seed_type = PLANT_CHERRY /obj/item/seeds/tobaccoseed - seed_type = "tobacco" + seed_type = PLANT_TOBACCO /obj/item/seeds/kudzuseed - seed_type = "kudzu" + seed_type = PLANT_KUDZU /obj/item/seeds/jurlmah - seed_type = "jurlmah" + seed_type = PLANT_JURLMAH /obj/item/seeds/amauri - seed_type = "amauri" + seed_type = PLANT_AMAURI /obj/item/seeds/gelthi - seed_type = "gelthi" + seed_type = PLANT_GELTHI /obj/item/seeds/vale - seed_type = "vale" + seed_type = PLANT_VALE /obj/item/seeds/surik - seed_type = "surik" + seed_type = PLANT_SURIK /obj/item/seeds/telriis - seed_type = "telriis" + seed_type = PLANT_TELRIIS /obj/item/seeds/thaadra - seed_type = "thaadra" + seed_type = PLANT_THAADRA /obj/item/seeds/celery - seed_type = "celery" + seed_type = PLANT_CELERY /obj/item/seeds/rhubarb - seed_type = "rhubarb" + seed_type = PLANT_ROSE /obj/item/seeds/wabback - seed_type = "whitewabback" + seed_type = PLANT_WHITEWABBACK /obj/item/seeds/blackwabback - seed_type = "blackwabback" + seed_type = PLANT_BLACKWABBACK /obj/item/seeds/wildwabback - seed_type = "wildwabback" + seed_type = PLANT_WILDWABBACK /obj/item/seeds/lettuce - seed_type = "lettuce" + seed_type = PLANT_LETTUCE /obj/item/seeds/siflettuce - seed_type = "siflettuce" + seed_type = PLANT_SIFLETTUCE /obj/item/seeds/eggyplant - seed_type = "egg-plant" + seed_type = PLANT_EGGPLANT /obj/item/seeds/pineapple - seed_type = "pineapple" + seed_type = PLANT_PINEAPPLE /obj/item/seeds/durian - seed_type = "durian" + seed_type = PLANT_DURIAN /obj/item/seeds/vanilla - seed_type = "vanilla" + seed_type = PLANT_VANILLA /obj/item/seeds/rose - seed_type = "rose" + seed_type = PLANT_ROSE /obj/item/seeds/rose/blood - seed_type = "bloodrose" + seed_type = PLANT_BLOODROSE /obj/item/seeds/gnomes - seed_type = "gnomes" + seed_type = PLANT_GNOMES /obj/item/seeds/sifbulb - seed_type = "sifbulb" + seed_type = PLANT_SIFBULB /obj/item/seeds/wurmwoad - seed_type = "wurmwoad" + seed_type = PLANT_WURMWOAD + +/obj/item/seeds/shrinkshroom + seed_type = PLANT_MICROM + +/obj/item/seeds/megashroom + seed_type = PLANT_MEGAM diff --git a/code/modules/hydroponics/seed_packets_vr.dm b/code/modules/hydroponics/seed_packets_vr.dm deleted file mode 100644 index 82eaaf5d389..00000000000 --- a/code/modules/hydroponics/seed_packets_vr.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/item/seeds/shrinkshroom - seed_type = "microm" - -/obj/item/seeds/megashroom - seed_type = "megam" diff --git a/code/modules/hydroponics/seedtypes/amauri.dm b/code/modules/hydroponics/seedtypes/amauri.dm index c3d5e893111..c6cb81c3bc9 100644 --- a/code/modules/hydroponics/seedtypes/amauri.dm +++ b/code/modules/hydroponics/seedtypes/amauri.dm @@ -1,8 +1,8 @@ /datum/seed/amauri - name = "amauri" - seed_name = "amauri" + name = PLANT_AMAURI + seed_name = PLANT_AMAURI display_name = "amauri plant" - kitchen_tag = "amauri" + kitchen_tag = PLANT_AMAURI chems = list(REAGENT_ID_ZOMBIEPOWDER = list(1,10),REAGENT_ID_CONDENSEDCAPSAICIN = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/amauri/New() diff --git a/code/modules/hydroponics/seedtypes/ambrosia.dm b/code/modules/hydroponics/seedtypes/ambrosia.dm index b7b83ff848a..c548bd442cc 100644 --- a/code/modules/hydroponics/seedtypes/ambrosia.dm +++ b/code/modules/hydroponics/seedtypes/ambrosia.dm @@ -1,10 +1,10 @@ //Ambrosia/varieties. /datum/seed/ambrosia - name = "ambrosia" + name = PLANT_AMBROSIA seed_name = "ambrosia vulgaris" display_name = "ambrosia vulgaris" - kitchen_tag = "ambrosia" - mutants = list("ambrosiadeus") + kitchen_tag = PLANT_AMBROSIA + mutants = list(PLANT_AMBROSIADEUS) chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), REAGENT_ID_KELOTANE = list(1,8,1), REAGENT_ID_BICARIDINE = list(1,10,1)) /datum/seed/ambrosia/New() @@ -20,11 +20,11 @@ set_trait(TRAIT_IDEAL_LIGHT, 6) /datum/seed/ambrosia/deus - name = "ambrosiadeus" + name = PLANT_AMBROSIADEUS seed_name = "ambrosia deus" display_name = "ambrosia deus" - kitchen_tag = "ambrosiadeus" - mutants = list("ambrosiainfernus", "ambrosiagaia") + kitchen_tag = PLANT_AMBROSIADEUS + mutants = list(PLANT_AMBROSIAINFERNUS, PLANT_AMBROSIAGAIA) chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_BICARIDINE = list(1,8), REAGENT_ID_SYNAPTIZINE = list(1,8,1), REAGENT_ID_HYPERZINE = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10)) /datum/seed/ambrosia/deus/New() @@ -33,10 +33,10 @@ set_trait(TRAIT_PLANT_COLOUR,"#2A9C61") /datum/seed/ambrosia/infernus - name = "ambrosiainfernus" + name = PLANT_AMBROSIAINFERNUS seed_name = "ambrosia infernus" display_name = "ambrosia infernus" - kitchen_tag = "ambrosiainfernus" + kitchen_tag = PLANT_AMBROSIAINFERNUS mutants = null chems = list(REAGENT_ID_NUTRIMENT = list(1,3), REAGENT_ID_OXYCODONE = list(1,8), REAGENT_ID_IMPEDREZENE = list(1,10), REAGENT_ID_MINDBREAKER = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10)) @@ -46,10 +46,10 @@ set_trait(TRAIT_PLANT_COLOUR,"#b22222") /datum/seed/ambrosia/gaia - name = "ambrosiagaia" + name = PLANT_AMBROSIAGAIA seed_name = "ambrosia gaia" display_name = "ambrosia gaia" - kitchen_tag = "ambrosiagaia" + kitchen_tag = PLANT_AMBROSIAGAIA mutants = null chems = list (REAGENT_ID_EARTHSBLOOD = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3)) diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm index 09f3075249e..25a4af5c003 100644 --- a/code/modules/hydroponics/seedtypes/apples.dm +++ b/code/modules/hydroponics/seedtypes/apples.dm @@ -1,10 +1,10 @@ //Apples/varieties. /datum/seed/apple - name = "apple" - seed_name = "apple" + name = PLANT_APPLE + seed_name = PLANT_APPLE display_name = "apple tree" - kitchen_tag = "apple" - mutants = list("poisonapple","goldapple") + kitchen_tag = PLANT_APPLE + mutants = list(PLANT_POISONAPPLE,PLANT_GOLDAPPLE) chems = list(REAGENT_ID_NUTRIMENT = list(1,10),REAGENT_ID_APPLEJUICE = list(10,20)) /datum/seed/apple/New() @@ -21,15 +21,15 @@ set_trait(TRAIT_IDEAL_LIGHT, 4) /datum/seed/apple/poison - name = "poisonapple" + name = PLANT_POISONAPPLE mutants = null chems = list(REAGENT_ID_CYANIDE = list(1,5)) /datum/seed/apple/gold - name = "goldapple" + name = PLANT_GOLDAPPLE seed_name = "golden apple" display_name = "gold apple tree" - kitchen_tag = "goldapple" + kitchen_tag = PLANT_GOLDAPPLE mutants = null chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_GOLD = list(1,5)) @@ -42,10 +42,10 @@ set_trait(TRAIT_PLANT_COLOUR,"#D6B44D") /datum/seed/apple/sif - name = "sifbulb" + name = PLANT_SIFBULB seed_name = "sivian pod" display_name = "sivian pod" - kitchen_tag = "apple" + kitchen_tag = PLANT_APPLE chems = list(REAGENT_ID_NUTRIMENT = list(1,5),REAGENT_ID_SIFSAP = list(10,20)) /datum/seed/apple/sif/New() diff --git a/code/modules/hydroponics/seedtypes/banana.dm b/code/modules/hydroponics/seedtypes/banana.dm index ab6f8ef7717..47dcc1486c5 100644 --- a/code/modules/hydroponics/seedtypes/banana.dm +++ b/code/modules/hydroponics/seedtypes/banana.dm @@ -1,8 +1,8 @@ /datum/seed/banana - name = "banana" - seed_name = "banana" + name = PLANT_BANANA + seed_name = PLANT_BANANA display_name = "banana tree" - kitchen_tag = "banana" + kitchen_tag = PLANT_BANANA chems = list(REAGENT_ID_BANANA = list(10,10)) trash_type = /obj/item/bananapeel diff --git a/code/modules/hydroponics/seedtypes/berries.dm b/code/modules/hydroponics/seedtypes/berries.dm index dcef36a1ff6..d4263e2a6fc 100644 --- a/code/modules/hydroponics/seedtypes/berries.dm +++ b/code/modules/hydroponics/seedtypes/berries.dm @@ -1,10 +1,10 @@ // Berry plants/variants. /datum/seed/berry - name = "berries" + name = PLANT_BERRIES seed_name = "berry" display_name = "berry bush" - kitchen_tag = "berries" - mutants = list("glowberries","poisonberries") + kitchen_tag = PLANT_BERRIES + mutants = list(PLANT_GLOWBERRIES,PLANT_POISONBERRIES) chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_BERRYJUICE = list(10,10)) /datum/seed/berry/New() @@ -22,7 +22,7 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/berry/glow - name = "glowberries" + name = PLANT_GLOWBERRIES seed_name = "glowberry" display_name = "glowberry bush" mutants = null @@ -42,11 +42,11 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) /datum/seed/berry/poison - name = "poisonberries" + name = PLANT_POISONBERRIES seed_name = "poison berry" - kitchen_tag = "poisonberries" + kitchen_tag = PLANT_POISONBERRIES display_name = "poison berry bush" - mutants = list("deathberries") + mutants = list(PLANT_DEATHBERRIES) chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_TOXIN = list(3,5), REAGENT_ID_POISONBERRYJUICE = list(10,5)) /datum/seed/berry/poison/New() @@ -56,7 +56,7 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) /datum/seed/berry/poison/death - name = "deathberries" + name = PLANT_DEATHBERRIES seed_name = "death berry" display_name = "death berry bush" mutants = null @@ -70,9 +70,9 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.35) /datum/seed/berry/peppercorn - name = "peppercorns" + name = PLANT_PEPPERCORNS seed_name = "peppercorn berry" - kitchen_tag = "peppercorns" + kitchen_tag = PLANT_PEPPERCORNS display_name = "peppercorn bush" chems = list(REAGENT_ID_BLACKPEPPER = list(5,10)) diff --git a/code/modules/hydroponics/seedtypes/cabbage.dm b/code/modules/hydroponics/seedtypes/cabbage.dm index bf6b1a51a8d..f116f7b42cd 100644 --- a/code/modules/hydroponics/seedtypes/cabbage.dm +++ b/code/modules/hydroponics/seedtypes/cabbage.dm @@ -1,8 +1,8 @@ /datum/seed/cabbage - name = "cabbage" - seed_name = "cabbage" + name = PLANT_CABBAGE + seed_name = PLANT_CABBAGE display_name = "cabbages" - kitchen_tag = "cabbage" + kitchen_tag = PLANT_CABBAGE chems = list(REAGENT_ID_NUTRIMENT = list(1,10)) /datum/seed/cabbage/New() diff --git a/code/modules/hydroponics/seedtypes/carrots.dm b/code/modules/hydroponics/seedtypes/carrots.dm index 5012ac1aa59..25b49ee3a2f 100644 --- a/code/modules/hydroponics/seedtypes/carrots.dm +++ b/code/modules/hydroponics/seedtypes/carrots.dm @@ -1,8 +1,8 @@ /datum/seed/carrots - name = "carrot" - seed_name = "carrot" + name = PLANT_CARROT + seed_name = PLANT_CARROT display_name = "carrots" - kitchen_tag = "carrot" + kitchen_tag = PLANT_CARROT chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_IMIDAZOLINE = list(3,5), REAGENT_ID_CARROTJUICE = list(10,20)) /datum/seed/carrots/New() diff --git a/code/modules/hydroponics/seedtypes/celery.dm b/code/modules/hydroponics/seedtypes/celery.dm index 3f478dc7690..a0d783cba60 100644 --- a/code/modules/hydroponics/seedtypes/celery.dm +++ b/code/modules/hydroponics/seedtypes/celery.dm @@ -1,8 +1,8 @@ /datum/seed/celery - name = "celery" - seed_name = "celery" - display_name = "celery" - kitchen_tag = "celery" + name = PLANT_CELERY + seed_name = PLANT_CELERY + display_name = PLANT_CELERY + kitchen_tag = PLANT_CELERY chems = list(REAGENT_ID_NUTRIMENT = list(5,20)) /datum/seed/celery/New() diff --git a/code/modules/hydroponics/seedtypes/cherries.dm b/code/modules/hydroponics/seedtypes/cherries.dm index 2f5896f59cd..07df778a03d 100644 --- a/code/modules/hydroponics/seedtypes/cherries.dm +++ b/code/modules/hydroponics/seedtypes/cherries.dm @@ -1,6 +1,6 @@ /datum/seed/cherries - name = "cherry" - seed_name = "cherry" + name = PLANT_CHERRY + seed_name = PLANT_CHERRY seed_noun = "pits" display_name = "cherry tree" kitchen_tag = "cherries" diff --git a/code/modules/hydroponics/seedtypes/chili.dm b/code/modules/hydroponics/seedtypes/chili.dm index b667cfa156d..b7fcc13298a 100644 --- a/code/modules/hydroponics/seedtypes/chili.dm +++ b/code/modules/hydroponics/seedtypes/chili.dm @@ -1,11 +1,11 @@ // Chili plants/variants. /datum/seed/chili - name = "chili" - seed_name = "chili" + name = PLANT_CHILI + seed_name = PLANT_CHILI display_name = "chili plants" - kitchen_tag = "chili" + kitchen_tag = PLANT_CHILI chems = list(REAGENT_ID_CAPSAICIN = list(3,5), REAGENT_ID_NUTRIMENT = list(1,25)) - mutants = list("icechili", "ghostchili") + mutants = list(PLANT_ICECHILI, PLANT_GHOSTCHILI) /datum/seed/chili/New() ..() @@ -21,10 +21,10 @@ set_trait(TRAIT_IDEAL_LIGHT, 7) /datum/seed/chili/ice - name = "icechili" + name = PLANT_ICECHILI seed_name = "ice pepper" display_name = "ice-pepper plants" - kitchen_tag = "icechili" + kitchen_tag = PLANT_ICECHILI mutants = null chems = list(REAGENT_ID_FROSTOIL = list(3,5), REAGENT_ID_NUTRIMENT = list(1,50)) @@ -35,10 +35,10 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#00EDC6") /datum/seed/chili/ghost - name = "ghostchili" + name = PLANT_GHOSTCHILI seed_name = "ghost chili" display_name = "ghost chili plants" - kitchen_tag = "ghostchili" + kitchen_tag = PLANT_GHOSTCHILI mutants = null chems = list(REAGENT_ID_CONDENSEDCAPSAICIN = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25)) diff --git a/code/modules/hydroponics/seedtypes/citrus.dm b/code/modules/hydroponics/seedtypes/citrus.dm index ad701a74def..190cce1af0d 100644 --- a/code/modules/hydroponics/seedtypes/citrus.dm +++ b/code/modules/hydroponics/seedtypes/citrus.dm @@ -1,8 +1,8 @@ /datum/seed/citrus - name = "lime" - seed_name = "lime" + name = PLANT_LIME + seed_name = PLANT_LIME display_name = "lime trees" - kitchen_tag = "lime" + kitchen_tag = PLANT_LIME chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LIMEJUICE = list(10,20)) /datum/seed/citrus/New() @@ -19,10 +19,10 @@ set_trait(TRAIT_FLESH_COLOUR,"#3AF026") /datum/seed/citrus/lemon - name = "lemon" - seed_name = "lemon" + name = PLANT_LEMON + seed_name = PLANT_LEMON display_name = "lemon trees" - kitchen_tag = "lemon" + kitchen_tag = PLANT_LEMON chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LEMONJUICE = list(10,20)) /datum/seed/citrus/lemon/New() @@ -34,10 +34,10 @@ set_trait(TRAIT_IDEAL_LIGHT, 6) /datum/seed/citrus/orange - name = "orange" - seed_name = "orange" + name = PLANT_ORANGE + seed_name = PLANT_ORANGE display_name = "orange trees" - kitchen_tag = "orange" + kitchen_tag = PLANT_ORANGE chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_ORANGEJUICE = list(10,20)) /datum/seed/citrus/orange/New() diff --git a/code/modules/hydroponics/seedtypes/cocoa.dm b/code/modules/hydroponics/seedtypes/cocoa.dm index 7233db5d695..a3e55af6872 100644 --- a/code/modules/hydroponics/seedtypes/cocoa.dm +++ b/code/modules/hydroponics/seedtypes/cocoa.dm @@ -1,8 +1,8 @@ /datum/seed/cocoa - name = "cocoa" + name = PLANT_COCOA seed_name = "cacao" display_name = "cacao tree" - kitchen_tag = "cocoa" + kitchen_tag = PLANT_COCOA chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_COCO = list(4,5)) /datum/seed/cocoa/New() diff --git a/code/modules/hydroponics/seedtypes/corn.dm b/code/modules/hydroponics/seedtypes/corn.dm index 67fca53d8f0..11d64a8e161 100644 --- a/code/modules/hydroponics/seedtypes/corn.dm +++ b/code/modules/hydroponics/seedtypes/corn.dm @@ -1,8 +1,8 @@ /datum/seed/corn - name = "corn" - seed_name = "corn" + name = PLANT_CORN + seed_name = PLANT_CORN display_name = "ears of corn" - kitchen_tag = "corn" + kitchen_tag = PLANT_CORN chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_CORNOIL = list(3,15)) trash_type = /obj/item/corncob diff --git a/code/modules/hydroponics/seedtypes/diona.dm b/code/modules/hydroponics/seedtypes/diona.dm index be3b80b6bfd..f1d56c0f240 100644 --- a/code/modules/hydroponics/seedtypes/diona.dm +++ b/code/modules/hydroponics/seedtypes/diona.dm @@ -1,6 +1,6 @@ /datum/seed/diona - name = "diona" - seed_name = "diona" + name = PLANT_DIONA + seed_name = PLANT_DIONA seed_noun = "nodes" display_name = "replicant pods" can_self_harvest = 1 @@ -18,4 +18,4 @@ set_trait(TRAIT_PRODUCT_ICON,"diona") set_trait(TRAIT_PRODUCT_COLOUR,"#799957") set_trait(TRAIT_PLANT_COLOUR,"#66804B") - set_trait(TRAIT_PLANT_ICON,"alien4") \ No newline at end of file + set_trait(TRAIT_PLANT_ICON,"alien4") diff --git a/code/modules/hydroponics/seedtypes/durian.dm b/code/modules/hydroponics/seedtypes/durian.dm index f2828554641..b11b24f2b6d 100644 --- a/code/modules/hydroponics/seedtypes/durian.dm +++ b/code/modules/hydroponics/seedtypes/durian.dm @@ -1,9 +1,9 @@ /datum/seed/durian - name = "durian" - seed_name = "durian" + name = PLANT_DURIAN + seed_name = PLANT_DURIAN seed_noun = "pits" - display_name = "durian" - kitchen_tag = "durian" + display_name = PLANT_DURIAN + kitchen_tag = PLANT_DURIAN chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_DURIANPASTE = list(1, 20)) /datum/seed/durian/New() diff --git a/code/modules/hydroponics/seedtypes/eggplant.dm b/code/modules/hydroponics/seedtypes/eggplant.dm index 4bcee3db256..2fc7dc7ae06 100644 --- a/code/modules/hydroponics/seedtypes/eggplant.dm +++ b/code/modules/hydroponics/seedtypes/eggplant.dm @@ -1,10 +1,10 @@ //Eggplants/varieties. /datum/seed/eggplant - name = "eggplant" - seed_name = "eggplant" + name = PLANT_EGGPLANT + seed_name = PLANT_EGGPLANT display_name = "eggplants" - kitchen_tag = "eggplant" - mutants = list("egg-plant") + kitchen_tag = PLANT_EGGPLANT + mutants = list(PLANT_EGGPLANT) chems = list(REAGENT_ID_NUTRIMENT = list(1,10)) /datum/seed/eggplant/New() @@ -22,10 +22,10 @@ // Return of Eggy. Just makes purple eggs. If the reagents are separated from the egg production by xenobotany or RNG, it's still an Egg plant. /datum/seed/eggplant/egg - name = "egg-plant" - seed_name = "egg-plant" + name = PLANT_EGGPLANT + seed_name = PLANT_EGGPLANT display_name = "egg-plants" - kitchen_tag = "egg-plant" + kitchen_tag = PLANT_EGGPLANT mutants = null chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_EGG = list(3,12)) has_item_product = /obj/item/reagent_containers/food/snacks/egg/purple diff --git a/code/modules/hydroponics/seedtypes/flowers.dm b/code/modules/hydroponics/seedtypes/flowers.dm index e50b396c3b2..f32bcab65d6 100644 --- a/code/modules/hydroponics/seedtypes/flowers.dm +++ b/code/modules/hydroponics/seedtypes/flowers.dm @@ -1,8 +1,8 @@ //Flowers/varieties /datum/seed/flower - name = "harebells" + name = PLANT_HAREBELLS seed_name = "harebell" - display_name = "harebells" + display_name = PLANT_HAREBELLS kitchen_tag = "harebell" chems = list(REAGENT_ID_NUTRIMENT = list(1,20)) @@ -18,9 +18,9 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/flower/poppy - name = "poppies" + name = PLANT_POPPIES seed_name = "poppy" - display_name = "poppies" + display_name = PLANT_POPPIES kitchen_tag = "poppy" chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_BICARIDINE = list(1,10)) @@ -38,10 +38,10 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/flower/sunflower - name = "sunflowers" - seed_name = "sunflower" - display_name = "sunflowers" - kitchen_tag = "sunflower" + name = PLANT_SUNFLOWERS + seed_name = PLANT_SUNFLOWERS + display_name = PLANT_SUNFLOWERS + kitchen_tag = PLANT_SUNFLOWERS /datum/seed/flower/sunflower/New() ..() @@ -54,10 +54,10 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/flower/lavender - name = "lavender" - seed_name = "lavender" - display_name = "lavender" - kitchen_tag = "lavender" + name = PLANT_LAVENDER + seed_name = PLANT_LAVENDER + display_name = PLANT_LAVENDER + kitchen_tag = PLANT_LAVENDER chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_BICARIDINE = list(1,10)) /datum/seed/flower/lavender/New() @@ -74,11 +74,11 @@ set_trait(TRAIT_WATER_CONSUMPTION, 0.5) /datum/seed/flower/rose - name = "rose" - seed_name = "rose" - display_name = "rose" - kitchen_tag = "rose" - mutants = list("bloodrose") + name = PLANT_ROSE + seed_name = PLANT_ROSE + display_name = PLANT_ROSE + kitchen_tag = PLANT_ROSE + mutants = list(PLANT_BLOODROSE) chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_STOXIN = list(0,2)) /datum/seed/flower/rose/New() @@ -96,7 +96,7 @@ set_trait(TRAIT_STINGS,1) /datum/seed/flower/rose/blood - name = "bloodrose" + name = PLANT_BLOODROSE display_name = "bleeding rose" mutants = null chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_STOXIN = list(1,5), REAGENT_ID_BLOOD = list(0,2)) diff --git a/code/modules/hydroponics/seedtypes/gelthi.dm b/code/modules/hydroponics/seedtypes/gelthi.dm index 3121c2a4787..b81e993d44a 100644 --- a/code/modules/hydroponics/seedtypes/gelthi.dm +++ b/code/modules/hydroponics/seedtypes/gelthi.dm @@ -1,8 +1,8 @@ /datum/seed/gelthi - name = "gelthi" - seed_name = "gelthi" + name = PLANT_GELTHI + seed_name = PLANT_GELTHI display_name = "gelthi plant" - kitchen_tag = "gelthi" + kitchen_tag = PLANT_GELTHI chems = list(REAGENT_ID_STOXIN = list(1,5),REAGENT_ID_CAPSAICIN = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/gelthi/New() diff --git a/code/modules/hydroponics/seedtypes/gnomes.dm b/code/modules/hydroponics/seedtypes/gnomes.dm index 0b6170f72e9..0b9efd92ccf 100644 --- a/code/modules/hydroponics/seedtypes/gnomes.dm +++ b/code/modules/hydroponics/seedtypes/gnomes.dm @@ -1,8 +1,8 @@ // Gnomes /datum/seed/gnomes - name = "gnomes" - seed_name = "gnomes" - display_name = "gnomes" + name = PLANT_GNOMES + seed_name = PLANT_GNOMES + display_name = PLANT_GNOMES force_layer = 3 chems = list(REAGENT_ID_MAGICDUST = list(5,20)) diff --git a/code/modules/hydroponics/seedtypes/grapes.dm b/code/modules/hydroponics/seedtypes/grapes.dm index 73a7853221a..4e968fc8110 100644 --- a/code/modules/hydroponics/seedtypes/grapes.dm +++ b/code/modules/hydroponics/seedtypes/grapes.dm @@ -1,10 +1,10 @@ //Grapes/varieties /datum/seed/grapes - name = "grapes" + name = PLANT_GRAPES seed_name = "grape" display_name = "grapevines" - kitchen_tag = "grapes" - mutants = list("greengrapes") + kitchen_tag = PLANT_GRAPES + mutants = list(PLANT_GREENGRAPES) chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SUGAR = list(1,5), REAGENT_ID_GRAPEJUICE = list(10,10)) /datum/seed/grapes/New() @@ -22,7 +22,7 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/grapes/green - name = "greengrapes" + name = PLANT_GREENGRAPES seed_name = "green grape" display_name = "green grapevines" mutants = null diff --git a/code/modules/hydroponics/seedtypes/grass.dm b/code/modules/hydroponics/seedtypes/grass.dm index 76135a9e1f6..9f0c29ad3ab 100644 --- a/code/modules/hydroponics/seedtypes/grass.dm +++ b/code/modules/hydroponics/seedtypes/grass.dm @@ -1,9 +1,9 @@ /datum/seed/grass - name = "grass" - seed_name = "grass" - display_name = "grass" - kitchen_tag = "grass" - mutants = list("carpet") + name = PLANT_GRASS + seed_name = PLANT_GRASS + display_name = PLANT_GRASS + kitchen_tag = PLANT_GRASS + mutants = list(PLANT_CARPET) chems = list(REAGENT_ID_NUTRIMENT = list(1,20)) /datum/seed/grass/New() @@ -20,10 +20,10 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) /datum/seed/grass/carpet - name = "carpet" - seed_name = "carpet" - display_name = "carpet" - kitchen_tag = "carpet" + name = PLANT_CARPET + seed_name = PLANT_CARPET + display_name = PLANT_CARPET + kitchen_tag = PLANT_CARPET mutants = null chems = list(REAGENT_ID_LIQUIDCARPET = list(5,10)) diff --git a/code/modules/hydroponics/seedtypes/jurlmah.dm b/code/modules/hydroponics/seedtypes/jurlmah.dm index 7eee1549045..3945259cc5f 100644 --- a/code/modules/hydroponics/seedtypes/jurlmah.dm +++ b/code/modules/hydroponics/seedtypes/jurlmah.dm @@ -1,8 +1,8 @@ /datum/seed/jurlmah - name = "jurlmah" + name = PLANT_JURLMAH seed_name = "jurl'mah" display_name = "jurl'mah reeds" - kitchen_tag = "jurlmah" + kitchen_tag = PLANT_JURLMAH chems = list(REAGENT_ID_SEROTROTIUM = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/jurlmah/New() diff --git a/code/modules/hydroponics/seedtypes/kudzu.dm b/code/modules/hydroponics/seedtypes/kudzu.dm index 182466a2973..2c003a6d3b2 100644 --- a/code/modules/hydroponics/seedtypes/kudzu.dm +++ b/code/modules/hydroponics/seedtypes/kudzu.dm @@ -1,8 +1,8 @@ /datum/seed/kudzu - name = "kudzu" - seed_name = "kudzu" + name = PLANT_KUDZU + seed_name = PLANT_KUDZU display_name = "kudzu vines" - kitchen_tag = "kudzu" + kitchen_tag = PLANT_KUDZU chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_ANTITOXIN = list(1,25)) /datum/seed/kudzu/New() diff --git a/code/modules/hydroponics/seedtypes/lettuce.dm b/code/modules/hydroponics/seedtypes/lettuce.dm index a8bb68b40f1..94a8aaeab02 100644 --- a/code/modules/hydroponics/seedtypes/lettuce.dm +++ b/code/modules/hydroponics/seedtypes/lettuce.dm @@ -1,9 +1,9 @@ // Lettuce/varieties. /datum/seed/lettuce - name = "lettuce" - seed_name = "lettuce" - display_name = "lettuce" - kitchen_tag = "lettuce" + name = PLANT_LETTUCE + seed_name = PLANT_LETTUCE + display_name = PLANT_LETTUCE + kitchen_tag = PLANT_LETTUCE chems = list(REAGENT_ID_NUTRIMENT = list(1,15)) /datum/seed/lettuce/New() @@ -22,7 +22,7 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.13) /datum/seed/lettuce/ice - name = "siflettuce" + name = PLANT_SIFLETTUCE seed_name = "glacial lettuce" display_name = "glacial lettuce" kitchen_tag = "icelettuce" diff --git a/code/modules/hydroponics/seedtypes/malanitear.dm b/code/modules/hydroponics/seedtypes/malanitear.dm index f4878ca0032..2a765a47660 100644 --- a/code/modules/hydroponics/seedtypes/malanitear.dm +++ b/code/modules/hydroponics/seedtypes/malanitear.dm @@ -1,8 +1,8 @@ /datum/seed/mtear - name = "mtear" + name = PLANT_MTEAR seed_name = "Malani's tear" display_name = "Malani's tear leaves" - kitchen_tag = "mtear" + kitchen_tag = PLANT_MTEAR chems = list(REAGENT_ID_HONEY = list(1,10), REAGENT_ID_KELOTANE = list(3,5)) /datum/seed/mtear/New() diff --git a/code/modules/hydroponics/seedtypes/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm index 147c5712bb9..8866b1bbe38 100644 --- a/code/modules/hydroponics/seedtypes/mushrooms.dm +++ b/code/modules/hydroponics/seedtypes/mushrooms.dm @@ -1,10 +1,10 @@ //Mushrooms/varieties. /datum/seed/mushroom - name = "mushrooms" + name = PLANT_MUSHROOMS seed_name = "chanterelle" seed_noun = "spores" display_name = "chanterelle mushrooms" - mutants = list("reishi","amanita","plumphelmet") + mutants = list(PLANT_REISHI,PLANT_AMANITA,PLANT_PLUMPHELMET) chems = list(REAGENT_ID_NUTRIMENT = list(1,25)) splat_type = /obj/effect/plant kitchen_tag = "mushroom" @@ -24,7 +24,7 @@ set_trait(TRAIT_LIGHT_TOLERANCE, 6) /datum/seed/mushroom/mold - name = "mold" + name = PLANT_MOLD seed_name = "brown mold" display_name = "brown mold" mutants = null @@ -40,12 +40,12 @@ set_trait(TRAIT_PLANT_ICON,"mushroom9") /datum/seed/mushroom/plump - name = "plumphelmet" + name = PLANT_PLUMPHELMET seed_name = "plump helmet" display_name = "plump helmet mushrooms" - mutants = list("walkingmushroom","towercap") + mutants = list("walkingmushroom",PLANT_TOWERCAP) chems = list(REAGENT_ID_NUTRIMENT = list(2,10)) - kitchen_tag = "plumphelmet" + kitchen_tag = PLANT_PLUMPHELMET /datum/seed/mushroom/plump/New() ..() @@ -58,10 +58,10 @@ set_trait(TRAIT_PLANT_ICON,"mushroom2") /datum/seed/mushroom/hallucinogenic - name = "reishi" - seed_name = "reishi" - display_name = "reishi" - mutants = list("libertycap","glowshroom") + name = PLANT_REISHI + seed_name = PLANT_REISHI + display_name = PLANT_REISHI + mutants = list(PLANT_LIBERTYCAP,PLANT_GLOWSHROOM) chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PSILOCYBIN = list(3,5)) /datum/seed/mushroom/hallucinogenic/New() @@ -76,7 +76,7 @@ set_trait(TRAIT_PLANT_ICON,"mushroom6") /datum/seed/mushroom/hallucinogenic/strong - name = "libertycap" + name = PLANT_LIBERTYCAP seed_name = "liberty cap" display_name = "liberty cap mushrooms" mutants = null @@ -92,10 +92,10 @@ set_trait(TRAIT_PLANT_ICON,"mushroom3") /datum/seed/mushroom/poison - name = "amanita" + name = PLANT_AMANITA seed_name = "fly amanita" display_name = "fly amanita mushrooms" - mutants = list("destroyingangel","plastic") + mutants = list(PLANT_DESTROYINGANGEL,PLANT_PLASTIC) chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMATOXIN = list(3,3), REAGENT_ID_PSILOCYBIN = list(1,25)) /datum/seed/mushroom/poison/New() @@ -110,7 +110,7 @@ set_trait(TRAIT_PLANT_ICON,"mushroom4") /datum/seed/mushroom/poison/death - name = "destroyingangel" + name = PLANT_DESTROYINGANGEL seed_name = "destroying angel" display_name = "destroying angel mushrooms" mutants = null @@ -127,11 +127,11 @@ set_trait(TRAIT_PLANT_ICON,"mushroom5") /datum/seed/mushroom/towercap - name = "towercap" + name = PLANT_TOWERCAP seed_name = "tower cap" display_name = "tower caps" chems = list(REAGENT_ID_WOODPULP = list(10,1)) - mutants = list("redcap") + mutants = list(PLANT_REDCAP) has_item_product = /obj/item/stack/material/log /datum/seed/mushroom/towercap/New() @@ -143,7 +143,7 @@ set_trait(TRAIT_PLANT_ICON,"mushroom8") /datum/seed/mushroom/towercap/red - name = "redcap" + name = PLANT_REDCAP seed_name = "red cap" display_name = "red caps" chems = list(REAGENT_ID_WOODPULP = list(10,1), REAGENT_ID_TANNIN = list(1,10)) @@ -155,8 +155,8 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#b81414") /datum/seed/mushroom/glowshroom - name = "glowshroom" - seed_name = "glowshroom" + name = PLANT_GLOWSHROOM + seed_name = PLANT_GLOWSHROOM display_name = "glowshrooms" mutants = null chems = list(REAGENT_ID_RADIUM = list(1,20)) @@ -175,7 +175,7 @@ set_trait(TRAIT_PLANT_ICON,"mushroom7") /datum/seed/mushroom/plastic - name = "plastic" + name = PLANT_PLASTIC seed_name = "plastellium" display_name = "plastellium" mutants = null @@ -193,7 +193,7 @@ set_trait(TRAIT_PLANT_ICON,"mushroom10") /datum/seed/mushroom/spore - name = "sporeshroom" + name = PLANT_SPORESHROOM seed_name = "corpellian" display_name = "corpellian" mutants = null diff --git a/code/modules/hydroponics/seedtypes/nettles.dm b/code/modules/hydroponics/seedtypes/nettles.dm index 81f05cb3232..2d2d27e7b0a 100644 --- a/code/modules/hydroponics/seedtypes/nettles.dm +++ b/code/modules/hydroponics/seedtypes/nettles.dm @@ -1,11 +1,11 @@ // Nettles/variants. /datum/seed/nettle - name = "nettle" - seed_name = "nettle" + name = PLANT_NETTLE + seed_name = PLANT_NETTLE display_name = "nettles" - mutants = list("deathnettle") + mutants = list(PLANT_DEATHNETTLE) chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_SACID = list(0,1)) - kitchen_tag = "nettle" + kitchen_tag = PLANT_NETTLE /datum/seed/nettle/New() ..() @@ -20,10 +20,10 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#728A54") /datum/seed/nettle/death - name = "deathnettle" + name = PLANT_DEATHNETTLE seed_name = "death nettle" display_name = "death nettles" - kitchen_tag = "deathnettle" + kitchen_tag = PLANT_DEATHNETTLE mutants = null chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PACID = list(0,1)) diff --git a/code/modules/hydroponics/seedtypes/onion.dm b/code/modules/hydroponics/seedtypes/onion.dm index 3bd214261ed..1a2e6e4283a 100644 --- a/code/modules/hydroponics/seedtypes/onion.dm +++ b/code/modules/hydroponics/seedtypes/onion.dm @@ -1,8 +1,8 @@ /datum/seed/onion - name = "onion" - seed_name = "onion" + name = PLANT_ONION + seed_name = PLANT_ONION display_name = "onions" - kitchen_tag = "onion" + kitchen_tag = PLANT_ONION chems = list(REAGENT_ID_NUTRIMENT = list(1,10)) /datum/seed/onion/New() diff --git a/code/modules/hydroponics/seedtypes/peanuts.dm b/code/modules/hydroponics/seedtypes/peanuts.dm index db0a3c0f368..4e5e2a3b537 100644 --- a/code/modules/hydroponics/seedtypes/peanuts.dm +++ b/code/modules/hydroponics/seedtypes/peanuts.dm @@ -1,9 +1,9 @@ //Everything else /datum/seed/peanuts - name = "peanut" - seed_name = "peanut" + name = PLANT_PEANUT + seed_name = PLANT_PEANUT display_name = "peanut vines" - kitchen_tag = "peanut" + kitchen_tag = PLANT_PEANUT chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_PEANUTOIL = list(3,10)) /datum/seed/peanuts/New() diff --git a/code/modules/hydroponics/seedtypes/pineapple.dm b/code/modules/hydroponics/seedtypes/pineapple.dm index 3ac1d79e8d5..536479ab8bb 100644 --- a/code/modules/hydroponics/seedtypes/pineapple.dm +++ b/code/modules/hydroponics/seedtypes/pineapple.dm @@ -1,11 +1,11 @@ //pineapple and variants /datum/seed/pineapple - name = "pineapple" - seed_name = "pineapple" - display_name = "pineapple" - kitchen_tag = "pineapple" - mutants = list("spineapple") + name = PLANT_PINEAPPLE + seed_name = PLANT_PINEAPPLE + display_name = PLANT_PINEAPPLE + kitchen_tag = PLANT_PINEAPPLE + mutants = list(PLANT_SPINEAPPLE) chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_PINEAPPLEJUICE = list(1, 20)) /datum/seed/pineapple/New() @@ -26,10 +26,10 @@ //A pineapple that stings and produces enzymes. /datum/seed/spineapple - name = "spineapple" - seed_name = "spineapple" - display_name = "spineapple" - kitchen_tag = "spineapple" + name = PLANT_SPINEAPPLE + seed_name = PLANT_SPINEAPPLE + display_name = PLANT_SPINEAPPLE + kitchen_tag = PLANT_SPINEAPPLE chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_ENZYME = list(1,5), REAGENT_ID_PINEAPPLEJUICE = list(1, 20)) /datum/seed/spineapple/New() diff --git a/code/modules/hydroponics/seedtypes/potato.dm b/code/modules/hydroponics/seedtypes/potato.dm index 59aebee0c6a..db695a49d9d 100644 --- a/code/modules/hydroponics/seedtypes/potato.dm +++ b/code/modules/hydroponics/seedtypes/potato.dm @@ -1,8 +1,8 @@ /datum/seed/potato - name = "potato" - seed_name = "potato" + name = PLANT_POTATO + seed_name = PLANT_POTATO display_name = "potatoes" - kitchen_tag = "potato" + kitchen_tag = PLANT_POTATO chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_POTATOJUICE = list(10,10)) /datum/seed/potato/New() diff --git a/code/modules/hydroponics/seedtypes/pumpkin.dm b/code/modules/hydroponics/seedtypes/pumpkin.dm index ed1392993d0..bb583f20007 100644 --- a/code/modules/hydroponics/seedtypes/pumpkin.dm +++ b/code/modules/hydroponics/seedtypes/pumpkin.dm @@ -1,8 +1,8 @@ /datum/seed/pumpkin - name = "pumpkin" - seed_name = "pumpkin" + name = PLANT_PUMPKIN + seed_name = PLANT_PUMPKIN display_name = "pumpkin vine" - kitchen_tag = "pumpkin" + kitchen_tag = PLANT_PUMPKIN chems = list(REAGENT_ID_NUTRIMENT = list(1,6)) /datum/seed/pumpkin/New() diff --git a/code/modules/hydroponics/seedtypes/rhubarb.dm b/code/modules/hydroponics/seedtypes/rhubarb.dm index 8534c9727e3..69bbed5ef3f 100644 --- a/code/modules/hydroponics/seedtypes/rhubarb.dm +++ b/code/modules/hydroponics/seedtypes/rhubarb.dm @@ -1,8 +1,8 @@ /datum/seed/rhubarb - name = "rhubarb" - seed_name = "rhubarb" - display_name = "rhubarb" - kitchen_tag = "rhubarb" + name = PLANT_ROSE + seed_name = PLANT_ROSE + display_name = PLANT_ROSE + kitchen_tag = PLANT_ROSE chems = list(REAGENT_ID_NUTRIMENT = list(1,15)) /datum/seed/rhubarb/New() diff --git a/code/modules/hydroponics/seedtypes/rice.dm b/code/modules/hydroponics/seedtypes/rice.dm index f52154c98b8..f0904b43a96 100644 --- a/code/modules/hydroponics/seedtypes/rice.dm +++ b/code/modules/hydroponics/seedtypes/rice.dm @@ -1,8 +1,8 @@ /datum/seed/rice - name = "rice" - seed_name = "rice" + name = PLANT_RICE + seed_name = PLANT_RICE display_name = "rice stalks" - kitchen_tag = "rice" + kitchen_tag = PLANT_RICE chems = list(REAGENT_ID_NUTRIMENT = list(1,25), REAGENT_ID_RICE = list(10,15)) /datum/seed/rice/New() diff --git a/code/modules/hydroponics/seedtypes/selemhand.dm b/code/modules/hydroponics/seedtypes/selemhand.dm index f9e451a6270..81986c03055 100644 --- a/code/modules/hydroponics/seedtypes/selemhand.dm +++ b/code/modules/hydroponics/seedtypes/selemhand.dm @@ -1,8 +1,8 @@ /datum/seed/shand - name = "shand" + name = PLANT_SHAND seed_name = "Selem's hand" display_name = "Selem's hand leaves" - kitchen_tag = "shand" + kitchen_tag = PLANT_SHAND chems = list(REAGENT_ID_BICARIDINE = list(0,10)) /datum/seed/shand/New() diff --git a/code/modules/hydroponics/seedtypes/soybean.dm b/code/modules/hydroponics/seedtypes/soybean.dm index 081949bde74..c644618b677 100644 --- a/code/modules/hydroponics/seedtypes/soybean.dm +++ b/code/modules/hydroponics/seedtypes/soybean.dm @@ -1,6 +1,6 @@ /datum/seed/soybean - name = "soybean" - seed_name = "soybean" + name = PLANT_SOYBEAN + seed_name = PLANT_SOYBEAN display_name = "soybeans" kitchen_tag = "soybeans" chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_SOYMILK = list(10,20)) diff --git a/code/modules/hydroponics/seedtypes/sugarcane.dm b/code/modules/hydroponics/seedtypes/sugarcane.dm index 6abdf841c1d..90037fb5eb3 100644 --- a/code/modules/hydroponics/seedtypes/sugarcane.dm +++ b/code/modules/hydroponics/seedtypes/sugarcane.dm @@ -1,6 +1,6 @@ /datum/seed/sugarcane - name = "sugarcane" - seed_name = "sugarcane" + name = PLANT_SUGARCANE + seed_name = PLANT_SUGARCANE display_name = "sugarcanes" kitchen_tag = "sugarcanes" chems = list(REAGENT_ID_SUGAR = list(4,5)) diff --git a/code/modules/hydroponics/seedtypes/surik.dm b/code/modules/hydroponics/seedtypes/surik.dm index a571a0f35ff..430560c828b 100644 --- a/code/modules/hydroponics/seedtypes/surik.dm +++ b/code/modules/hydroponics/seedtypes/surik.dm @@ -1,8 +1,8 @@ /datum/seed/surik - name = "surik" - seed_name = "surik" + name = PLANT_SURIK + seed_name = PLANT_SURIK display_name = "surik vine" - kitchen_tag = "surik" + kitchen_tag = PLANT_SURIK chems = list(REAGENT_ID_IMPEDREZENE = list(1,3),REAGENT_ID_SYNAPTIZINE = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/surik/New() diff --git a/code/modules/hydroponics/seedtypes/telriis.dm b/code/modules/hydroponics/seedtypes/telriis.dm index 127f496f260..a85d394a563 100644 --- a/code/modules/hydroponics/seedtypes/telriis.dm +++ b/code/modules/hydroponics/seedtypes/telriis.dm @@ -1,8 +1,8 @@ /datum/seed/telriis - name = "telriis" - seed_name = "telriis" + name = PLANT_TELRIIS + seed_name = PLANT_TELRIIS display_name = "telriis grass" - kitchen_tag = "telriis" + kitchen_tag = PLANT_TELRIIS chems = list(REAGENT_ID_PWINE = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6)) /datum/seed/telriis/New() diff --git a/code/modules/hydroponics/seedtypes/thaadra.dm b/code/modules/hydroponics/seedtypes/thaadra.dm index c7ccb40f7d9..0bb3eab1f15 100644 --- a/code/modules/hydroponics/seedtypes/thaadra.dm +++ b/code/modules/hydroponics/seedtypes/thaadra.dm @@ -1,8 +1,8 @@ /datum/seed/thaadra - name = "thaadra" + name = PLANT_THAADRA seed_name = "thaa'dra" display_name = "thaa'dra lichen" - kitchen_tag = "thaadra" + kitchen_tag = PLANT_THAADRA chems = list(REAGENT_ID_FROSTOIL = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/thaadra/New() diff --git a/code/modules/hydroponics/seedtypes/tobacco.dm b/code/modules/hydroponics/seedtypes/tobacco.dm index 0e11bacfa00..074b0411317 100644 --- a/code/modules/hydroponics/seedtypes/tobacco.dm +++ b/code/modules/hydroponics/seedtypes/tobacco.dm @@ -1,9 +1,9 @@ //Tobacco/varieties. /datum/seed/tobacco - name = "tobacco" - seed_name = "tobacco" - display_name = "tobacco" - kitchen_tag = "tobacco" + name = PLANT_TOBACCO + seed_name = PLANT_TOBACCO + display_name = PLANT_TOBACCO + kitchen_tag = PLANT_TOBACCO mutants = list("stimbush") chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_NICOTINE = list(1,20)) diff --git a/code/modules/hydroponics/seedtypes/tomatoes.dm b/code/modules/hydroponics/seedtypes/tomatoes.dm index 26a712677c1..670cb3c39f5 100644 --- a/code/modules/hydroponics/seedtypes/tomatoes.dm +++ b/code/modules/hydroponics/seedtypes/tomatoes.dm @@ -1,11 +1,11 @@ //Tomatoes/variants. /datum/seed/tomato - name = "tomato" - seed_name = "tomato" + name = PLANT_TOMATO + seed_name = PLANT_TOMATO display_name = "tomato plant" - mutants = list("bluetomato","bloodtomato") + mutants = list(PLANT_BLUETOMATO,PLANT_BLOODTOMATO) chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_TOMATOJUICE = list(10,10)) - kitchen_tag = "tomato" + kitchen_tag = PLANT_TOMATO /datum/seed/tomato/New() ..() @@ -23,10 +23,10 @@ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) /datum/seed/tomato/blood - name = "bloodtomato" + name = PLANT_BLOODTOMATO seed_name = "blood tomato" display_name = "blood tomato plant" - mutants = list("killertomato") + mutants = list(PLANT_KILLERTOMATO) chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_BLOOD = list(1,5)) splat_type = /obj/effect/decal/cleanable/blood/splatter @@ -36,7 +36,7 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#FF0000") /datum/seed/tomato/killer - name = "killertomato" + name = PLANT_KILLERTOMATO seed_name = "killer tomato" display_name = "killer tomato plant" mutants = null @@ -49,10 +49,10 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#A86747") /datum/seed/tomato/blue - name = "bluetomato" + name = PLANT_BLUETOMATO seed_name = "blue tomato" display_name = "blue tomato plant" - mutants = list("bluespacetomato") + mutants = list(PLANT_BLUESPACETOMATO) chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LUBE = list(1,5)) /datum/seed/tomato/blue/New() @@ -61,7 +61,7 @@ set_trait(TRAIT_PLANT_COLOUR,"#070AAD") /datum/seed/tomato/blue/teleport - name = "bluespacetomato" + name = PLANT_BLUESPACETOMATO seed_name = "bluespace tomato" display_name = "bluespace tomato plant" mutants = null diff --git a/code/modules/hydroponics/seedtypes/vale.dm b/code/modules/hydroponics/seedtypes/vale.dm index fcfac20d876..e20c30537f7 100644 --- a/code/modules/hydroponics/seedtypes/vale.dm +++ b/code/modules/hydroponics/seedtypes/vale.dm @@ -1,8 +1,8 @@ /datum/seed/vale - name = "vale" - seed_name = "vale" + name = PLANT_VALE + seed_name = PLANT_VALE display_name = "vale bush" - kitchen_tag = "vale" + kitchen_tag = PLANT_VALE chems = list(REAGENT_ID_PARACETAMOL = list(1,5),REAGENT_ID_DEXALIN = list(1,2),REAGENT_ID_NUTRIMENT= list(1,5)) /datum/seed/vale/New() diff --git a/code/modules/hydroponics/seedtypes/vanilla.dm b/code/modules/hydroponics/seedtypes/vanilla.dm index a9b57d14e0a..adff9e30e42 100644 --- a/code/modules/hydroponics/seedtypes/vanilla.dm +++ b/code/modules/hydroponics/seedtypes/vanilla.dm @@ -1,8 +1,8 @@ /datum/seed/vanilla - name = "vanilla" - seed_name = "vanilla" - display_name = "vanilla" - kitchen_tag = "vanilla" + name = PLANT_VANILLA + seed_name = PLANT_VANILLA + display_name = PLANT_VANILLA + kitchen_tag = PLANT_VANILLA chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_VANILLA = list(2,8), REAGENT_ID_SUGAR = list(1, 4)) /datum/seed/vanilla/New() diff --git a/code/modules/hydroponics/seedtypes/wabback.dm b/code/modules/hydroponics/seedtypes/wabback.dm index 253dccae168..ffc5dfe64e6 100644 --- a/code/modules/hydroponics/seedtypes/wabback.dm +++ b/code/modules/hydroponics/seedtypes/wabback.dm @@ -1,12 +1,12 @@ //Wabback / varieties. /datum/seed/wabback - name = "whitewabback" + name = PLANT_WHITEWABBACK seed_name = "white wabback" seed_noun = "nodes" display_name = "white wabback" chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_PROTEIN = list(1,5), REAGENT_ID_ENZYME = list(0,3)) kitchen_tag = "wabback" - mutants = list("blackwabback","wildwabback") + mutants = list(PLANT_BLACKWABBACK,PLANT_WILDWABBACK) has_item_product = /obj/item/stack/material/cloth /datum/seed/wabback/New() @@ -27,7 +27,7 @@ set_trait(TRAIT_SPREAD,1) /datum/seed/wabback/vine - name = "blackwabback" + name = PLANT_BLACKWABBACK seed_name = "black wabback" display_name = "black wabback" mutants = null @@ -39,10 +39,10 @@ set_trait(TRAIT_CARNIVOROUS,2) /datum/seed/wabback/wild - name = "wildwabback" + name = PLANT_WILDWABBACK seed_name = "wild wabback" display_name = "wild wabback" - mutants = list("whitewabback") + mutants = list(PLANT_WHITEWABBACK) has_item_product = null chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_PROTEIN = list(0,2), REAGENT_ID_ENZYME = list(0,1)) diff --git a/code/modules/hydroponics/seedtypes/watermelon.dm b/code/modules/hydroponics/seedtypes/watermelon.dm index 32d98d3f829..3fba78c4dbc 100644 --- a/code/modules/hydroponics/seedtypes/watermelon.dm +++ b/code/modules/hydroponics/seedtypes/watermelon.dm @@ -1,8 +1,8 @@ /datum/seed/watermelon - name = "watermelon" - seed_name = "watermelon" + name = PLANT_WATERMELON + seed_name = PLANT_WATERMELON display_name = "watermelon vine" - kitchen_tag = "watermelon" + kitchen_tag = PLANT_WATERMELON chems = list(REAGENT_ID_NUTRIMENT = list(1,6), REAGENT_ID_WATERMELONJUICE = list(10,6)) /datum/seed/watermelon/New() diff --git a/code/modules/hydroponics/seedtypes/weeds.dm b/code/modules/hydroponics/seedtypes/weeds.dm index 9a867174b89..264bfd7b74a 100644 --- a/code/modules/hydroponics/seedtypes/weeds.dm +++ b/code/modules/hydroponics/seedtypes/weeds.dm @@ -1,7 +1,7 @@ /datum/seed/weeds - name = "weeds" + name = PLANT_WEEDS seed_name = "weed" - display_name = "weeds" + display_name = PLANT_WEEDS /datum/seed/weeds/New() ..() @@ -13,4 +13,4 @@ set_trait(TRAIT_PRODUCT_ICON,"flower4") set_trait(TRAIT_PRODUCT_COLOUR,"#FCEB2B") set_trait(TRAIT_PLANT_COLOUR,"#59945A") - set_trait(TRAIT_PLANT_ICON,"bush6") \ No newline at end of file + set_trait(TRAIT_PLANT_ICON,"bush6") diff --git a/code/modules/hydroponics/seedtypes/wheat.dm b/code/modules/hydroponics/seedtypes/wheat.dm index 293d5cc047d..60f1f822776 100644 --- a/code/modules/hydroponics/seedtypes/wheat.dm +++ b/code/modules/hydroponics/seedtypes/wheat.dm @@ -1,8 +1,8 @@ /datum/seed/wheat - name = "wheat" - seed_name = "wheat" + name = PLANT_WHEAT + seed_name = PLANT_WHEAT display_name = "wheat stalks" - kitchen_tag = "wheat" + kitchen_tag = PLANT_WHEAT chems = list(REAGENT_ID_NUTRIMENT = list(1,25), REAGENT_ID_FLOUR = list(10,30)) /datum/seed/wheat/New() diff --git a/code/modules/hydroponics/seedtypes/whitebeets.dm b/code/modules/hydroponics/seedtypes/whitebeets.dm index 04dfca254f4..fff02afa55a 100644 --- a/code/modules/hydroponics/seedtypes/whitebeets.dm +++ b/code/modules/hydroponics/seedtypes/whitebeets.dm @@ -1,8 +1,8 @@ /datum/seed/whitebeets - name = "whitebeet" + name = PLANT_WHITEBEET seed_name = "white-beet" display_name = "white-beets" - kitchen_tag = "whitebeet" + kitchen_tag = PLANT_WHITEBEET chems = list(REAGENT_ID_NUTRIMENT = list(0,20), REAGENT_ID_SUGAR = list(1,5)) /datum/seed/whitebeets/New() diff --git a/code/modules/hydroponics/seedtypes/wurmwoad.dm b/code/modules/hydroponics/seedtypes/wurmwoad.dm index f677ec89936..fe575ad0618 100644 --- a/code/modules/hydroponics/seedtypes/wurmwoad.dm +++ b/code/modules/hydroponics/seedtypes/wurmwoad.dm @@ -1,11 +1,11 @@ // Wurmwoad, the Space Spice maker. Totally is actually, 100% literal worms. /datum/seed/wurmwoad - name = "wurmwoad" - seed_name = "wurmwoad" + name = PLANT_WURMWOAD + seed_name = PLANT_WURMWOAD display_name = "wurmwoad growth" chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SPACESPICE = list(5,15)) - kitchen_tag = "wurmwoad" + kitchen_tag = PLANT_WURMWOAD /datum/seed/wurmwoad/New() ..() diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 0dce8d616d3..c3ca8e77a15 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -1,4 +1,4 @@ -#define DEFAULT_SEED "glowshroom" +#define DEFAULT_SEED PLANT_GLOWSHROOM #define VINE_GROWTH_STAGES 5 /proc/spacevine_infestation(var/potency_min=70, var/potency_max=100, var/maturation_min=5, var/maturation_max=15) diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index c2da430b5fc..7afaa3f6b66 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -380,7 +380,7 @@ if(seed) previous_plant = seed.display_name seed = null - seed = SSplants.seeds[pick(list("reishi","nettle","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))] + seed = SSplants.seeds[pick(list(PLANT_REISHI,PLANT_NETTLE,PLANT_AMANITA,PLANT_MUSHROOMS,PLANT_PLUMPHELMET,PLANT_TOWERCAP,PLANT_HAREBELLS,PLANT_WEEDS))] if(!seed) return //Weed does not exist, someone fucked up. dead = 0 diff --git a/code/modules/materials/materials/plastic.dm b/code/modules/materials/materials/plastic.dm index cbea431e733..397317a4731 100644 --- a/code/modules/materials/materials/plastic.dm +++ b/code/modules/materials/materials/plastic.dm @@ -1,5 +1,5 @@ /datum/material/plastic - name = "plastic" + name = MAT_PLASTIC stack_type = /obj/item/stack/material/plastic flags = MATERIAL_BRITTLE icon_base = "solid" diff --git a/code/modules/materials/sheets/plastic.dm b/code/modules/materials/sheets/plastic.dm index 41415af606a..6310cd7226d 100644 --- a/code/modules/materials/sheets/plastic.dm +++ b/code/modules/materials/sheets/plastic.dm @@ -1,7 +1,7 @@ /obj/item/stack/material/plastic - name = "plastic" + name = MAT_PLASTIC icon_state = "sheet-plastic" - default_type = "plastic" + default_type = MAT_PLASTIC no_variants = FALSE /obj/item/stack/material/cardboard diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index fd1148d8dba..bbf28108d0c 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -348,7 +348,7 @@ var/self_verb_descriptor = list("grab", "snatch", "pick") var/short_emote_descriptor = list("picks", "grabs") var/self_emote_descriptor = list("grab", "pick", "snatch") - var/fruit_type = "apple" + var/fruit_type = PLANT_APPLE var/mob/living/organ_owner = null var/gen_cost = 0.5 diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index f5d67bf50b9..1778cdc92ac 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -660,12 +660,12 @@ total_material *= stack.get_amount() if(material == MAT_STEEL && metal) metal.add_charge(total_material) - if(material == "glass" && glass) + if(material == MAT_GLASS && glass) glass.add_charge(total_material) if(decompiler) - if(material == "plastic" && plastic) + if(material == MAT_PLASTIC && plastic) plastic.add_charge(total_material) - if(material == "wood" && wood) + if(material == MAT_WOOD && wood) wood.add_charge(total_material) drain(-50 * digested) else if(istype(target,/obj/effect/decal/remains)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm index 48d8a17f393..6438e28c190 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm @@ -50,7 +50,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? /mob/living/simple_mob/animal/passive/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) //feedin' dem chickens var/obj/item/reagent_containers/food/snacks/grown/G = O - if(G.seed && G.seed.kitchen_tag == "wheat") + if(G.seed && G.seed.kitchen_tag == PLANT_WHEAT) if(!stat && eggsleft < 8) user.visible_message(span_blue("[user] feeds [O] to [name]! It clucks happily."),span_blue("You feed [O] to [name]! It clucks happily.")) user.drop_item() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm index 5b3b1c7ebc3..f8b2b6bec23 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm @@ -96,7 +96,7 @@ if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) var/obj/item/reagent_containers/food/snacks/grown/G = O - if(G.seed && G.seed.kitchen_tag == "berries") + if(G.seed && G.seed.kitchen_tag == PLANT_BERRIES) return TRUE return FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm index eb08ce7bc09..732d4c170f2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm @@ -1,5 +1,5 @@ /mob/living/simple_mob/tomato - name = "tomato" + name = PLANT_TOMATO desc = "It's a horrifyingly enormous beef tomato, and it's packing extra beef!" tt_desc = "X Solanum abominable" icon_state = "tomato" diff --git a/code/modules/organs/subtypes/diona.dm b/code/modules/organs/subtypes/diona.dm index 3d320e37424..7534e1e4a24 100644 --- a/code/modules/organs/subtypes/diona.dm +++ b/code/modules/organs/subtypes/diona.dm @@ -3,7 +3,7 @@ return 0 //This is a terrible hack and I should be ashamed. - var/datum/seed/diona = SSplants.seeds["diona"] + var/datum/seed/diona = SSplants.seeds[PLANT_DIONA] if(!diona) return 0 diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm index 2c50e021e27..0b0e22ce555 100644 --- a/code/modules/projectiles/guns/launcher/crossbow.dm +++ b/code/modules/projectiles/guns/launcher/crossbow.dm @@ -264,7 +264,7 @@ else to_chat(user, span_notice("You need at least five segments of cable coil to complete this task.")) return - else if(istype(W,/obj/item/stack/material) && W.get_material_name() == "plastic") + else if(istype(W,/obj/item/stack/material) && W.get_material_name() == MAT_PLASTIC) if(buildstate == 3) var/obj/item/stack/material/P = W if(P.use(3)) diff --git a/vorestation.dme b/vorestation.dme index 0b3fd1d5fec..1badf9a8ca0 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -22,6 +22,7 @@ #include "code\__defines\__globals.dm" #include "code\__defines\_click.dm" #include "code\__defines\_compile_options.dm" +#include "code\__defines\_fruits.dm" #include "code\__defines\_helpers.dm" #include "code\__defines\_init.dm" #include "code\__defines\_lists.dm" @@ -2623,7 +2624,6 @@ #include "code\modules\hydroponics\seed_machines.dm" #include "code\modules\hydroponics\seed_mobs.dm" #include "code\modules\hydroponics\seed_packets.dm" -#include "code\modules\hydroponics\seed_packets_vr.dm" #include "code\modules\hydroponics\seed_storage.dm" #include "code\modules\hydroponics\seed_storage_vr.dm" #include "code\modules\hydroponics\beekeeping\beehive.dm"