[MIRROR] Catering Updates (#12470)

Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/__defines/_fruits.dm

@@ -18,6 +18,7 @@
 #define PLANT_LEMON "lemon"
 #define PLANT_LETTUCE "lettuce"
 #define PLANT_LIME "lime"
+#define PLANT_MUSTARD "mustard"
 #define PLANT_ONION "onion"
 #define PLANT_ORANGE "orange"
 #define PLANT_PEANUT "peanut"

code/__defines/_reagents.dm

@@ -722,6 +722,8 @@
 #define REAGENT_ID_CONDENSEDCAPSAICIN "condensedcapsaicin"
 #define REAGENT_GELATIN "Gelatin"
 #define REAGENT_ID_GELATIN "gelatin"
+#define REAGENT_MUSTARDPODS "Mustard Pods"
+#define REAGENT_ID_MUSTARDPODS "mustardpods"
 
 #define REAGENT_DRINK "Drink"
 #define REAGENT_ID_DRINK "drink"

code/datums/supplypacks/hospitality.dm

@@ -234,3 +234,50 @@
 	cost = 25
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Sweets crate"
+
+/datum/supply_pack/hospitality/condiments
+	contains = list(
+			/obj/item/reagent_containers/food/condiment/soysauce,
+			/obj/item/reagent_containers/food/condiment/ketchup,
+			/obj/item/reagent_containers/food/condiment/mustard,
+			/obj/item/reagent_containers/food/condiment/hotsauce,
+			/obj/item/reagent_containers/food/condiment/coldsauce,
+			/obj/item/reagent_containers/food/condiment/barbeque,
+			/obj/item/reagent_containers/food/condiment/small/saltshaker,
+			/obj/item/reagent_containers/food/condiment/small/peppermill
+			)
+	name = "Condiments crate"
+	desc = "A selection of condiment bottles for catering purposes, including a few that are hard to get."
+	cost = 25
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "Condiments crate"
+
+/datum/supply_pack/hospitality/meat_resupply_beef
+	contains = list(
+			/obj/item/reagent_containers/food/snacks/meat = 6
+			)
+	name = "Kitchen supply crate: meat"
+	desc = "Steaks, on ice. Real ones, not that synthetic stuff!"
+	cost = 25
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "Meat crate"
+
+/datum/supply_pack/hospitality/meat_resupply_fish
+	contains = list(
+			/obj/item/reagent_containers/food/snacks/carpmeat/fish = 6
+			)
+	name = "Kitchen supply crate: fish"
+	desc = "Fish, on ice. Guaranteed free of carpotoxins, we promise."
+	cost = 25
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "Fish meat crate"
+
+/datum/supply_pack/hospitality/meat_resupply_poultry
+	contains = list(
+			/obj/item/reagent_containers/food/snacks/meat/chicken = 6
+			)
+	name = "Kitchen supply crate: poultry"
+	desc = "Poultry, on ice. No turkey, just chicken."
+	cost = 25
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "Poultry meat crate"

code/datums/supplypacks/hydroponics.dm

@@ -63,7 +63,7 @@
 	containertype = /obj/structure/largecrate/animal/catslug
 	containername = "Catslug Crate"
 
-/datum/supply_pack/hydro/catslug
+/datum/supply_pack/hydro/mothroach
 	name = "Mothroach Crate"
 	desc = "Put the mothroach on your head and find out what true cuteness looks like. \
 		Contains one mothroach."

code/modules/food/food/condiment.dm

@@ -11,6 +11,8 @@
 	icon = 'icons/obj/food.dmi'
 	icon_state = "emptycondiment"
 	flags = OPENCONTAINER
+	min_transfer_amount = 1
+	amount_per_transfer_from_this = 2
 	max_transfer_amount = 10
 	center_of_mass_x = 16
 	center_of_mass_y = 6
@@ -237,6 +239,10 @@
 	. = ..()
 	reagents.add_reagent(REAGENT_ID_SPRINKLES, 50)
 
+/obj/item/reagent_containers/food/condiment/barbeque/Initialize(mapload)
+	. = ..()
+	reagents.add_reagent(REAGENT_ID_BARBECUE, 50)
+
 /obj/item/reagent_containers/food/condiment/small
 	max_transfer_amount = 20
 	min_transfer_amount = 1

code/modules/food/food/snacks.dm

@@ -4467,6 +4467,13 @@
 		qdel(W)
 		qdel(src)
 
+	// Bun + burgerpatty = beefburger
+	else if(istype(W,/obj/item/reagent_containers/food/snacks/burgerpatty))
+		new /obj/item/reagent_containers/food/snacks/monkeyburger(src)
+		to_chat(user, "You make a burger.")
+		qdel(W)
+		qdel(src)
+
 	// Bun + sausage = hotdog
 	else if(istype(W,/obj/item/reagent_containers/food/snacks/sausage))
 		new /obj/item/reagent_containers/food/snacks/hotdog(src)
@@ -4546,6 +4553,19 @@
 	. = ..()
 	reagents.add_reagent(REAGENT_ID_PROTEIN, 2)
 
+/obj/item/reagent_containers/food/snacks/burgerpatty
+	name = "burger patty"
+	desc = "A perfectly grilled quarter-pounder burger patty. It's probably beef."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "burgerpatty"
+	bitesize = 3
+	center_of_mass_x = 17
+	center_of_mass_y = 20
+
+/obj/item/reagent_containers/food/snacks/burgerpatty/Initialize(mapload)
+	. = ..()
+	reagents.add_reagent(REAGENT_ID_PROTEIN, 3)
+
 /obj/item/reagent_containers/food/snacks/rawmeatball
 	name = "raw meatball"
 	desc = "A raw meatball."

code/modules/food/food/snacks_vr.dm

@@ -205,7 +205,7 @@
 	nutriment_amt = 1
 	nutriment_desc = list("crunchy shell bits" = 5)
 
-/obj/item/reagent_containers/food/snacks/pillbug/Initialize(mapload)
+/obj/item/reagent_containers/food/snacks/pillbugempty/Initialize(mapload)
 	. = ..()
 	reagents.add_reagent(REAGENT_ID_PROTEIN, 1)
 	reagents.add_reagent(REAGENT_ID_CARBON, 5)

code/modules/food/recipes_grill.dm

@@ -334,3 +334,10 @@
 		/obj/item/reagent_containers/food/snacks/bun
 	)
 	result = /obj/item/reagent_containers/food/snacks/chickenfillet
+
+/datum/recipe/burgerpatty
+	appliance = GRILL
+	items = list(
+		/obj/item/reagent_containers/food/snacks/rawcutlet
+	)
+	result = /obj/item/reagent_containers/food/snacks/burgerpatty

code/modules/hydroponics/seed_packets.dm

@@ -369,3 +369,6 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
 
 /obj/item/seeds/pitcherseed
 	seed_type = PLANT_PITCHERPLANT
+
+/obj/item/seeds/mustardseed
+	seed_type = PLANT_MUSTARD

code/modules/hydroponics/seed_storage_vr.dm

@@ -22,6 +22,7 @@
 		/obj/item/seeds/lettuce = 3,
 		/obj/item/seeds/limeseed = 3,
 		/obj/item/seeds/mtearseed = 2,
+		/obj/item/seeds/mustardseed = 3,
 		/obj/item/seeds/orangeseed = 3,
 		/obj/item/seeds/onionseed = 3,
 		/obj/item/seeds/peanutseed = 3,
@@ -81,6 +82,7 @@
 		/obj/item/seeds/libertymycelium = 2,
 		/obj/item/seeds/limeseed = 3,
 		/obj/item/seeds/mtearseed = 2,
+		/obj/item/seeds/mustardseed = 3,
 		/obj/item/seeds/nettleseed = 2,
 		/obj/item/seeds/orangeseed = 3,
 		/obj/item/seeds/peanutseed = 3,

code/modules/hydroponics/seedtypes/carrots.dm

@@ -12,6 +12,6 @@
 	set_trait(TRAIT_YIELD,5)
 	set_trait(TRAIT_POTENCY,10)
 	set_trait(TRAIT_PRODUCT_ICON,"carrot")
-	set_trait(TRAIT_PRODUCT_COLOUR,"#FFDB4A")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#FF7600")
 	set_trait(TRAIT_PLANT_ICON,"carrot")
 	set_trait(TRAIT_WATER_CONSUMPTION, 6)

code/modules/hydroponics/seedtypes/citrus.dm

@@ -42,5 +42,6 @@
 
 /datum/seed/citrus/orange/New()
 	..()
-	set_trait(TRAIT_PRODUCT_COLOUR,"#FFC20A")
-	set_trait(TRAIT_FLESH_COLOUR,"#FFC20A")
+	set_trait(TRAIT_PRODUCT_ICON,"lemon")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#FF7B0A")
+	set_trait(TRAIT_FLESH_COLOUR,"#FF7B0A")

code/modules/hydroponics/seedtypes/flowers.dm

@@ -108,3 +108,23 @@
 	set_trait(TRAIT_IDEAL_LIGHT, 1)
 	set_trait(TRAIT_PLANT_COLOUR,"#5e0303")
 	set_trait(TRAIT_CARNIVOROUS,1)
+
+/datum/seed/flower/mustard
+	name = PLANT_MUSTARD
+	seed_name = PLANT_MUSTARD
+	display_name = PLANT_MUSTARD
+	kitchen_tag = PLANT_MUSTARD
+	chems = list(REAGENT_ID_MUSTARDPODS = list(1,10))
+
+/datum/seed/flower/mustard/New()
+	..()
+	set_trait(TRAIT_POTENCY,20)
+	set_trait(TRAIT_MATURATION,7)
+	set_trait(TRAIT_PRODUCTION,5)
+	set_trait(TRAIT_YIELD,6)
+	set_trait(TRAIT_PRODUCT_ICON,"flower3")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#EBC934")
+	set_trait(TRAIT_PLANT_ICON,"flower3")
+	set_trait(TRAIT_IDEAL_LIGHT, 6)
+	set_trait(TRAIT_WATER_CONSUMPTION, 0.5)
+	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)

code/modules/reagents/reactions/instant/food.dm

@@ -90,6 +90,29 @@
 	required_reagents = list(REAGENT_ID_TOMATOJUICE = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_SPACESPICE = 1)
 	result_amount = 4
 
+/datum/decl/chemical_reaction/instant/food/mustard
+	name = REAGENT_MUSTARD
+	id = REAGENT_ID_MUSTARD
+	result = REAGENT_ID_MUSTARD
+	required_reagents = list(REAGENT_ID_MUSTARDPODS = 2, REAGENT_ID_WATER = 2, REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_HONEY = 1)
+	result_amount = 4
+
+/datum/decl/chemical_reaction/instant/food/vinegar_apple
+	name = "apple " + REAGENT_VINEGAR
+	id = "applevinegar"
+	result = REAGENT_ID_VINEGAR
+	required_reagents = list(REAGENT_ID_APPLEJUICE = 2, REAGENT_ID_WATER = 2, REAGENT_ID_SUGAR = 2)
+	catalysts = list(REAGENT_ID_YEAST = 5)
+	result_amount = 4
+
+/datum/decl/chemical_reaction/instant/food/vinegar_grape
+	name = "grape " + REAGENT_VINEGAR
+	id = "grapevinegar"
+	result = REAGENT_ID_VINEGAR
+	required_reagents = list(REAGENT_ID_GRAPEJUICE = 2, REAGENT_ID_WATER = 2, REAGENT_ID_SUGAR = 2)
+	catalysts = list(REAGENT_ID_YEAST = 5)
+	result_amount = 4
+
 /datum/decl/chemical_reaction/instant/food/peanutbutter
 	name = REAGENT_PEANUTBUTTER
 	id = REAGENT_ID_PEANUTBUTTER

code/modules/reagents/reagents/food_drinks.dm

@@ -719,6 +719,19 @@
 	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
 	industrial_use = REFINERYEXPORT_REASON_FOOD
 
+/datum/reagent/mustardpods
+	name = REAGENT_MUSTARDPODS
+	id = REAGENT_ID_MUSTARDPODS
+	description = "Densely-packed seed pods from a mustard plant. Good for making mustard. Not much use for anything else."
+	taste_description = "sharp, bitter, dry mustard"
+	reagent_state = SOLID
+	ingest_met = REM
+	color = "#B2A00D"
+	cup_prefix = "mustardy"
+	wiki_flag = WIKI_FOOD
+	supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
+	industrial_use = REFINERYEXPORT_REASON_FOOD
+
 /datum/reagent/enzyme
 	name = REAGENT_ENZYME
 	id = REAGENT_ID_ENZYME

maps/stellar_delight/stellar_delight2.dmm

@@ -206,13 +206,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/fore)
-"av" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/mob/living/simple_mob/animal/goat{
-	name = "Ted"
-	},
-/turf/simulated/floor/tiled/freezer/cold,
-/area/crew_quarters/kitchen)
 "aw" = (
 /obj/structure/table/standard,
 /obj/random/tech_supply,
@@ -4989,6 +4982,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftstarboard)
+"kw" = (
+/mob/living/simple_mob/animal/goat{
+	name = "Ted"
+	},
+/turf/simulated/floor/grass,
+/area/hydroponics)
 "kx" = (
 /obj/structure/disposalpipe/sortjunction/wildcard/flipped{
 	dir = 1
@@ -30972,7 +30971,7 @@ Gi
 wL
 ch
 DD
-av
+AC
 AC
 DP
 BF
@@ -30989,7 +30988,7 @@ iZ
 ej
 WN
 ok
-dP
+kw
 AR
 KK
 si

maps/tether/tether-03-surface3.dmm

@@ -9956,10 +9956,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
-"aqm" = (
-/obj/machinery/beehive,
-/turf/simulated/floor/grass,
-/area/hydroponics)
 "aqn" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -10165,6 +10161,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_three_hall/west)
+"aqH" = (
+/mob/living/simple_mob/animal/goat{
+	name = "Spike"
+	},
+/turf/simulated/floor/grass,
+/area/hydroponics/cafegarden)
 "aqI" = (
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/surface_three_hall/nwest)
@@ -10578,6 +10580,11 @@
 "aru" = (
 /turf/simulated/wall,
 /area/crew_quarters/kitchen)
+"arv" = (
+/obj/machinery/beehive,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/grass,
+/area/hydroponics)
 "arw" = (
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/tiled/freezer,
@@ -11550,10 +11557,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
+/obj/machinery/honey_extractor,
 /turf/simulated/floor/grass,
 /area/hydroponics)
 "ati" = (
@@ -12886,13 +12890,6 @@
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/bar)
-"avN" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/machinery/honey_extractor,
-/turf/simulated/floor/grass,
-/area/hydroponics)
 "avO" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -25923,9 +25920,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
-/mob/living/simple_mob/animal/goat{
-	name = "Spike"
-	},
 /turf/simulated/floor/tiled/freezer/cold,
 /area/crew_quarters/freezer)
 "aTm" = (
@@ -30920,11 +30914,6 @@
 "bcf" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/table/standard,
-/obj/item/paper{
-	desc = "";
-	info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper.";
-	name = "Important notice from Rancher Jim"
-	},
 /obj/item/book/manual/chef_recipes,
 /obj/structure/noticeboard{
 	pixel_x = 32
@@ -31599,6 +31588,12 @@
 /area/hydroponics)
 "bdl" = (
 /obj/machinery/light,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/obj/machinery/disposal/wall{
+	dir = 1
+	},
 /turf/simulated/floor/grass,
 /area/hydroponics)
 "bdm" = (
@@ -43361,6 +43356,7 @@
 	icon_state = "pipe-c"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/beehive,
 /turf/simulated/floor/grass,
 /area/hydroponics)
 "qGC" = (
@@ -62189,8 +62185,8 @@ aEX
 avO
 bLZ
 auU
-aop
 aUr
+arv
 aXj
 aVy
 aop
@@ -62331,7 +62327,7 @@ aop
 atf
 aop
 auU
-aop
+aVy
 ath
 afT
 atk
@@ -63032,7 +63028,7 @@ acV
 auP
 avE
 arL
-avN
+bdi
 aop
 aVy
 bdj
@@ -63049,7 +63045,7 @@ aop
 asN
 awq
 aJw
-asu
+aqH
 aoJ
 aHi
 aTl
@@ -63174,7 +63170,7 @@ aCa
 auT
 avI
 arL
-aqm
+aop
 aop
 aVy
 aeZ
@@ -63316,7 +63312,7 @@ acV
 auP
 avE
 arL
-aqm
+aop
 aop
 aVy
 bdk