From f0dba681b8fe0cba68741a7570da94513d47dfcd Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 30 Oct 2023 23:01:02 +0100 Subject: [PATCH 1/4] [MIRROR] Adds back in corn oil to fix Glycerol's recipe. [MDB IGNORE] (#24660) * Adds back in corn oil to fix Glycerol's recipe. (#79285) ## About The Pull Request fixes #78087 This PR adds back in corn oil and changes the vegetable oil reagent in corn to become corn oil, and glycerol's recipe has been changed back to using corn oil. Corn also produces corn oil when grinded now, where it previously would only produce cornmeal. ## Why It's Good For The Game The foodening accidentally changed corn oil to vegetable oil when it was actually a crafting ingredient for a chemical. This PR makes it still a consumable oil so that there's the best of both worlds. Having glycerol being able to be made by vegetable oil changed a rare chemical into something you could get by just going to the cook's cooking oil vat. Considering this is the chemical used to make the instant death shotgun shell, that's pretty bad. * Adds back in corn oil to fix Glycerol's recipe. --------- Co-authored-by: CRITAWAKETS --- code/modules/hydroponics/grown/corn.dm | 4 ++-- code/modules/reagents/chemistry/reagents/food_reagents.dm | 7 +++++++ code/modules/reagents/chemistry/recipes/others.dm | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm index a606cf62017cc4..1b3a7979cf0587 100644 --- a/code/modules/hydroponics/grown/corn.dm +++ b/code/modules/hydroponics/grown/corn.dm @@ -14,7 +14,7 @@ icon_grow = "corn-grow" // Uses one growth icons set for all the subtypes icon_dead = "corn-dead" // Same for the dead icon mutatelist = list(/obj/item/seeds/corn/snapcorn) - reagents_add = list(/datum/reagent/consumable/nutriment/fat/oil = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) + reagents_add = list(/datum/reagent/consumable/nutriment/fat/oil/corn = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) /obj/item/food/grown/corn seed = /obj/item/seeds/corn @@ -24,7 +24,7 @@ trash_type = /obj/item/grown/corncob bite_consumption_mod = 2 foodtypes = VEGETABLES - grind_results = list(/datum/reagent/consumable/cornmeal = 0) + grind_results = list(/datum/reagent/consumable/cornmeal = 0, /datum/reagent/consumable/nutriment/fat/oil/corn = 0) juice_typepath = /datum/reagent/consumable/corn_starch tastes = list("corn" = 1) distill_reagent = /datum/reagent/consumable/ethanol/whiskey diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index dc29633e148d8d..8d6c617b816a67 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -226,6 +226,13 @@ nutriment_factor = 10 default_container = /obj/item/reagent_containers/condiment/olive_oil +/datum/reagent/consumable/nutriment/fat/oil/corn + name = "Corn Oil" + description = "An oil derived from various types of corn." + color = "#302000" // rgb: 48, 32, 0 + taste_description = "slime" + nutriment_factor = 5 //it's a very cheap oil + /datum/reagent/consumable/nutriment/organ_tissue name = "Organ Tissue" description = "Natural tissues that make up the bulk of organs, providing many vitamins and minerals." diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 7afd69182619b8..d3ad4bd6ce5d3e 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -31,7 +31,7 @@ /datum/chemical_reaction/glycerol results = list(/datum/reagent/glycerol = 1) - required_reagents = list(/datum/reagent/consumable/nutriment/fat/oil = 3, /datum/reagent/toxin/acid = 1) + required_reagents = list(/datum/reagent/consumable/nutriment/fat/oil/corn = 3, /datum/reagent/toxin/acid = 1) reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE | REACTION_TAG_EXPLOSIVE /datum/chemical_reaction/sodiumchloride From 76a201a234dbd0f37abc7f22ed9fde86699eec17 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 30 Oct 2023 23:01:27 +0100 Subject: [PATCH 2/4] Automatic changelog for PR #24660 [ci skip] --- html/changelogs/AutoChangeLog-pr-24660.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-24660.yml diff --git a/html/changelogs/AutoChangeLog-pr-24660.yml b/html/changelogs/AutoChangeLog-pr-24660.yml new file mode 100644 index 00000000000000..c3302749a80ca8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-24660.yml @@ -0,0 +1,6 @@ +author: "SkyratBot" +delete-after: True +changes: + - rscadd: "Corn oil is now produced from corn instead of regular vegetable oil." + - balance: "Glycerol now uses corn oil instead of vegetable oil in it's recipe." + - bugfix: "Grinding corn now produces oil when it previously only made cornmeal despite having oil in it's reagents." \ No newline at end of file From 6a766e25d7b3b96c61c1aea625a4be68083ed343 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 30 Oct 2023 23:01:41 +0100 Subject: [PATCH 3/4] [MIRROR] Change candy description to have some form of punctuation [MDB IGNORE] (#24666) * Change candy description to have some form of punctuation (#79387) :cl: spellcheck: Changed candy description to read better /:cl: * Change candy description to have some form of punctuation --------- Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> --- code/game/objects/items/food/snacks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm index 541c36b115060b..1c3cb7736cec0f 100644 --- a/code/game/objects/items/food/snacks.dm +++ b/code/game/objects/items/food/snacks.dm @@ -4,7 +4,7 @@ /obj/item/food/candy name = "candy" - desc = "Nougat love it or hate it." + desc = "It's nougat, love it or hate it." icon_state = "candy" trash_type = /obj/item/trash/candy food_reagents = list( From 11291fd8f7e5065d81c8320de5dd7b58b9e37290 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 30 Oct 2023 23:16:54 +0100 Subject: [PATCH 4/4] Automatic changelog for PR #24666 [ci skip] --- html/changelogs/AutoChangeLog-pr-24666.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-24666.yml diff --git a/html/changelogs/AutoChangeLog-pr-24666.yml b/html/changelogs/AutoChangeLog-pr-24666.yml new file mode 100644 index 00000000000000..1c9b8c5cdcee70 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-24666.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - spellcheck: "Changed candy description to read better" \ No newline at end of file