diff --git a/code/__defines/_fruits.dm b/code/__defines/_fruits.dm index f8d36bab40..a217af7cf3 100644 --- a/code/__defines/_fruits.dm +++ b/code/__defines/_fruits.dm @@ -84,16 +84,51 @@ #define PLANT_BLACKWABBACK "blackwabback" #define PLANT_WILDWABBACK "wildwabback" #define PLANT_SIFLETTUCE "siflettuce" -#define PLANT_EGGPLANT "egg-plant" +#define PLANT_EGG_PLANT "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" + +GLOBAL_LIST_INIT(acceptable_fruit_types, list( + 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)) diff --git a/code/global_vr.dm b/code/global_vr.dm index 65b574c805..78ed7e756e 100644 --- a/code/global_vr.dm +++ b/code/global_vr.dm @@ -5,46 +5,6 @@ var/list/awayabductors = list() // List of scatter landmarks for Abductors in Ga var/list/eventdestinations = list() // List of scatter landmarks for VOREStation event portals var/list/eventabductors = list() // List of scatter landmarks for VOREStation abductor portals -var/global/list/acceptable_fruit_types= list( - 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( 'sound/voice/ScawwySownds/a scawey sownd.ogg', diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 504093aef7..73f6fa12fa 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -1049,7 +1049,7 @@ filling_color = "#E0D7C5" center_of_mass = list("x"=17, "y"=16) nutriment_amt = 3 - nutriment_desc = list("raw" = 2, "mushroom" = 2) + nutriment_desc = list("raw" = 2, PLANT_MUSHROOMS = 2) bitesize = 6 /obj/item/reagent_containers/food/snacks/mushroomslice/Initialize() @@ -1512,7 +1512,7 @@ filling_color = "#FFCCCC" center_of_mass = list("x"=17, "y"=9) nutriment_amt = 5 - nutriment_desc = list("sweetness" = 3, "mushroom" = 3, "pie" = 2) + nutriment_desc = list("sweetness" = 3, PLANT_MUSHROOMS = 3, "pie" = 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/amanita_pie/Initialize() @@ -1527,7 +1527,7 @@ filling_color = "#B8279B" center_of_mass = list("x"=17, "y"=9) nutriment_amt = 8 - nutriment_desc = list("heartiness" = 2, "mushroom" = 3, "pie" = 3) + nutriment_desc = list("heartiness" = 2, PLANT_MUSHROOMS = 3, "pie" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/plump_pie/Initialize() @@ -1811,7 +1811,7 @@ filling_color = "#42B873" center_of_mass = list("x"=16, "y"=8) nutriment_amt = 6 - nutriment_desc = list("mushroom" = 6) + nutriment_desc = list(PLANT_MUSHROOMS = 6) bitesize = 3 /obj/item/reagent_containers/food/snacks/spacylibertyduff/Initialize() @@ -1826,7 +1826,7 @@ filling_color = "#ED0758" center_of_mass = list("x"=16, "y"=5) nutriment_amt = 6 - nutriment_desc = list("jelly" = 3, "mushroom" = 3) + nutriment_desc = list("jelly" = 3, PLANT_MUSHROOMS = 3) bitesize = 3 /obj/item/reagent_containers/food/snacks/amanitajelly/Initialize() @@ -2350,7 +2350,7 @@ filling_color = "#CFB4C4" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 5 - nutriment_desc = list("mushroom" = 4) + nutriment_desc = list(PLANT_MUSHROOMS = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize() @@ -2653,7 +2653,7 @@ filling_color = "#9E673A" center_of_mass = list("x"=16, "y"=5) nutriment_amt = 6 - nutriment_desc = list(PLANT_TOMATO = 2, PLANT_POTATO = 2, PLANT_CARROT = 2, PLANT_EGGPLANT = 2, "mushroom" = 2) + nutriment_desc = list(PLANT_TOMATO = 2, PLANT_POTATO = 2, PLANT_CARROT = 2, PLANT_EGGPLANT = 2, PLANT_MUSHROOMS = 2) drop_sound = 'sound/items/drop/shovel.ogg' pickup_sound = 'sound/items/pickup/shovel.ogg' bitesize = 10 @@ -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, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 5, "mushroom" = 10) + nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 5, PLANT_MUSHROOMS = 10) nutriment_amt = 35 bitesize = 2 @@ -4405,7 +4405,7 @@ filling_color = "#A66829" center_of_mass = list("x"=15, "y"=12) nutriment_amt = 10 - nutriment_desc = list("mushroom" = 5, "salt" = 5) + nutriment_desc = list(PLANT_MUSHROOMS = 5, "salt" = 5) bitesize = 3 /obj/item/reagent_containers/food/snacks/unajerky @@ -6503,7 +6503,7 @@ filling_color = "#A66829" center_of_mass = list("x"=15, "y"=12) nutriment_amt = 10 - nutriment_desc = list("mushroom" = 5, "salt" = 5) + nutriment_desc = list(PLANT_MUSHROOMS = 5, "salt" = 5) bitesize = 3 /obj/item/reagent_containers/food/snacks/sosjerky diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index ed846dd21b..79a3da6d8b 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -75,7 +75,7 @@ filling_color = "#E0D7C5" center_of_mass = list("x"=17, "y"=16) nutriment_amt = 3 - nutriment_desc = list("raw" = 2, "mushroom" = 2) + nutriment_desc = list("raw" = 2, PLANT_MUSHROOMS = 2) bitesize = 6 /obj/item/reagent_containers/food/snacks/hugemushroomslice/Initialize() diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm index ed06f1a4ab..b8f3b41f1f 100644 --- a/code/modules/food/food/superfoods.dm +++ b/code/modules/food/food/superfoods.dm @@ -334,7 +334,7 @@ icon_state = "big_veggie_slice" /datum/recipe/theonepizza - fruit = list(PLANT_TOMATO = 5, "mushroom" = 5, PLANT_EGGPLANT = 1, PLANT_CARROT = 1, PLANT_CORN = 1) + fruit = list(PLANT_TOMATO = 5, PLANT_MUSHROOMS = 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_microwave.dm b/code/modules/food/recipes_microwave.dm index 36170d2360..aed91592f1 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -263,7 +263,7 @@ I said no! result_quantity = 2 /datum/recipe/stew - fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, "mushroom" = 1) + fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, PLANT_MUSHROOMS = 1) reagents = list(REAGENT_ID_WATER = 10) items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/stew @@ -431,13 +431,13 @@ I said no! result_quantity = 2 /datum/recipe/mushroomsoup - fruit = list("mushroom" = 1) + fruit = list(PLANT_MUSHROOMS = 1) reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_MILK = 5) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/mushroomsoup /datum/recipe/chawanmushi - fruit = list("mushroom" = 1) + fruit = list(PLANT_MUSHROOMS = 1) reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SOYSAUCE = 5, REAGENT_ID_EGG = 6) result = /obj/item/reagent_containers/food/snacks/chawanmushi @@ -785,14 +785,14 @@ I said no! result = /obj/item/reagent_containers/food/snacks/bearchili /datum/recipe/bearstew - fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, "mushroom" = 1) + fruit = list(PLANT_POTATO = 1, PLANT_TOMATO = 1, PLANT_CARROT = 1, PLANT_EGGPLANT = 1, PLANT_MUSHROOMS = 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(PLANT_CARROT = 1, PLANT_CABBAGE = 1, "mushroom" = 1) + fruit = list(PLANT_CARROT = 1, PLANT_CABBAGE = 1, PLANT_MUSHROOMS = 1) reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_SPACESPICE = 2) items = list( /obj/item/reagent_containers/food/snacks/egg, @@ -834,7 +834,7 @@ I said no! /datum/recipe/risotto reagents = list(REAGENT_ID_REDWINE = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SPACESPICE = 1) - fruit = list("mushroom" = 1) + fruit = list(PLANT_MUSHROOMS = 1) reagent_mix = RECIPE_REAGENT_REPLACE //Get that rice and wine outta here result = /obj/item/reagent_containers/food/snacks/risotto diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm index 1105994087..4a43086ac9 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -53,7 +53,7 @@ result = /obj/item/reagent_containers/food/snacks/reishicup /datum/recipe/hotandsoursoup - fruit = list(PLANT_CABBAGE = 1, "mushroom" = 1) + fruit = list(PLANT_CABBAGE = 1, PLANT_MUSHROOMS = 1) reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_BLACKPEPPER = 2, REAGENT_ID_WATER = 10) items = list( /obj/item/reagent_containers/food/snacks/tofu diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index 01268e6ff9..59cc6f9445 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -402,7 +402,7 @@ /datum/recipe/mushroompizza appliance = OVEN - fruit = list("mushroom" = 5, PLANT_TOMATO = 1) + fruit = list(PLANT_MUSHROOMS = 5, PLANT_TOMATO = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/cheesewedge diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index fec080d8dc..baae35d32e 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -332,7 +332,7 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) seed_type = PLANT_SIFLETTUCE /obj/item/seeds/eggyplant - seed_type = PLANT_EGGPLANT + seed_type = PLANT_EGG_PLANT /obj/item/seeds/pineapple seed_type = PLANT_PINEAPPLE diff --git a/code/modules/hydroponics/seedtypes/eggplant.dm b/code/modules/hydroponics/seedtypes/eggplant.dm index 2fc7dc7ae0..fc1e2c8838 100644 --- a/code/modules/hydroponics/seedtypes/eggplant.dm +++ b/code/modules/hydroponics/seedtypes/eggplant.dm @@ -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 = PLANT_EGGPLANT - seed_name = PLANT_EGGPLANT + name = PLANT_EGG_PLANT + seed_name = PLANT_EGG_PLANT display_name = "egg-plants" - kitchen_tag = PLANT_EGGPLANT + kitchen_tag = PLANT_EGG_PLANT 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/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm index 8866b1bbe3..19d738c3c0 100644 --- a/code/modules/hydroponics/seedtypes/mushrooms.dm +++ b/code/modules/hydroponics/seedtypes/mushrooms.dm @@ -7,7 +7,7 @@ mutants = list(PLANT_REISHI,PLANT_AMANITA,PLANT_PLUMPHELMET) chems = list(REAGENT_ID_NUTRIMENT = list(1,25)) splat_type = /obj/effect/plant - kitchen_tag = "mushroom" + kitchen_tag = PLANT_MUSHROOMS /datum/seed/mushroom/New() ..() 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 bbf28108d0..65673e19b6 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -390,7 +390,7 @@ break if(fruit_gland) - var/selection = tgui_input_list(src, "Choose your character's fruit type. Choosing nothing will result in a default of apples.", "Fruit Type", acceptable_fruit_types) + var/selection = tgui_input_list(src, "Choose your character's fruit type. Choosing nothing will result in a default of apples.", "Fruit Type", GLOB.acceptable_fruit_types) if(selection) fruit_gland.fruit_type = selection add_verb(src, /mob/living/carbon/human/proc/alraune_fruit_pick)