Merge pull request #415 from KotetsuRedwood/KotetsuRedwood-CinnamonStuff

Cinnamon stuff!

code/modules/food/food/snacks_ch.dm

@@ -191,4 +191,61 @@
 /obj/item/weapon/reagent_containers/food/snacks/greentealeaf/Initialize()
 	..()
 	reagents.add_reagent("tealeavesgreen", 6)
-	bitesize = 1
+	bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/butterscotch
+	name = "Butterscotch"
+	desc = "A sweet, golden-brown liquid, usually used as part of confectionary. Just a spoonful wouldn't hurt, right?"
+	icon = 'icons/obj/food_ch.dmi'
+	icon_state = "butterscotch" //Sprite by Dinnel
+	nutriment_amt = 1
+	nutriment_desc = list("sickly sweet deliciousness" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/butterscotch/Initialize()
+	..()
+	bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/slicable/buttspie
+	name = "Butterscotch-Cinnamon Pie"
+	desc = "A delightfully caramel-coloured filling in a crispy pie base, dotted with sprays of cream."
+	icon = 'icons/obj/food_ch.dmi'
+	icon_state = "butts_pie" //Sprite by Dinnel
+	slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/buttspie
+	slices_num = 6
+	nutriment_amt = 12
+	nutriment_desc = list("a warm, buttery sweetness that reminds you of home" = 5)
+	center_of_mass = list("x"=16, "y"=9)
+
+/obj/item/weapon/reagent_containers/food/snacks/slicable/buttspie/Initialize()
+	..()
+	bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/slice/buttspie //TODO: Fix the numbers.
+	name = "Slice of Butterscotch-Cinnamon Pie"
+	desc = "A slice of pie, filled with delightfully caramel-coloured filling. There a spray of cream on top."
+	icon = 'icons/obj/food_ch.dmi'
+	icon_state = "butts_pie_slice" //Sprite by Dinnel
+	trash = /obj/item/trash/plate
+	whole_path = /obj/item/weapon/reagent_containers/food/snacks/slicable/buttspie
+
+/obj/item/weapon/reagent_containers/food/snacks/slice/buttspie/Initialize()
+	..()
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/spicy_boys //These are off-brand red hots/atomic fireballs
+	name = "Spicy Boys"
+	desc = "Spicy little candy rounds for very naughty individuals."
+	icon = 'icons/obj/food_ch.dmi'
+	icon_state = "spicy_boys" //Sprite by Dinnel
+	nutriment_amt = 1 //todo - change numbers
+	nutriment_desc = list("a sweet, candy-like spiciness." = 2) //WIP flavour??
+
+/obj/item/weapon/reagent_containers/food/snacks/cinnamonroll
+	name = "cinnamon roll"
+	desc = "A precious little cinnamon roll, just begging to be eaten."
+	icon = 'icons/obj/food_ch.dmi'
+	icon_state = "cinnamon_roll" //Sprite by Dinnel
+	nutriment_amt = 1 //Todo - Change numbers.
+	nutriment_desc = list("a precious sweetness that needs protecting" = 2) //This is a WIP flavour, Could keep it if you don't mind the "gotta protect the precious cinnamon roll" joke
+
+//TODO: Maybe butterscotch candies?

code/modules/food/recipes_microwave_ch.dm

@@ -97,3 +97,12 @@
 		/obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/greentealeaf
+
+/datum/recipe/butterscotch
+	reagents = list("sugar" = 10, "cream" = 5)
+	reagent_mix = RECIPE_REAGENT_REPLACE //No actual reagents since it's meant to be a cooking item
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/spreads/butter
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/butterscotch
+	result_quantity = 2

code/modules/food/recipes_oven_ch.dm

@@ -0,0 +1,23 @@
+/datum/recipe/buttspie
+	appliance = OVEN
+	reagents = list("cinnamonpowder" = 10)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/butterscotch,
+		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/slicable/buttspie
+
+/datum/recipe/cinnamon_roll
+	appliance = OVEN
+	reagents = list("cinnamonpowder" = 5, "sugar" = 10)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/dough,
+		/obj/item/weapon/reagent_containers/food/snacks/spreads/butter
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/cinnamonroll
+
+/datum/recipe/spicy_boys
+	appliance = OVEN
+	reagents = list("cinnamonpowder" = 5, "sugar" = 10, "cornoil" = 10)
+	result = /obj/item/weapon/reagent_containers/food/snacks/spicy_boys
+	result_quantity = 6

code/modules/hydroponics/seed_datums_ch.dm

@@ -200,4 +200,23 @@
 	set_trait(TRAIT_PLANT_ICON,"alien4") //spooky pods
 	set_trait(TRAIT_IDEAL_HEAT, 283)
 	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0)
-	set_trait(TRAIT_WATER_CONSUMPTION, 0)
+	set_trait(TRAIT_WATER_CONSUMPTION, 0)
+
+/datum/seed/cinnamon //WIP - I have no idea what I'm doing with growables in code right now.
+	name = "cinnamon"
+	seed_name = "cinnamon"
+	display_name = "cinnamon tree"
+	chems = list("cinnamonpowder" = list(5,25))
+	mutants = null
+	kitchen_tag = "cinnamon"
+
+/datum/seed/cinnamon/New()
+	..()
+	set_trait(TRAIT_HARVEST_REPEAT,1)
+	set_trait(TRAIT_MATURATION,6)
+	set_trait(TRAIT_PRODUCTION,6)
+	set_trait(TRAIT_YIELD,5)
+	set_trait(TRAIT_POTENCY,10)
+	set_trait(TRAIT_PRODUCT_ICON, "stalk")
+	set_trait(TRAIT_PRODUCT_COLOUR, "#FF9A85")
+	set_trait(TRAIT_PLANT_ICON,"tree2")

code/modules/hydroponics/seed_packets_ch.dm

@@ -1,6 +1,10 @@
-
-/obj/item/seeds/teaseed
-	seed_type = "tea"
-
-/obj/item/seeds/pitcherseed
-	seed_type = "pitcher plant"
+
+/obj/item/seeds/teaseed
+	seed_type = "tea"
+
+
+/obj/item/seeds/cinnamon
+	seed_type = "cinnamon"
+
+/obj/item/seeds/pitcherseed
+	seed_type = "pitcher plant"

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_ch.dm

@@ -9,4 +9,16 @@
 	strength = 15
 
 	glass_name = "akvavit"
-	glass_desc = "Burns the nose and throat, and soothes it with a herby aftertaste...Barely."
+	glass_desc = "Burns the nose and throat, and soothes it with a herby aftertaste...Barely."
+
+/datum/reagent/cinnamonpowder
+	name = "ground cinnamon"
+	id = "cinnamonpowder"
+	description = "Cinnamon, a spice made from tree bark, ground into a fine powder. Probably not a good idea to eat on its own!"
+	taste_description= "sweet spice with a hint of wood"
+	color = "#a96622"
+
+	glass_name = "ground cinnamon"
+	glass_desc = "A glass of ground cinnamon. Dare you take the challenge?"
+
+//TODO: Make eating it on its own make you cough.

vorestation.dme

@@ -2229,6 +2229,7 @@
 #include "code\modules\food\recipes_microwave_ch.dm"
 #include "code\modules\food\recipes_microwave_vr.dm"
 #include "code\modules\food\recipes_oven.dm"
+#include "code\modules\food\recipes_oven_ch.dm"
 #include "code\modules\food\drinkingglass\drinkingglass.dm"
 #include "code\modules\food\drinkingglass\extras.dm"
 #include "code\modules\food\drinkingglass\glass_boxes.dm"