Cucumber Fever (#69639)

About The Pull Request

Not without the help of my friend spriter, I added cucumbers, their seeds, the cultivation itself, so that they could be pickled and washed with a brine jar. I also added a Danish hot dog because it required cucumbers (perhaps that was the end goal), changed a couple of recipes to include cucumbers or pickles. Cucumbers have been added to both cargo orders and bounty cubes, as well as for the food order console

I think the Cucumber Update deserves its plush toy.

gg18b4b2cab0
Why It's Good For The Game

I think more food and drink... would add quite a nice role playing experience, and additional gameplay for hydroponics.
Changelog

cl Vishenka0704 and Ying-The-Pando
add: Cucumbers and pickles
add: Danish hot dog
balance: add cucumbers in dishes where they need
qol: add to bounty cubes, orders - new vegetables
/cl

code/game/machinery/computer/arcade/arcade.dm

@@ -58,6 +58,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 		/obj/item/toy/plush/rouny = 2,
 		/obj/item/toy/plush/abductor = 2,
 		/obj/item/toy/plush/abductor/agent = 2,
+		/obj/item/toy/plush/greek_cucumber = 2,
 		/obj/item/storage/belt/military/snack = 2,
 		/obj/item/toy/brokenradio = 2,
 		/obj/item/toy/braintoy = 2,

code/game/machinery/computer/chef_orders/order_datum.dm

@@ -120,6 +120,19 @@
 	category_index = CATEGORY_FRUITS_VEGGIES
 	item_instance = /obj/item/food/grown/bell_pepper
 
+/datum/orderable_item/cucumbers
+	name = "Cucumber"
+	category_index = CATEGORY_FRUITS_VEGGIES
+	item_instance = /obj/item/food/grown/cucumber
+	cost_per_order = 10
+
+
+/datum/orderable_item/pickles
+	name = "Jar of pickles"
+	category_index = CATEGORY_FRUITS_VEGGIES
+	item_instance = /obj/item/storage/fancy/pickles_jar
+	cost_per_order = 60
+
 //Milk and Eggs
 
 /datum/orderable_item/milk
@@ -326,3 +339,4 @@
 	category_index = CATEGORY_SAUCES_REAGENTS
 	item_instance = /obj/item/reagent_containers/condiment/cherryjelly
 	cost_per_order = 30
+//

code/game/objects/effects/spawners/random/food_or_drink.dm

@@ -33,6 +33,7 @@
 		/obj/item/seeds/chanter,
 		/obj/item/seeds/potato,
 		/obj/item/seeds/sugarcane,
+		/obj/item/seeds/cucumber,
 	)
 
 /obj/effect/spawner/random/food_or_drink/seed_rare

code/game/objects/items/food/burgers.dm

@@ -289,7 +289,7 @@
 	name = "super bite burger"
 	desc = "This is a mountain of a burger. FOOD!"
 	icon_state = "superbiteburger"
-	food_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/nutriment/protein = 40, /datum/reagent/consumable/nutriment/vitamin = 12)
+	food_reagents = list(/datum/reagent/consumable/nutriment = 26, /datum/reagent/consumable/nutriment/protein = 40, /datum/reagent/consumable/nutriment/vitamin = 13)
 	w_class = WEIGHT_CLASS_NORMAL
 	bite_consumption = 7
 	max_volume = 100

code/game/objects/items/food/meatdish.dm

@@ -179,7 +179,7 @@
 	desc = "A simple nigiri of fish atop a packed rice ball with a seaweed wrapping and a side of soy sauce."
 	icon = 'icons/obj/food/food.dmi'
 	icon_state = "nigiri_sushi"
-	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/nutriment/protein = 2)
+	food_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment/protein = 2)
 	tastes = list("boiled rice" = 4, "fish filet" = 2, "soy sauce" = 2)
 	foodtypes = SEAFOOD | VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL
@@ -189,7 +189,7 @@
 	desc = "Simple poke, rice on the bottom, vegetables and meat on top. Should be mixed before eating."
 	icon = 'icons/obj/food/soupsalad.dmi'
 	icon_state = "pokemeat"
-	food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/nutriment/protein = 2)
+	food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/nutriment/protein = 2)
 	tastes = list("rice and meat" = 4, "lettuce" = 2, "soy sauce" = 2)
 	foodtypes = SEAFOOD | MEAT | VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL

code/game/objects/items/food/misc.dm

@@ -921,3 +921,13 @@
 	tastes = list("peanuts" = 1, "sweetness" = 1)
 	foodtypes = NUTS | SUGAR
 	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/pickle
+	name = "pickle"
+	desc = "Slightly shriveled darkish cucumber. Smelling something sour, but incredibly inviting."
+	icon = 'icons/obj/food/food.dmi'
+	icon_state = "pickle"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/medicine/antihol = 2)
+	tastes = list("pickle" = 1, "spices" = 1, "salt water" = 2)
+	foodtypes = VEGETABLES
+	w_class = WEIGHT_CLASS_SMALL

code/game/objects/items/food/salad.dm

@@ -161,7 +161,7 @@
 	name = "Greek salad"
 	desc = "A popular salad made of tomatoes, onions, feta cheese, and olives all drizzled in olive oil. Though it feels like it's missing something..."
 	icon_state = "greek_salad"
-	food_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 12, /datum/reagent/consumable/nutriment = 12)
+	food_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 13, /datum/reagent/consumable/nutriment = 14)
 	tastes = list("healthy greens" = 2, "olive dressing" = 1, "feta cheese" = 1)
 	foodtypes = VEGETABLES | DAIRY
 

code/game/objects/items/food/sandwichtoast.dm

@@ -136,6 +136,18 @@
 /obj/item/food/hotdog/debug
 	eat_time = 0
 
+/obj/item/food/danish_hotdog
+	name = "danish hotdog"
+	desc = "Appetizing bun, with a sausage in the middle, covered with sauce, fried onion and pickles rings"
+	icon = 'icons/obj/food/meat.dmi'
+	icon_state = "danish_hotdog"
+	bite_consumption = 4
+	food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/ketchup = 3, /datum/reagent/consumable/nutriment/vitamin = 7)
+	tastes = list("bun" = 3, "meat" = 2, "fried onion" = 1, "pickles" = 1)
+	foodtypes = GRAIN | MEAT | VEGETABLES 
+	w_class = WEIGHT_CLASS_SMALL
+	venue_value = FOOD_PRICE_NORMAL
+
 /obj/item/food/blt
 	name = "\improper BLT"
 	desc = "A classic bacon, lettuce, and tomato sandwich."

code/game/objects/items/plushes.dm

@@ -714,3 +714,15 @@
 		'sound/weapons/egloves.ogg' = 2,
 		'sound/weapons/cablecuff.ogg' = 1,
 	)
+
+/obj/item/toy/plush/greek_cucumber
+	name = "cucumber greek"
+	desc = "A plushie depicting a large cucumber with eyes, it seems that according to the manufacturer of the toy, the human race will look like in the future."
+	icon_state = "cucumber"
+	inhand_icon_state = "cucumber"
+	attack_verb_continuous = list("squishуы", "creakes", "crunches")
+	attack_verb_simple = list("squish", "creak", "crunch")
+	squeak_override = list(
+		'sound/effects/slosh.ogg' = 1,
+		'sound/effects/splat.ogg' = 2
+	)

code/game/objects/items/storage/boxes.dm

@@ -1448,7 +1448,8 @@
 							  /obj/item/food/grown/soybeans,
 							  /obj/item/food/grown/corn,
 							  /obj/item/food/grown/mushroom/plumphelmet,
-							  /obj/item/food/grown/mushroom/chanterelle)
+							  /obj/item/food/grown/mushroom/chanterelle,
+							  /obj/item/food/grown/cucumber)
 		new randomFood(src)
 
 /obj/item/storage/box/ingredients/fiesta

code/game/objects/items/storage/fancy.dm

@@ -457,3 +457,34 @@
 /obj/item/storage/fancy/nugget_box/Initialize(mapload)
 	. = ..()
 	atom_storage.set_holdable(list(/obj/item/food/nugget))
+
+/*
+ * Jar of pickles
+ */
+
+/obj/item/storage/fancy/pickles_jar
+	icon = 'icons/obj/food/containers.dmi'
+	icon_state = "pickles"
+	base_icon_state = "pickles"
+	name = "pickles"
+	desc = "A jar for containing pickles."
+	spawn_type = /obj/item/food/pickle
+	spawn_count = 5
+	contents_tag = "pickle"
+
+/obj/item/storage/fancy/pickles_jar/Initialize(mapload)
+	. = ..()
+	atom_storage.set_holdable(list(/obj/item/food/pickle))
+
+/obj/item/storage/fancy/pickles_jar/update_icon_state()
+	SHOULD_CALL_PARENT(FALSE)
+	if(!contents.len)
+		icon_state = "[base_icon_state]_empty"
+	else 
+		if(contents.len < 5)
+			icon_state = "[base_icon_state]_[contents.len]"
+		else	
+			icon_state = base_icon_state
+	return
+
+	

code/game/objects/structures/watercloset.dm

@@ -443,6 +443,15 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
 		begin_reclamation()
 		return
 
+	if(istype(O, /obj/item/storage/fancy/pickles_jar))
+		if(O.contents.len)
+			to_chat(user, span_notice("Looks like there's something left in the jar"))
+			return
+		new /obj/item/reagent_containers/cup/beaker/large(loc)
+		to_chat(user, span_notice("You washed the jar, ridding it of the brine."))
+		qdel(O)
+		return
+
 	if(!istype(O))
 		return
 	if(O.item_flags & ABSTRACT) //Abstract items like grabs won't wash. No-drop items will though because it's still technically an item in your hand.

code/modules/cargo/bounties/botany.dm

@@ -221,3 +221,7 @@
 		return FALSE
 	var/obj/structure/bonfire/B = O
 	return !!B.burning
+
+/datum/bounty/item/botany/cucumber
+	name = "Cucumbers"
+	wanted_types = list(/obj/item/seeds/cucumber = TRUE)

code/modules/cargo/bounties/chef.dm

@@ -151,3 +151,10 @@
 	reward = CARGO_CRATE_VALUE * 60 //that's a lot of dead dogs
 	required_count = 12
 	wanted_types = list(/obj/item/stack/sheet/animalhide/corgi = TRUE)
+
+/datum/bounty/item/chef/pickles
+	name = "Pickles"
+	description = "The food control department lacks enough pickles to properly evaluate some of the different types of hard liquor."
+	reward = CARGO_CRATE_VALUE * 10
+	required_count = 7
+	wanted_types = list(/obj/item/food/pickle = TRUE)

code/modules/cargo/packs.dm

@@ -2035,7 +2035,8 @@
 					/obj/item/seeds/rose,
 					/obj/item/seeds/chanter,
 					/obj/item/seeds/potato,
-					/obj/item/seeds/sugarcane)
+					/obj/item/seeds/sugarcane,
+					/obj/item/seeds/cucumber)
 	crate_name = "seeds crate"
 	crate_type = /obj/structure/closet/crate/hydroponics
 
@@ -2050,7 +2051,8 @@
 					/obj/item/food/grown/carrot,
 					/obj/item/food/grown/mushroom/chanterelle,
 					/obj/item/food/grown/onion,
-					/obj/item/food/grown/pumpkin)
+					/obj/item/food/grown/pumpkin,
+					/obj/item/food/grown/cucumber)
 	crate_name = "food crate"
 
 /datum/supply_pack/organic/grill

code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm

@@ -562,3 +562,7 @@
 	results = list(/datum/reagent/consumable/ethanol/the_hat = 1)
 	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/water = 1, /datum/reagent/consumable/ethanol/plumwine = 1)
 	mix_message = "The drink starts to smell perfumy..."
+
+/datum/chemical_reaction/drink/gin_garden
+	results = list(/datum/reagent/consumable/ethanol/gin_garden = 15)
+	required_reagents = list(/datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/consumable/cucumberjuice = 3, /datum/reagent/consumable/sol_dry = 5, /datum/reagent/consumable/ice = 2)

code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm

@@ -158,3 +158,7 @@
 	results = list(/datum/reagent/consumable/vanilla_dream = 3)
 	required_reagents = list(/datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/consumable/cream = 1)
 
+/datum/chemical_reaction/drink/cucumberlemonade
+	results = list(/datum/reagent/consumable/cucumberlemonade = 5)
+	required_reagents = list(/datum/reagent/consumable/lemon_lime = 3, /datum/reagent/consumable/cucumberjuice = 2, /datum/reagent/consumable/ice = 1)
+

code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm

@@ -237,7 +237,8 @@
 		/obj/item/food/cheese/wedge = 3,
 		/obj/item/food/boiledegg = 1,
 		/obj/item/food/meat/bacon = 1,
-		/obj/item/food/bun = 1
+		/obj/item/food/bun = 1,
+		/obj/item/food/pickle = 1,
 
 	)
 	result = /obj/item/food/burger/superbite

code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

@@ -300,3 +300,15 @@
 	)
 	result = /obj/item/food/pacoca
 	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/pickles_jar
+	name = "Jar of pickles"
+	reqs = list(
+		/obj/item/reagent_containers/cup/beaker/large = 1,
+		/obj/item/food/grown/cucumber = 10,
+		/datum/reagent/water = 10,
+		/datum/reagent/consumable/salt = 10,
+	)
+	result = /obj/item/storage/fancy/pickles_jar
+	category = CAT_FOOD
+	subcategory = CAT_MISCFOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm

@@ -130,6 +130,7 @@
 		/obj/item/food/onion_slice/red = 2,
 		/obj/item/food/cheese/wedge = 1,
 		/datum/reagent/consumable/quality_oil = 5,
+		/obj/item/food/grown/cucumber = 1,
 	)
 	result = /obj/item/food/salad/greek_salad
 	subcategory = CAT_SALAD

code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm

@@ -62,6 +62,18 @@
 	result = /obj/item/food/hotdog
 	subcategory = CAT_SANDWICH
 
+/datum/crafting_recipe/food/danish_hotdog
+	name = "Danish hot dog"
+	reqs = list(
+		/datum/reagent/consumable/ketchup = 5,
+		/obj/item/food/bun = 1,
+		/obj/item/food/sausage = 1,
+		/obj/item/food/pickle = 1,
+		/obj/item/food/grown/onion = 1,
+	)
+	result = /obj/item/food/danish_hotdog
+	subcategory = CAT_SANDWICH
+
 /datum/crafting_recipe/food/blt
 	name = "BLT"
 	reqs = list(

code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm

@@ -100,7 +100,8 @@
 		/obj/item/food/meat/cutlet = 3,
 		/obj/item/food/grown/cabbage = 1,
 		/obj/item/food/tofu = 1,
-		/datum/reagent/consumable/soysauce = 1
+		/datum/reagent/consumable/soysauce = 1,
+		/obj/item/food/grown/cucumber = 1,
 	)
 	result = /obj/item/food/meat_poke
 	subcategory = CAT_SEAFOOD
@@ -113,7 +114,8 @@
 		/obj/item/food/fishmeat = 1,
 		/obj/item/food/grown/cabbage = 1,
 		/obj/item/food/tofu = 1,
-		/datum/reagent/consumable/soysauce = 1
+		/datum/reagent/consumable/soysauce = 1,
+		/obj/item/food/grown/cucumber = 1,
 	)
 	result = /obj/item/food/fish_poke
 	subcategory = CAT_SEAFOOD

code/modules/food_and_drinks/restaurant/customers/_customer.dm

@@ -82,6 +82,7 @@
 			/obj/item/food/pancakes = 4,
 			/obj/item/food/eggsausage = 5,
 			/datum/custom_order/icecream = 14,
+			/obj/item/food/danish_hotdog = 3,
 		),
 		VENUE_BAR = list(
 			/datum/reagent/consumable/ethanol/b52 = 6,
@@ -122,6 +123,7 @@
 			/obj/item/food/eggplantparm = 3,
 			/obj/item/food/cornuto = 2,
 			/datum/custom_order/icecream = 10,
+			/obj/item/food/salad/greek_salad = 6,
 		),
 		VENUE_BAR = list(
 			/datum/reagent/consumable/ethanol/fanciulli = 5,
@@ -132,6 +134,7 @@
 			/datum/reagent/consumable/ethanol/wine = 3,
 			/datum/reagent/consumable/ethanol/grappa = 3,
 			/datum/reagent/consumable/ethanol/amaretto = 5,
+			/datum/reagent/consumable/cucumberlemonade = 2,
 		),
 	)
 
@@ -167,6 +170,7 @@
 			/datum/reagent/consumable/ethanol/between_the_sheets = 4,
 			/datum/reagent/consumable/ethanol/beer = 5,
 			/datum/reagent/consumable/ethanol/wine = 5,
+			/datum/reagent/consumable/ethanol/gin_garden = 2,
 		),
 	)
 

code/modules/hydroponics/grown/cucumber.dm

@@ -0,0 +1,26 @@
+// CUCUMBERS YEAH
+/obj/item/seeds/cucumber
+	name = "pack of cucumber seeds"
+	desc = "These seeds grow into cucumber plants."
+	icon_state = "seed-cucumber"
+	species = "cucumber"
+	plantname = "Cucumber Plant"
+	product = /obj/item/food/grown/cucumber
+	maturation = 10
+	production = 1
+	yield = 5
+	instability = 15
+	growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
+	icon_grow = "cucumber-grow"
+	icon_dead = "cucumber-dead"
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
+
+/obj/item/food/grown/cucumber
+	seed = /obj/item/seeds/cucumber
+	name = "cucumber"
+	desc = "Oblong and green, with pimples, the standard of salads."
+	icon_state = "cucumber"
+	foodtypes = VEGETABLES
+	juice_results = list(/datum/reagent/consumable/cucumberjuice = 0)
+	tastes = list("cucumber" = 1)

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -2926,3 +2926,17 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_desc ="A single plum floating in perfume, served in a man's hat."
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
+
+/datum/reagent/consumable/ethanol/gin_garden
+	name = "Gin Garden"
+	description = "Excellent cooling alcoholic drink with not so ordinary taste."
+	color = "#6cd87a" 
+	taste_description = "light gin with sweet ginger and cucumber"
+	glass_icon_state = "gin_garden"
+	glass_name = "gin garden"
+	glass_desc = "Hey, someone forgot the herb and... the cucumber in my cocktail!"
+	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+
+/datum/reagent/consumable/ethanol/gin_garden/on_mob_life(mob/living/carbon/doll, delta_time, times_fired)
+	doll.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, doll.get_body_temp_normal())
+	..()

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -1280,3 +1280,30 @@
 	glass_name = "vanilla dream smoothie"
 	glass_desc = "A classic drink made with vanilla and fresh cream."
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+
+/datum/reagent/consumable/cucumberjuice
+	name = "Cucumber Juice"
+	description = "Ordinary cucumber juice, nothing from the fantasy world."
+	color = "#6cd87a" 
+	taste_description = "light cucumber"
+	glass_icon_state = "glass_cucumber"
+	glass_name = "glass of cucumber juice"
+	glass_desc = "A glass of cucumber juice."
+	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+
+
+/datum/reagent/consumable/cucumberlemonade
+	name = "Cucumber Lemonade"
+	description = "Cucumber juice, sugar and soda, what else is needed for happiness?"
+	color = "#6cd87a" 
+	taste_description = "citrus soda with cucumber"
+	glass_icon_state = "cucumber_lemonade"
+	glass_name = "cucumber lemonade"
+	glass_desc = "The smell of cucumber from lemonade, I'm sure I won't get poisoned?."
+	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+
+/datum/reagent/consumable/cucumberlemonade/on_mob_life(mob/living/carbon/doll, delta_time, times_fired)
+	doll.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, doll.get_body_temp_normal())
+	if(doll.getToxLoss() && DT_PROB(10, delta_time))
+		doll.adjustToxLoss(-0.5, 0)
+	return ..()

code/modules/vending/megaseed.dm

@@ -54,6 +54,7 @@
 		/obj/item/seeds/watermelon = 3,
 		/obj/item/seeds/wheat = 3,
 		/obj/item/seeds/whitebeet = 3,
+		/obj/item/seeds/cucumber = 3,
 	)
 	contraband = list(
 		/obj/item/seeds/amanita = 2,

tgstation.dme

@@ -3086,6 +3086,7 @@
 #include "code\modules\hydroponics\grown\cocoa_vanilla.dm"
 #include "code\modules\hydroponics\grown\corn.dm"
 #include "code\modules\hydroponics\grown\cotton.dm"
+#include "code\modules\hydroponics\grown\cucumber.dm"
 #include "code\modules\hydroponics\grown\eggplant.dm"
 #include "code\modules\hydroponics\grown\flowers.dm"
 #include "code\modules\hydroponics\grown\garlic.dm"