Food and seed update: the tobacco fixing (#5020)

-adds tobacco, peppercorn, onion and garlic seeds -adds new cooking recipes, sprites from baystation and polaris
2025-12-24 17:11:22 +00:00 · 2018-08-01 20:10:25 -03:00
parent 047c3a4c83
commit eb63c1d178
14 changed files with 443 additions and 132 deletions
--- a/code/game/machinery/vending_types.dm
+++ b/code/game/machinery/vending_types.dm
@@ -414,7 +414,9 @@
 		/obj/item/seeds/chiliseed = 3,
 		/obj/item/seeds/cocoapodseed = 3,
 		/obj/item/seeds/cornseed = 3,
+		/obj/item/seeds/earthenroot = 2,
 		/obj/item/seeds/eggplantseed = 3,
+		/obj/item/seeds/garlicseed = 3,
 		/obj/item/seeds/grapeseed = 3,
 		/obj/item/seeds/grassseed = 3,
 		/obj/item/seeds/greengrapeseed = 3,
@@ -422,8 +424,11 @@
 		/obj/item/seeds/lemonseed = 3,
 		/obj/item/seeds/limeseed = 3,
 		/obj/item/seeds/mtearseed = 3,
+		/obj/item/seeds/nifberries = 2,
+		/obj/item/seeds/onionseed = 3,
 		/obj/item/seeds/orangeseed = 3,
 		/obj/item/seeds/peanutseed = 3,
+		/obj/item/seeds/peppercornseed = 3,
 		/obj/item/seeds/plumpmycelium = 3,
 		/obj/item/seeds/poppyseed = 3,
 		/obj/item/seeds/potatoseed = 3,
@@ -434,13 +439,12 @@
 		/obj/item/seeds/soyaseed = 3,
 		/obj/item/seeds/sugarcaneseed = 3,
 		/obj/item/seeds/sunflowerseed = 3,
+		/obj/item/seeds/tobaccoseed = 3,
 		/obj/item/seeds/tomatoseed = 3,
 		/obj/item/seeds/towermycelium = 3,
 		/obj/item/seeds/watermelonseed = 3,
 		/obj/item/seeds/wheatseed = 3,
-		/obj/item/seeds/whitebeetseed = 3,
-		/obj/item/seeds/earthenroot = 2,
-		/obj/item/seeds/nifberries = 2
+		/obj/item/seeds/whitebeetseed = 3
 	)
 	contraband = list(
 		/obj/item/seeds/amanitamycelium = 3,
@@ -464,7 +468,9 @@
 		/obj/item/seeds/chiliseed = 50,
 		/obj/item/seeds/cocoapodseed = 50,
 		/obj/item/seeds/cornseed = 30,
+		/obj/item/seeds/earthenroot = 70,
 		/obj/item/seeds/eggplantseed = 30,
+		/obj/item/seeds/garlicseed = 30,
 		/obj/item/seeds/grapeseed = 40,
 		/obj/item/seeds/grassseed = 40,
 		/obj/item/seeds/greengrapeseed = 40,
@@ -472,8 +478,11 @@
 		/obj/item/seeds/lemonseed = 40,
 		/obj/item/seeds/limeseed = 50,
 		/obj/item/seeds/mtearseed = 60,
+		/obj/item/seeds/nifberries = 70,
+		/obj/item/seeds/onionseed = 30,
 		/obj/item/seeds/orangeseed = 40,
 		/obj/item/seeds/peanutseed = 30,
+		/obj/item/seeds/peppercornseed = 30,
 		/obj/item/seeds/plumpmycelium = 20,
 		/obj/item/seeds/poppyseed = 10,
 		/obj/item/seeds/potatoseed = 30,
@@ -484,13 +493,12 @@
 		/obj/item/seeds/soyaseed = 40,
 		/obj/item/seeds/sugarcaneseed = 20,
 		/obj/item/seeds/sunflowerseed = 20,
+		/obj/item/seeds/tobaccoseed = 40,
 		/obj/item/seeds/tomatoseed = 30,
 		/obj/item/seeds/towermycelium = 20,
 		/obj/item/seeds/watermelonseed = 30,
 		/obj/item/seeds/wheatseed = 20,
-		/obj/item/seeds/whitebeetseed = 20,
-		/obj/item/seeds/earthenroot = 70,
-		/obj/item/seeds/nifberries = 70
+		/obj/item/seeds/whitebeetseed = 20
 	)
 	restock_items = 1

--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -1170,8 +1170,41 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/spicy_clams

-
 /datum/recipe/earthenroot_soup
 	fruit = list("earthenroot" = 2)
 	reagents = list("water" = 10, "spacespice" = 1, "sodiumchloride" = 1)
-	result = /obj/item/weapon/reagent_containers/food/snacks/earthenroot_soup
+	result = /obj/item/weapon/reagent_containers/food/snacks/earthenroot_soup
+
+/datum/recipe/onionrings
+	fruit = list("onion" = 1)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/doughslice
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/onionrings
+
+/datum/recipe/berrymuffin
+	reagents = list("milk" = 5, "sugar" = 5)
+	reagent_mix = RECIPE_REAGENT_REPLACE
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/dough
+	)
+	fruit = list("berries" = 1)
+	result = /obj/item/weapon/reagent_containers/food/snacks/muffin
+
+/datum/recipe/onionsoup
+	fruit = list("onion" = 1)
+	reagents = list("water" = 10)
+	result = /obj/item/weapon/reagent_containers/food/snacks/soup/onionsoup
+
+/datum/recipe/porkbowl
+	reagents = list("water" = 5, "rice" = 10)
+	reagent_mix = RECIPE_REAGENT_REPLACE
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bacon
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/porkbowl
+
+/datum/recipe/mashedpotato
+	fruit = list("potato" = 1)
+	result = /obj/item/weapon/reagent_containers/food/snacks/mashedpotato
+
--- a/code/modules/food/recipes_oven.dm
+++ b/code/modules/food/recipes_oven.dm
@@ -567,4 +567,11 @@
 	)
 	reagent_mix = RECIPE_REAGENT_REPLACE
 	result = /obj/item/weapon/reagent_containers/food/snacks/truffle
-	result_quantity = 4
+	result_quantity = 4
+
+/datum/recipe/croissant
+	appliance = OVEN
+	reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5)
+	reagent_mix = RECIPE_REAGENT_REPLACE
+	items = list(/obj/item/weapon/reagent_containers/food/snacks/dough)
+	result = /obj/item/weapon/reagent_containers/food/snacks/croissant
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -1129,7 +1129,7 @@
 	name = "shand"
 	seed_name = "S'Rendarr's hand"
 	display_name = "S'Rendarr's hand leaves"
-	chems = list("tobaccorich" = list(1,10), "nicotine" = list(3,5))
+	chems = list("tobacco" = list(1,5), "bicaridine" = list(3,5), "nicotine" = list(1,3))
 	kitchen_tag = "shand"

 /datum/seed/shand/setup_traits()
@@ -1329,4 +1329,92 @@
 	set_trait(TRAIT_PLANT_COLOUR,"#4D8F53")
 	set_trait(TRAIT_PLANT_ICON,"bush4")
 	set_trait(TRAIT_WATER_CONSUMPTION, 6)
-	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
+	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
+
+/datum/seed/tobacco
+	name = "tobacco"
+	seed_name = "tobacco"
+	display_name = "tobacco leaves"
+	mutants = list("finetobacco")
+	chems = list("tobacco" = list(1,10), "nicotine" = list(1,3))
+
+/datum/seed/tobacco/setup_traits()
+	..()
+	set_trait(TRAIT_MATURATION,6)
+	set_trait(TRAIT_PRODUCTION,6)
+	set_trait(TRAIT_YIELD,5)
+	set_trait(TRAIT_PRODUCT_ICON,"tobacco")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#749733")
+	set_trait(TRAIT_PLANT_COLOUR,"#749733")
+	set_trait(TRAIT_PLANT_ICON,"vine2")
+	set_trait(TRAIT_IDEAL_HEAT, 299)
+	set_trait(TRAIT_IDEAL_LIGHT, 7)
+	set_trait(TRAIT_WATER_CONSUMPTION, 6)
+	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
+
+/datum/seed/tobacco/finetobacco
+	name = "finetobacco"
+	seed_name = "fine tobacco"
+	display_name = "fine tobacco leaves"
+	chems = list("tobaccorich" = list(1,10), "nicotine" = list(3,5))
+
+/datum/seed/tobacco/finetobacco/setup_traits()
+	..()
+	set_trait(TRAIT_YIELD,4)
+	set_trait(TRAIT_PRODUCT_COLOUR,"#33571b")
+	set_trait(TRAIT_PLANT_COLOUR,"#33571b")
+	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.20)
+
+/datum/seed/peppercorn
+	name = "peppercorn"
+	seed_name = "peppercorn"
+	display_name = "black pepper"
+	chems = list("blackpepper" = list(10,10))
+
+/datum/seed/peppercorn/setup_traits()
+	..()
+	set_trait(TRAIT_HARVEST_REPEAT,1)
+	set_trait(TRAIT_MATURATION,4)
+	set_trait(TRAIT_PRODUCTION,4)
+	set_trait(TRAIT_YIELD,3)
+	set_trait(TRAIT_POTENCY,5)
+	set_trait(TRAIT_PRODUCT_ICON,"nuts")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#4d4d4d")
+	set_trait(TRAIT_PLANT_ICON,"vine2")
+	set_trait(TRAIT_IDEAL_LIGHT, 6)
+
+/datum/seed/garlic
+	name = "garlic"
+	seed_name = "garlic"
+	display_name = "garlic"
+	chems = list("garlicjuice" = list(1,5))
+	kitchen_tag = "garlic"
+
+/datum/seed/garlic/setup_traits()
+	..()
+	set_trait(TRAIT_MATURATION,10)
+	set_trait(TRAIT_PRODUCTION,1)
+	set_trait(TRAIT_YIELD,5)
+	set_trait(TRAIT_POTENCY,12)
+	set_trait(TRAIT_PRODUCT_ICON,"bulb")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#fff8dd")
+	set_trait(TRAIT_PLANT_ICON,"stalk")
+	set_trait(TRAIT_WATER_CONSUMPTION, 7)
+
+/datum/seed/onion
+	name = "onion"
+	seed_name = "onion"
+	display_name = "onions"
+	chems = list("onionjuice" = list(1,5))
+	kitchen_tag = "onion"
+
+/datum/seed/onion/setup_traits()
+	..()
+	set_trait(TRAIT_MATURATION,10)
+	set_trait(TRAIT_PRODUCTION,1)
+	set_trait(TRAIT_YIELD,4)
+	set_trait(TRAIT_POTENCY,10)
+	set_trait(TRAIT_PRODUCT_ICON,"bulb")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#ffeedd")
+	set_trait(TRAIT_PLANT_ICON,"stalk")
+	set_trait(TRAIT_WATER_CONSUMPTION, 5)
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -258,9 +258,6 @@ var/global/list/plant_seed_sprites = list()
 /obj/item/seeds/cherryseed
 	seed_type = "cherry"

-/obj/item/seeds/tobaccoseed
-	seed_type = "tobacco"
-
 /obj/item/seeds/kudzuseed
 	seed_type = "kudzu"

@@ -295,4 +292,19 @@ var/global/list/plant_seed_sprites = list()
 	seed_type = "earthenroot"

 /obj/item/seeds/nifberries
-	seed_type = "nifberries"
+	seed_type = "nifberries"
+
+/obj/item/seeds/tobaccoseed
+	seed_type = "tobacco"
+
+/obj/item/seeds/finetobacco
+	seed_type = "finetobacco"
+
+/obj/item/seeds/peppercornseed
+	seed_type = "peppercorn"
+
+/obj/item/seeds/garlicseed
+	seed_type = "garlic"
+
+/obj/item/seeds/onionseed
+	seed_type = "onion"
--- a/code/modules/hydroponics/seed_storage.dm
+++ b/code/modules/hydroponics/seed_storage.dm
@@ -97,17 +97,23 @@
 		/obj/item/seeds/cocoapodseed = 3,
 		/obj/item/seeds/cornseed = 3,
 		/obj/item/seeds/replicapod = 3,
+		/obj/item/seeds/earthenroot = 2,
 		/obj/item/seeds/eggplantseed = 3,
+		/obj/item/seeds/garlicseed = 3,
 		/obj/item/seeds/glowshroom = 2,
 		/obj/item/seeds/grapeseed = 3,
 		/obj/item/seeds/grassseed = 3,
+		/obj/item/seeds/koisspore = 3,
 		/obj/item/seeds/lemonseed = 3,
 		/obj/item/seeds/libertymycelium = 2,
 		/obj/item/seeds/limeseed = 3,
 		/obj/item/seeds/mtearseed = 2,
 		/obj/item/seeds/nettleseed = 2,
+		/obj/item/seeds/nifberries = 2,
+		/obj/item/seeds/onionseed = 3,
 		/obj/item/seeds/orangeseed = 3,
 		/obj/item/seeds/peanutseed = 3,
+		/obj/item/seeds/peppercornseed = 3,
 		/obj/item/seeds/plastiseed = 3,
 		/obj/item/seeds/plumpmycelium = 3,
 		/obj/item/seeds/poppyseed = 3,
@@ -124,10 +130,7 @@
 		/obj/item/seeds/towermycelium = 3,
 		/obj/item/seeds/watermelonseed = 3,
 		/obj/item/seeds/wheatseed = 3,
-		/obj/item/seeds/whitebeetseed = 3,
-		/obj/item/seeds/koisspore = 3,
-		/obj/item/seeds/earthenroot = 2,
-		/obj/item/seeds/nifberries = 2
+		/obj/item/seeds/whitebeetseed = 3
 	)

 /obj/machinery/seed_storage/attack_hand(mob/user as mob)
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -471,6 +471,24 @@
 	if(M.nutrition < 0)
 		M.nutrition = 0

+/datum/reagent/nutriment/barbecue
+	name = "Barbecue Sauce"
+	id = "barbecue"
+	description = "Barbecue sauce for barbecues and long shifts."
+	taste_description = "barbecue"
+	reagent_state = LIQUID
+	nutriment_factor = 5
+	color = "#4F330F"
+
+/datum/reagent/nutriment/garlicsauce
+	name = "Garlic Sauce"
+	id = "garlicsauce"
+	description = "Garlic sauce, perfect for spicing up a plate of garlic."
+	taste_description = "garlic"
+	reagent_state = LIQUID
+	nutriment_factor = 4
+	color = "#d8c045"
+
 /* Non-food stuff like condiments */

 /datum/reagent/sodiumchloride
@@ -862,6 +880,28 @@
 	glass_name = "glass of earthen-root juice"
 	glass_desc = "Juice extracted from earthen-root, a plant native to Adhomai."

+/datum/reagent/drink/juice/garlic
+	name = "Garlic Juice"
+	id = "garlicjuice"
+	description = "Who would even drink this?"
+	taste_description = "garlic"
+	nutrition = 1
+	color = "#eeddcc"
+
+	glass_name = "glass of garlic juice"
+	glass_desc = "Who would even drink juice from garlic?"
+
+/datum/reagent/drink/juice/onion
+	name = "Onion Juice"
+	id = "onionjuice"
+	description = "Juice from an onion, for when you need to cry."
+	taste_description = "onion"
+	nutrition = 1
+	color = "#ffeedd"
+
+	glass_name = "glass of onion juice"
+	glass_desc = "Juice from an onion, for when you need to cry."
+
 // Everything else

 /datum/reagent/drink/milk
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1520,6 +1520,20 @@
 	required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1)
 	result_amount = 4

+/datum/chemical_reaction/barbecue
+	name = "Barbecue Sauce"
+	id = "barbecue"
+	result = "barbecue"
+	required_reagents = list("ketchup" = 2, "garlicsauce" = 1, "sugar" = 1)
+	result_amount = 4
+
+/datum/chemical_reaction/garlicsauce
+	name = "Garlic Sauce"
+	id = "garlicsauce"
+	result = "garlicsauce"
+	required_reagents = list("garlicjuice" = 1, "cornoil" = 1,)
+	result_amount = 2
+
 /datum/chemical_reaction/cheesewheel
 	name = "Cheesewheel"
 	id = "cheesewheel"
--- a/code/modules/reagents/reagent_containers/food/condiment.dm
+++ b/code/modules/reagents/reagent_containers/food/condiment.dm
@@ -15,124 +15,137 @@
 	center_of_mass = list("x"=16, "y"=6)
 	volume = 50

-	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/item/weapon/reagent_containers/food/condiment/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+	return
+
+/obj/item/weapon/reagent_containers/food/condiment/attack_self(var/mob/user as mob)
+	return
+
+/obj/item/weapon/reagent_containers/food/condiment/attack(var/mob/M as mob, var/mob/user as mob, var/def_zone)
+	if(standard_feed_mob(user, M))
 		return

-	attack_self(var/mob/user as mob)
+/obj/item/weapon/reagent_containers/food/condiment/afterattack(var/obj/target, var/mob/user, var/proximity)
+	if(!proximity)
 		return

-	attack(var/mob/M as mob, var/mob/user as mob, var/def_zone)
-		if(standard_feed_mob(user, M))
+	if(standard_dispenser_refill(user, target))
+		return
+	if(standard_pour_into(user, target))
+		return
+
+	if(istype(target, /obj/item/weapon/reagent_containers/food/snacks)) // These are not opencontainers but we can transfer to them
+		if(!reagents || !reagents.total_volume)
+			user << "<span class='notice'>There is no condiment left in \the [src].</span>"
 			return

-	afterattack(var/obj/target, var/mob/user, var/proximity)
-		if(!proximity)
+		if(!target.reagents.get_free_space())
+			user << "<span class='notice'>You can't add more condiment to \the [target].</span>"
 			return

-		if(standard_dispenser_refill(user, target))
-			return
-		if(standard_pour_into(user, target))
-			return
+		var/trans = reagents.trans_to_obj(target, amount_per_transfer_from_this)
+		user << "<span class='notice'>You add [trans] units of the condiment to \the [target].</span>"

-		if(istype(target, /obj/item/weapon/reagent_containers/food/snacks)) // These are not opencontainers but we can transfer to them
-			if(!reagents || !reagents.total_volume)
-				user << "<span class='notice'>There is no condiment left in \the [src].</span>"
-				return
+/obj/item/weapon/reagent_containers/food/condiment/feed_sound(var/mob/user)
+	playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)

-			if(!target.reagents.get_free_space())
-				user << "<span class='notice'>You can't add more condiment to \the [target].</span>"
-				return
+/obj/item/weapon/reagent_containers/food/condiment/self_feed_message(var/mob/user)
+	user << "<span class='notice'>You swallow some of contents of \the [src].</span>"

-			var/trans = reagents.trans_to_obj(target, amount_per_transfer_from_this)
-			user << "<span class='notice'>You add [trans] units of the condiment to \the [target].</span>"
-
-	feed_sound(var/mob/user)
-		playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)
-
-	self_feed_message(var/mob/user)
-		user << "<span class='notice'>You swallow some of contents of \the [src].</span>"
-
-	on_reagent_change()
-		if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "flour" || icon_state == "spacespicebottle")
-			return
-		if(reagents.reagent_list.len > 0)
-			switch(reagents.get_master_reagent_id())
-				if("ketchup")
-					name = "ketchup"
-					desc = "You feel more American already."
-					icon_state = "ketchup"
-					center_of_mass = list("x"=16, "y"=6)
-				if("capsaicin")
-					name = "hotsauce"
-					desc = "You can almost TASTE the stomach ulcers now!"
-					icon_state = "hotsauce"
-					center_of_mass = list("x"=16, "y"=6)
-				if("enzyme")
-					name = "universal enzyme"
-					desc = "Used in cooking various dishes."
-					icon_state = "enzyme"
-					center_of_mass = list("x"=16, "y"=6)
-				if("soysauce")
-					name = "soy sauce"
-					desc = "A salty soy-based flavoring."
-					icon_state = "soysauce"
-					center_of_mass = list("x"=16, "y"=6)
-				if("frostoil")
-					name = "coldsauce"
-					desc = "Leaves the tongue numb in its passage."
-					icon_state = "coldsauce"
-					center_of_mass = list("x"=16, "y"=6)
-				if("sodiumchloride")
-					name = "salt shaker"
-					desc = "Salt. From space oceans, presumably."
-					icon_state = "saltshaker"
-					center_of_mass = list("x"=16, "y"=10)
-				if("blackpepper")
-					name = "pepper mill"
-					desc = "Often used to flavor food or make people sneeze."
-					icon_state = "peppermillsmall"
-					center_of_mass = list("x"=16, "y"=10)
-				if("cornoil")
-					name = "corn oil"
-					desc = "A delicious oil used in cooking. Made from corn."
-					icon_state = "oliveoil"
-					center_of_mass = list("x"=16, "y"=6)
-				if("sugar")
-					name = "sugar"
-					desc = "Tastey space sugar!"
-					center_of_mass = list("x"=16, "y"=6)
-				if("spacespice")
-					name = "bottle of space spice"
-					desc = "An exotic blend of spices for cooking. It must flow."
-					icon_state = "spacespicebottle"
-					center_of_mass = list("x"=16, "y"=6)
+/obj/item/weapon/reagent_containers/food/condiment/on_reagent_change()
+	if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "flour" || icon_state == "spacespicebottle")
+		return
+	if(reagents.reagent_list.len > 0)
+		switch(reagents.get_master_reagent_id())
+			if("ketchup")
+				name = "ketchup"
+				desc = "You feel more American already."
+				icon_state = "ketchup"
+				center_of_mass = list("x"=16, "y"=6)
+			if("capsaicin")
+				name = "hotsauce"
+				desc = "You can almost TASTE the stomach ulcers now!"
+				icon_state = "hotsauce"
+				center_of_mass = list("x"=16, "y"=6)
+			if("enzyme")
+				name = "universal enzyme"
+				desc = "Used in cooking various dishes."
+				icon_state = "enzyme"
+				center_of_mass = list("x"=16, "y"=6)
+			if("soysauce")
+				name = "soy sauce"
+				desc = "A salty soy-based flavoring."
+				icon_state = "soysauce"
+				center_of_mass = list("x"=16, "y"=6)
+			if("frostoil")
+				name = "coldsauce"
+				desc = "Leaves the tongue numb in its passage."
+				icon_state = "coldsauce"
+				center_of_mass = list("x"=16, "y"=6)
+			if("sodiumchloride")
+				name = "salt shaker"
+				desc = "Salt. From space oceans, presumably."
+				icon_state = "saltshaker"
+				center_of_mass = list("x"=16, "y"=10)
+			if("blackpepper")
+				name = "pepper mill"
+				desc = "Often used to flavor food or make people sneeze."
+				icon_state = "peppermillsmall"
+				center_of_mass = list("x"=16, "y"=10)
+			if("cornoil")
+				name = "corn oil"
+				desc = "A delicious oil used in cooking. Made from corn."
+				icon_state = "oliveoil"
+				center_of_mass = list("x"=16, "y"=6)
+			if("sugar")
+				name = "sugar"
+				desc = "Tastey space sugar!"
+				center_of_mass = list("x"=16, "y"=6)
+			if("spacespice")
+				name = "bottle of space spice"
+				desc = "An exotic blend of spices for cooking. It must flow."
+				icon_state = "spacespicebottle"
+				center_of_mass = list("x"=16, "y"=6)
+			if("barbecue")
+				name = "barbecue sauce"
+				desc = "Barbecue sauce, it's labeled 'sweet and spicy'."
+				icon_state = "barbecue"
+				center_of_mass = list("x"=16, "y"=6)
+			if("garlicsauce")
+				name = "garlic sauce"
+				desc = "Garlic sauce, perfect for spicing up a plate of garlic."
+				center_of_mass = list("x"=16, "y"=6)
+			else
+				name = "misc condiment bottle"
+				if (reagents.reagent_list.len==1)
+					desc = "Looks like it is [reagents.get_master_reagent_name()], but you are not sure."
 				else
-					name = "misc condiment bottle"
-					if (reagents.reagent_list.len==1)
-						desc = "Looks like it is [reagents.get_master_reagent_name()], but you are not sure."
-					else
-						desc = "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them."
-					icon_state = "mixedcondiments"
-					center_of_mass = list("x"=16, "y"=6)
-		else
-			icon_state = "emptycondiment"
-			name = "condiment bottle"
-			desc = "An empty condiment bottle."
-			center_of_mass = list("x"=16, "y"=6)
-			return
+					desc = "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them."
+				icon_state = "mixedcondiments"
+				center_of_mass = list("x"=16, "y"=6)
+	else
+		icon_state = "emptycondiment"
+		name = "condiment bottle"
+		desc = "An empty condiment bottle."
+		center_of_mass = list("x"=16, "y"=6)
+		return

 /obj/item/weapon/reagent_containers/food/condiment/enzyme
 	name = "universal enzyme"
 	desc = "Used in cooking various dishes."
 	icon_state = "enzyme"
-	Initialize()
-		. = ..()
-		reagents.add_reagent("enzyme", 50)
+
+/obj/item/weapon/reagent_containers/food/condiment/enzyme/Initialize()
+	. = ..()
+	reagents.add_reagent("enzyme", 50)

 /obj/item/weapon/reagent_containers/food/condiment/sugar
-	Initialize()
-		. = ..()
-		reagents.add_reagent("sugar", 50)
+	name = "sugar"
+	desc = "Tastey space sugar!"
+
+/obj/item/weapon/reagent_containers/food/condiment/sugar/Initialize()
+	. = ..()
+	reagents.add_reagent("sugar", 50)

 /obj/item/weapon/reagent_containers/food/condiment/saltshaker		//Seperate from above since it's a small shaker rather then
 	name = "salt shaker"											//	a large one.
@@ -141,9 +154,10 @@
 	possible_transfer_amounts = list(1,20) //for clown turning the lid off
 	amount_per_transfer_from_this = 1
 	volume = 20
-	Initialize()
-		. = ..()
-		reagents.add_reagent("sodiumchloride", 20)
+
+/obj/item/weapon/reagent_containers/food/condiment/saltshaker/Initialize()
+	. = ..()
+	reagents.add_reagent("sodiumchloride", 20)

 /obj/item/weapon/reagent_containers/food/condiment/peppermill
 	name = "pepper mill"
@@ -152,9 +166,10 @@
 	possible_transfer_amounts = list(1,20) //for clown turning the lid off
 	amount_per_transfer_from_this = 1
 	volume = 20
-	Initialize()
-		. = ..()
-		reagents.add_reagent("blackpepper", 20)
+
+/obj/item/weapon/reagent_containers/food/condiment/peppermill/Initialize()
+	. = ..()
+	reagents.add_reagent("blackpepper", 20)

 /obj/item/weapon/reagent_containers/food/condiment/flour
 	name = "flour sack"
@@ -163,11 +178,12 @@
 	icon_state = "flour"
 	item_state = "flour"
 	volume = 220
-	Initialize()
-		. = ..()
-		reagents.add_reagent("flour", 200)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/condiment/flour/Initialize()
+	. = ..()
+	reagents.add_reagent("flour", 200)
+	src.pixel_x = rand(-10.0, 10)
+	src.pixel_y = rand(-10.0, 10)

 /obj/item/weapon/reagent_containers/food/condiment/spacespice
 	name = "space spices"
@@ -176,6 +192,24 @@
 	possible_transfer_amounts = list(1,40) //for clown turning the lid off
 	amount_per_transfer_from_this = 1
 	volume = 40
-	Initialize()
-		. = ..()
-		reagents.add_reagent("spacespice", 40)
+
+/obj/item/weapon/reagent_containers/food/condiment/spacespice/Initialize()
+	. = ..()
+	reagents.add_reagent("spacespice", 40)
+
+/obj/item/weapon/reagent_containers/food/condiment/barbecue
+	name = "barbecue sauce"
+	desc = "Barbecue sauce, it's labeled 'sweet and spicy'."
+	icon_state = "barbecue"
+
+/obj/item/weapon/reagent_containers/food/condiment/barbecue/Initialize()
+	..()
+	reagents.add_reagent("barbecue", 50)
+
+/obj/item/weapon/reagent_containers/food/condiment/garlicsauce
+	name = "garlic sauce"
+	desc = "Garlic sauce, perfect for spicing up a plate of garlic."
+
+/obj/item/weapon/reagent_containers/food/condiment/garlicsauce/Initialize()
+	..()
+	reagents.add_reagent("garlicsauce", 50)
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -5160,5 +5160,70 @@
 	reagents.add_reagent("protein", 5)
 	reagents.add_reagent("sodiumchloride", 2)

+/obj/item/weapon/reagent_containers/food/snacks/onionrings
+	name = "onion rings"
+	desc = "Like circular fries but better."
+	icon_state = "onionrings"
+	trash = /obj/item/trash/plate
+	filling_color = "#eddd00"
+	center_of_mass = "x=16;y=11"
+	nutriment_desc = list("fried onions" = 5)
+	nutriment_amt = 5
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/berrymuffin
+	name = "berry muffin"
+	desc = "A delicious and spongy little cake, with berries."
+	icon_state = "berrymuffin"
+	filling_color = "#E0CF9B"
+	center_of_mass = list("x"=17, "y"=4)
+	nutriment_amt = 5
+	nutriment_desc = list("sweetness" = 1, "muffin" = 2, "berries" = 2)
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/soup/onionsoup
+	name = "onion soup"
+	desc = "A soup with layers."
+	icon_state = "onionsoup"
+	trash = /obj/item/trash/snack_bowl
+	filling_color = "#E0C367"
+	center_of_mass = list("x"=16, "y"=7)
+	nutriment_amt = 5
+	nutriment_desc = list("onion" = 2, "soup" = 2)
+	bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/porkbowl
+	name = "pork bowl"
+	desc = "A bowl of fried rice with cuts of meat."
+	icon_state = "porkbowl"
+	trash = /obj/item/trash/snack_bowl
+	filling_color = "#FFFBDB"
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/porkbowl/Initialize()
+	..()
+	reagents.add_reagent("rice", 6)
+	reagents.add_reagent("protein", 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/mashedpotato
+	name = "mashed potato"
+	desc = "Pillowy mounds of mashed potato."
+	icon_state = "mashedpotato"
+	trash = /obj/item/trash/plate
+	filling_color = "#EDDD00"
+	center_of_mass = list("x"=16, "y"=11)
+	nutriment_amt = 4
+	nutriment_desc = list("mashed potatoes" = 4)
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/croissant
+	name = "croissant"
+	desc = "True french cuisine."
+	filling_color = "#E3D796"
+	icon_state = "croissant"
+	nutriment_amt = 4
+	nutriment_desc = list("french bread" = 4)
+	bitesize = 2
+
 #undef NUTRIMENT_GOOD
 #undef NUTRIMENT_BAD