From 230787235dd1ceaca6ea0f73f4929597d4fd7f5f Mon Sep 17 00:00:00 2001 From: Batrachophreno Date: Sun, 1 Jun 2025 06:55:20 -0400 Subject: [PATCH] Tajaran ingredient naming consistency (#20781) Items 1.) and 2.) of [this bug report](https://github.com/Aurorastation/Aurora.3/issues/20768), with the blessing of Alberyk in tajara-questions on the lorecord. Dirtberries and Sugar Trees, as well as products containing them and recipes referencing them, are to all consistently use their TCB names mechanically instead of a scattered mix of TCB and Siik'maas. The descriptions of these items, in cases where it fit nicely, have been updated to reference their Siik'maas names (in many the items already did so). Other species' foods may have this issue (where they have both a native name and a TCB name used interchangeably in game mechanics like the cooking codex etc., but I believe if identified they should also have this basic standard enforced. --- code/datums/trading/food.dm | 2 +- code/game/machinery/vending_types.dm | 4 +- code/modules/cargo/bounties/hydroponics.dm | 4 +- code/modules/cargo/items/hospitality.dm | 8 +-- .../recipes/cultural/recipes_tajara.dm | 28 ++++----- .../hydroponics/seed_datums/adhomai.dm | 28 ++++----- code/modules/hydroponics/seed_storage.dm | 4 +- .../mapping/planet_types/lore/srandmarr.dm | 2 +- .../food_drink_species_tajara.dm | 14 ++--- .../reagent_containers/food/drinks/bottle.dm | 12 ++-- .../reagents/reagent_containers/food/lunch.dm | 2 +- ...trachophreno-IngredientNameConsistency.yml | 59 ++++++++++++++++++ icons/obj/drinks.dmi | Bin 118669 -> 118670 bytes icons/obj/hydroponics_products.dmi | Bin 26183 -> 26184 bytes .../away_site/romanovich/grand_romanovich.dmm | 10 +-- .../tajara/taj_safehouse/tajara_safehouse.dmm | 6 +- .../tajara/taj_smuggler/tajaran_smuggler.dmm | 4 +- .../exoplanets/adhomai/adhomai_bar.dmm | 16 ++--- .../exoplanets/adhomai/adhomai_hunting.dmm | 2 +- .../exoplanets/adhomai/adhomai_village.dmm | 8 +-- .../exoplanets/adhomai/nka_base.dmm | 2 +- 21 files changed, 137 insertions(+), 78 deletions(-) create mode 100644 html/changelogs/Batrachophreno-IngredientNameConsistency.yml diff --git a/code/datums/trading/food.dm b/code/datums/trading/food.dm index 11387871e4f..ab927688c45 100644 --- a/code/datums/trading/food.dm +++ b/code/datums/trading/food.dm @@ -251,7 +251,7 @@ /obj/item/reagent_containers/food/drinks/bottle/treebark_firewater = TRADER_THIS_TYPE, /obj/item/reagent_containers/food/drinks/bottle/veterans_choice = TRADER_THIS_TYPE, /obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water = TRADER_THIS_TYPE, - /obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor = TRADER_THIS_TYPE, + /obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor = TRADER_THIS_TYPE, /obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine = TRADER_THIS_TYPE, /obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz = TRADER_THIS_TYPE, /obj/item/reagent_containers/food/drinks/bottle/hrozamal_soda = TRADER_THIS_TYPE diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index f89d083ac35..c06fc201c94 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -946,7 +946,7 @@ /obj/item/seeds/limeseed = 3, /obj/item/seeds/mtearseed = 3, /obj/item/seeds/mintseed = 3, - /obj/item/seeds/nifberries = 2, + /obj/item/seeds/dirtberries = 2, /obj/item/seeds/onionseed = 3, /obj/item/seeds/oracleseed = 3, /obj/item/seeds/orangeseed = 3, @@ -1030,7 +1030,7 @@ /obj/item/seeds/limeseed = 50, /obj/item/seeds/mtearseed = 60, /obj/item/seeds/mintseed = 70, - /obj/item/seeds/nifberries = 70, + /obj/item/seeds/dirtberries = 70, /obj/item/seeds/onionseed = 30, /obj/item/seeds/oracleseed = 50, /obj/item/seeds/orangeseed = 40, diff --git a/code/modules/cargo/bounties/hydroponics.dm b/code/modules/cargo/bounties/hydroponics.dm index 74a80baac03..b195953386f 100644 --- a/code/modules/cargo/bounties/hydroponics.dm +++ b/code/modules/cargo/bounties/hydroponics.dm @@ -88,10 +88,10 @@ /datum/seed/watermelon, /datum/seed/citrus, /datum/seed/cherries, - /datum/seed/nifberries, + /datum/seed/dirtberries, /datum/seed/dyn, /datum/seed/wulumunusha, - /datum/seed/nmshaan) + /datum/seed/sugartree) /datum/bounty/item/hydroponicist/produce/mushroom name = "Produce - Mushrooms" diff --git a/code/modules/cargo/items/hospitality.dm b/code/modules/cargo/items/hospitality.dm index bbb8b1bb32b..fbc1dd8c22d 100644 --- a/code/modules/cargo/items/hospitality.dm +++ b/code/modules/cargo/items/hospitality.dm @@ -1540,14 +1540,14 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/nmshaan_liquor +/singleton/cargo_item/sugartree_liquor category = "hospitality" - name = "Nm'shaan Liquor" + name = "Sugar Tree Liquor" supplier = "getmore" - description = "A strong Adhomian liquor reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking." + description = "Called Nm'shaan Liquor in native Siik'maas, this strong Adhomian liquor is reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking." price = 200 items = list( - /obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor + /obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor ) access = 0 container_type = "crate" diff --git a/code/modules/cooking/recipes/cultural/recipes_tajara.dm b/code/modules/cooking/recipes/cultural/recipes_tajara.dm index 70b3591e4e7..df12fc98bd1 100644 --- a/code/modules/cooking/recipes/cultural/recipes_tajara.dm +++ b/code/modules/cooking/recipes/cultural/recipes_tajara.dm @@ -1,7 +1,7 @@ // Tajaran breads /singleton/recipe/tajaran_bread appliance = OVEN - fruit = list("nifberries" = 1) + fruit = list("dirtberries" = 1) reagents = list(/singleton/reagent/spacespice = 1) items = list( /obj/item/reagent_containers/food/snacks/flatbread @@ -22,7 +22,7 @@ // Tajaran peasant food /singleton/recipe/tajaran_stew appliance = SAUCEPAN | POT - fruit = list("nifberries" = 2, "mushroom" = 1, "mtear" = 1) + fruit = list("dirtberries" = 2, "mushroom" = 1, "mtear" = 1) reagents = list(/singleton/reagent/water = 10) items = list( /obj/item/reagent_containers/food/snacks/meat/adhomai, @@ -51,7 +51,7 @@ /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/stack/rods ) - fruit = list("earthenroot" = 1, "nifberries" = 1) + fruit = list("earthenroot" = 1, "dirtberries" = 1) result = /obj/item/reagent_containers/food/snacks/nomadskewer /datum/chemical_reaction/fermentedworm @@ -106,7 +106,7 @@ /singleton/recipe/earthenroot_salad appliance = MIX - fruit = list("earthenroot" = 1, "mtear" = 2, "nifberries" = 1) + fruit = list("earthenroot" = 1, "mtear" = 2, "dirtberries" = 1) items = list( /obj/item/reagent_containers/food/snacks/dip/sarmikhir ) @@ -226,7 +226,7 @@ /singleton/recipe/dirt_roast appliance = OVEN reagents = list(/singleton/reagent/spacespice = 1, /singleton/reagent/sugar = 5) - fruit = list("nifberries" = 1) + fruit = list("dirtberries" = 1) result = /obj/item/reagent_containers/food/snacks/dirt_roast /singleton/recipe/fatshouter_fillet @@ -253,7 +253,7 @@ /singleton/recipe/creamice reagents = list(/singleton/reagent/drink/milk/adhomai = 10, /singleton/reagent/sugar = 10, /singleton/reagent/drink/ice = 10) - fruit = list("nifberries" = 1) + fruit = list("dirtberries" = 1) result = /obj/item/reagent_containers/food/snacks/creamice /singleton/recipe/stuffed_earthenroot @@ -278,7 +278,7 @@ /singleton/recipe/scoutration appliance = OVEN - fruit = list("nifberries" = 2) + fruit = list("dirtberries" = 2) reagents = list(/singleton/reagent/sodiumchloride = 1) reagent_mix = RECIPE_REAGENT_REPLACE items = list( @@ -321,7 +321,7 @@ // Tajaran candy /singleton/recipe/tajcandy appliance = OVEN - fruit = list("nmshaan" = 2) + fruit = list("sugartree" = 2) reagents = list(/singleton/reagent/drink/milk/adhomai = 5, /singleton/reagent/nutriment/protein/egg = 3) reagent_mix = RECIPE_REAGENT_REPLACE items = list( @@ -338,14 +338,14 @@ /singleton/recipe/tajhummus appliance = MIX - fruit = list("mtear" = 1, "nifberries" = 1) + fruit = list("mtear" = 1, "dirtberries" = 1) reagents = list(/singleton/reagent/spacespice = 1, /singleton/reagent/nutriment/flour/nfrihi = 5) result = /obj/item/reagent_containers/food/snacks/dip/tajhummus // Tajaran gelatin-based food /singleton/recipe/seafoodmousse appliance = MIX - fruit = list("nifberries" = 1) + fruit = list("dirtberries" = 1) items = list( /obj/item/reagent_containers/food/snacks/clam, /obj/item/reagent_containers/food/snacks/clam, @@ -357,14 +357,14 @@ /singleton/recipe/vegello appliance = MIX - fruit = list("nifberries" = 2, "earthenroot" = 2, "mtear" = 2) + fruit = list("dirtberries" = 2, "earthenroot" = 2, "mtear" = 2) reagents = list(/singleton/reagent/nutriment/gelatin = 10, /singleton/reagent/water = 5, /singleton/reagent/spacespice = 1) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/sliceable/vegello /singleton/recipe/fruitgello appliance = MIX - fruit = list("nmshaan" = 2, "nifberries" = 1) + fruit = list("sugartree" = 2, "dirtberries" = 1) reagents = list(/singleton/reagent/nutriment/gelatin = 10, /singleton/reagent/water = 5, /singleton/reagent/sugar = 5, /singleton/reagent/drink/milk/cream = 5) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/fruitgello @@ -385,7 +385,7 @@ /singleton/recipe/fatshouterbake appliance = OVEN - fruit = list("nmshaan" = 2) + fruit = list("sugartree" = 2) items = list( /obj/item/reagent_containers/food/snacks/adhomian_can, /obj/item/reagent_containers/food/snacks/adhomian_can @@ -396,7 +396,7 @@ /singleton/recipe/crownfurter appliance = OVEN - fruit = list("nifberries" = 1) + fruit = list("dirtberries" = 1) items = list( /obj/item/reagent_containers/food/snacks/adhomian_sausage, /obj/item/reagent_containers/food/snacks/adhomian_sausage, diff --git a/code/modules/hydroponics/seed_datums/adhomai.dm b/code/modules/hydroponics/seed_datums/adhomai.dm index 8046ab5c5b0..b185f59ba2c 100644 --- a/code/modules/hydroponics/seed_datums/adhomai.dm +++ b/code/modules/hydroponics/seed_datums/adhomai.dm @@ -76,16 +76,16 @@ /obj/item/seeds/earthenroot seed_type = "earthenroot" -/datum/seed/nifberries - name = "nifberries" - seed_name = "dirt berries" +/datum/seed/dirtberries + name = "dirtberries" + seed_name = "dirtberries" display_name = "dirt berries shrub" product_desc = "a pile of Adhomian berries used by the Tajara for its oil." product_desc_extended = "An above-ground evergreen shrub that grows sweet, starchy legumes underground in thick pods. 'Dirt Berries', or Zhu'hagha Nifs, grow like peanuts but bear several nuts like peas in a pod, typically around 8 thumb-sized nifs in each pod. Their flavor is rich, fatty, and savory, and they are used to produce oil." chems = list(/singleton/reagent/nutriment = list(0, 15), /singleton/reagent/nutriment/triglyceride/oil = list(1, 5), /singleton/reagent/drink/dirtberryjuice = list(10,10)) - kitchen_tag = "nifberries" + kitchen_tag = "dirtberries" -/datum/seed/nifberries/setup_traits() +/datum/seed/dirtberries/setup_traits() ..() set_trait(TRAIT_HARVEST_REPEAT, 1) set_trait(TRAIT_JUICY, 1) @@ -101,8 +101,8 @@ set_trait(TRAIT_WATER_CONSUMPTION, 6) set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) -/obj/item/seeds/nifberries - seed_type = "nifberries" +/obj/item/seeds/dirtberries + seed_type = "dirtberries" /datum/seed/mushroom/nfrihi name = "nfrihi" @@ -133,8 +133,8 @@ /obj/item/seeds/blizzard seed_type = "nfrihi" -/datum/seed/nmshaan - name = "nmshaan" +/datum/seed/sugartree + name = "sugar tree" seed_name = "sugar tree" display_name = "sugar trees" product_desc = "the fruit of the Sugar Tree, native to Adhomai. It is sweet and commonly used in candies." @@ -142,21 +142,21 @@ seed_noun = SEED_NOUN_SEEDS mutants = null chems = list(/singleton/reagent/sugar = list(2, 10), /singleton/reagent/nutriment/gelatin = list(2, 5)) - kitchen_tag = "nmshaan" + kitchen_tag = "sugartree" -/datum/seed/nmshaan/setup_traits() +/datum/seed/sugartree/setup_traits() ..() set_trait(TRAIT_HARVEST_REPEAT, 1) set_trait(TRAIT_MATURATION, 9) set_trait(TRAIT_PRODUCTION, 5) set_trait(TRAIT_YIELD, 2) - set_trait(TRAIT_PRODUCT_ICON,"nmshaan") + set_trait(TRAIT_PRODUCT_ICON,"sugartree") set_trait(TRAIT_PRODUCT_COLOUR,"#fffdf7") set_trait(TRAIT_PLANT_COLOUR,"#31331c") - set_trait(TRAIT_PLANT_ICON,"nmshaan") + set_trait(TRAIT_PLANT_ICON,"sugartree") set_trait(TRAIT_IDEAL_HEAT, 253) set_trait(TRAIT_WATER_CONSUMPTION, 4) set_trait(TRAIT_IDEAL_LIGHT, 3) /obj/item/seeds/sugartree - seed_type = "nmshaan" + seed_type = "sugartree" diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 3f57d1ecf0b..a6ecaf3f1a4 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -292,7 +292,7 @@ /obj/item/seeds/cocoapodseed = 3, /obj/item/seeds/coffeeseed = 3, /obj/item/seeds/cornseed = 3, - /obj/item/seeds/nifberries = 2, + /obj/item/seeds/dirtberries = 2, /obj/item/seeds/dynseed = 3, /obj/item/seeds/earthenroot = 2, /obj/item/seeds/eggplantseed = 3, @@ -378,7 +378,7 @@ /obj/item/seeds/cocoapodseed = 3, /obj/item/seeds/coffeeseed = 3, /obj/item/seeds/cornseed = 3, - /obj/item/seeds/nifberries = 2, + /obj/item/seeds/dirtberries = 2, /obj/item/seeds/dynseed = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/earthenroot = 2, diff --git a/code/modules/mapping/planet_types/lore/srandmarr.dm b/code/modules/mapping/planet_types/lore/srandmarr.dm index 712154753fe..3bbcaaf2f32 100644 --- a/code/modules/mapping/planet_types/lore/srandmarr.dm +++ b/code/modules/mapping/planet_types/lore/srandmarr.dm @@ -154,7 +154,7 @@ water_color = "#b5dfeb" generated_name = FALSE ruin_planet_type = PLANET_LORE - small_flora_types = list(/datum/seed/shand, /datum/seed/mtear, /datum/seed/earthenroot, /datum/seed/nifberries, /datum/seed/mushroom/nfrihi, /datum/seed/nmshaan) + small_flora_types = list(/datum/seed/shand, /datum/seed/mtear, /datum/seed/earthenroot, /datum/seed/dirtberries, /datum/seed/mushroom/nfrihi, /datum/seed/sugartree) ruin_type_whitelist = list (/datum/map_template/ruin/exoplanet/adhomai_hunting, /datum/map_template/ruin/exoplanet/adhomai_minefield, /datum/map_template/ruin/exoplanet/adhomai_village, /datum/map_template/ruin/exoplanet/adhomai_abandoned_village, /datum/map_template/ruin/exoplanet/adhomai_battlefield, /datum/map_template/ruin/exoplanet/adhomai_cavern, /datum/map_template/ruin/exoplanet/adhomai_bar, /datum/map_template/ruin/exoplanet/adhomai_war_memorial, /datum/map_template/ruin/exoplanet/adhomai_raskara_ritual, /datum/map_template/ruin/exoplanet/adhomai_raskariim_hideout, /datum/map_template/ruin/exoplanet/adhomai_cavern_geist, diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm index 42d996e7d3a..f861647be3a 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm @@ -217,19 +217,19 @@ glass_name = "glass of shyyr kirr'tyr wine" glass_desc = "Tajaran spirit infused with some eel-like Adhomian creature." -/singleton/reagent/alcohol/nmshaan_liquor - name = "Nm'shaan Liquor" +/singleton/reagent/alcohol/sugartree_liquor + name = "Sugar Tree Liquor" color = "#FE6B03" - description = "A strong Adhomian liquor reserved for special occasions." + description = "A strong Adhomian nm'shaan liquor reserved for special occasions." taste_description = "sweet and silky alcohol" strength = 70 - glass_icon_state = "nmshaanliquor_glass" - glass_name = "glass of nm'shaan liquor" - glass_desc = "A strong Adhomian liquor reserved for special occasions." + glass_icon_state = "sugartreeliquor_glass" + glass_name = "glass of sugar tree liquor" + glass_desc = "A strong nm'shaan Adhomian liquor reserved for special occasions." -/singleton/reagent/alcohol/nmshaan_liquor/darmadhirbrew +/singleton/reagent/alcohol/sugartree_liquor/darmadhirbrew name = "Darmadhir Brew" color = "#E4A769" description = "A rare and expensive brand of nm'shaan liquor." diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 5e480adb718..d2b0d3bc87a 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -839,14 +839,14 @@ Tajara consider the wine to be exotic or outright disgusting. The Shyyr Kirr'tyr is usually eaten after the beverage is imbibed." reagents_to_add = list(/singleton/reagent/alcohol/shyyrkirrtyr_wine = 100) -/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor - name = "nm'shaan liquor" - desc = "A strong Adhomian liquor reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking." - icon_state = "nmshaanliquor" +/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor + name = "sugar tree liquor" + desc = "Also called nm'shaan liquor in native Siik'maas: a strong Adhomian liquor reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking." + icon_state = "sugartreeliquor" center_of_mass = list("x" = 16,"y" = 5) desc_extended = "An alcoholic drink manufactured from the fruit of the Nm'shaan plant. It usually has a high level of alcohol by volume. Nm'shaan liquor was once reserved for the \ consumption of the nobility; even today it is considered a decadent drink reserved for fancy occasions." - reagents_to_add = list(/singleton/reagent/alcohol/nmshaan_liquor = 100) + reagents_to_add = list(/singleton/reagent/alcohol/sugartree_liquor = 100) /obj/item/reagent_containers/food/drinks/bottle/veterans_choice name = "veteran's choice" @@ -875,7 +875,7 @@ desc_extended = "A famous variation of the Nm'shaan Liquor; it is described as one of Adhomai's finest spirits. It is produced solely by a small family-owned brewery in Miran'mir. Its \ recipe is a secret passed down through the generations of the Darmadhir household since immemorial times. The only living member of the family, Hazyr Darmadhir, is a 68 years old \ Tajara. His sole heir and son died in the Second Revolution after being drafted to fight for the royal army. Alcohol collectors stipulate that the brew's price will skyrocket after Hazyr's death." - reagents_to_add = list(/singleton/reagent/alcohol/nmshaan_liquor/darmadhirbrew = 100) + reagents_to_add = list(/singleton/reagent/alcohol/sugartree_liquor/darmadhirbrew = 100) /obj/item/reagent_containers/food/drinks/bottle/pulque name = "Don Augusto's pulque" diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index e2f6b3bd241..566e1d5f9b9 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -173,7 +173,7 @@ GLOBAL_LIST_INIT(lunchables_alcohol_reagents_, list( /singleton/reagent/alcohol/pwine, /singleton/reagent/alcohol/threemileisland, /singleton/reagent/alcohol/toxins_special, - /singleton/reagent/alcohol/nmshaan_liquor/darmadhirbrew + /singleton/reagent/alcohol/sugartree_liquor/darmadhirbrew )) /proc/lunchables_lunches() diff --git a/html/changelogs/Batrachophreno-IngredientNameConsistency.yml b/html/changelogs/Batrachophreno-IngredientNameConsistency.yml new file mode 100644 index 00000000000..f6a7d3fa1dc --- /dev/null +++ b/html/changelogs/Batrachophreno-IngredientNameConsistency.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Batrachophreno + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Updated instances of 'nifberries' to 'dirtberries' in recipes/ingredients/products for general consistency." + - qol: "Updated instances of 'nm'shaan' to 'sugar tree' in recipes/ingredients/products for general consistency." \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 12879f924e1e1985b30683e10d5711087cd4bcd5..d13994fa85c8c50c4a5ce42d6b5ada777f5dd683 100644 GIT binary patch delta 2970 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 delta 2969 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 P6%7)DzYDj&3jxo=fh)E@ diff --git a/icons/obj/hydroponics_products.dmi b/icons/obj/hydroponics_products.dmi index 322bbc6c4893d355ef860f8afa1da991eeb781fa..51996ea4248983396eb60db884baff2a7b9ab59f 100644 GIT binary patch delta 730 zcmV<00ww*&%mK*E0gxmC-jO9Ff4hfVh89B)?K{v8W2=!RfszwsPrrlg>@@JtTMPV{ z=z|g&-8R48e}8;6Z=WCQ6H9h6G`r^E=VrY+yL}m&U2}i8UJdN}q11nJp~B6sxoJIx z?%e_xT7MJ}r9 zsBNidz=^~HGJPMq!Fi{vDEd72E(U#Rx$l#wpwHmo!f?C6=@zEIY-XwN@gntIUZlRyi+qCRGb~?V`KrpmrFbCG z!c=sWVxbaMCa%+OtX#F`>rzi9%$L3b4w(B3qsMc2?l+7c&*HiNe}H}MLo7TSHNKW( zG<^0_0?h&2jXh**4l&Gn>0`_hcotpz8gs;xIpWzI@nVj6g(K$v2lrFKaqWj-F0R9` z=v>GjVO{$qoG<+nUL8~N_~1Q{5x>*t1_|~j7x1B+Twwe#o(Cp;QBvGnORi@+fb|oj zb7_X~wHiWtDTN07e`vuO!*hj#?6oME^mb$O;F5^z7?bs^Lv%jqkgaDH%s3XgV78tp zh}Po-POPP_!>_P*@~sI2mlmB2m7;Qe38pcT?XC?6aRc5z=cy+t!iL(iM1Vs9Iydj9 z+@a3U5mpanP|IZa?b$K`57GmRo;U*wo{ER>i;sUU`g6bnNAYUJ6edGO_dVe$^Dm9D z-`)C4A9=??e?BAcIOuO@^-FDU19)#+2VvNWlvu1BO7d#|$8MYVueavy^JD!NVymhd M@9#-$vkC(}V^K?XaR2}S delta 729 zcmV;~0w(>)%mK&D0gxmC-H|0Ee{1a_m!ZYbL;DW2!$ewTNucEf+0*YJIXeyf^VR}C zCKg4BjBmT2Z@=C@yVsBR^@(NjDR#T=;rnL2I{STb-LAX8Tdy4Zqbv2FsZil=*WL7i z;@8c3wf8c0yKcK)9fU@%e_s^^&k<917`w;V1I8Y8HujPxPb%ywQlv?De@uEtdKS5; zYM{QSBLhw(6_DxsFgPE)u9E2M-1`*u)bjC|14VrWhmg)J`UsXDzz zjzXCsHi1gd$(Vr88t2JLN+S%n8=P)o3aq9{eUBHZ@A4w`eO}}fEPufA8I~`qj9f|p z3N6k>M>!QLNoC>({l=OKe+9j}lr$pWScLf?v)Atr$~gense^9kz+=*Hz&U=!bk^O; zNBzl8KC*r`&W=gXMNWIHhknbF_VWN_H+YVBHhyp84>taY^EL*+0c{+>JrkbEo<%OO zZexPMi=<-Y_`VL#2aoF{cwXwsg!wX8zyWQ(FnYX(+q_})conz#e*^Y)4zcjbsPSBm z$?(}r3p598H};UNImEE)WsWgN;8k>;Ys?W(=7=BWh-Y)e3mnnrAKcFc$8{cpx%dIU zqNhUP3)Xc`!uc{U;oULkfIocTG2wT58<1ds@)3WOlaGua#lakZk+HwQa0qma` zZLJx?*KP>ur4<_Rf1?FY7;YU3ve%|y(%X&AgDDX|Fed9+hiE(KkgaDHtT-0AV78tp zh}Po-F07|vz^|}=4!sEjmlmB2ouYC*1@oB6cGt#(c!$r=ahx0(ep)mSJ_azgg)mP8 z>I~Ch^-%TnOorc`JrnRU+Og