Merge branch 'Skyrat-SS13:master' into master

Sea-of-Lost-Souls · Oct 30, 2023 · 75b0a8b · 75b0a8b
2 parents a05bb60 + 11291fd
commit 75b0a8b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git 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(

diff --git 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
@@ -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
@@ -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

diff --git a/html/changelogs/AutoChangeLog-pr-24660.yml 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."
diff --git a/html/changelogs/AutoChangeLog-pr-24666.yml b/html/changelogs/AutoChangeLog-pr-24666.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+  - spellcheck: "Changed candy description to read better"