Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -26869,6 +26869,7 @@
 /area/engine/atmos)
 "aXW" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/machinery/atmospherics/miner/carbon_dioxide,
 /turf/open/floor/engine/co2,
 /area/engine/atmos)
 "aXX" = (
@@ -29257,6 +29258,7 @@
 /area/engine/atmos)
 "bbO" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/atmospherics/miner/oxygen,
 /turf/open/floor/engine/o2,
 /area/engine/atmos)
 "bbP" = (
@@ -30753,6 +30755,7 @@
 /area/engine/atmos)
 "bev" = (
 /obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/atmospherics/miner/toxins,
 /turf/open/floor/engine/plasma,
 /area/engine/atmos)
 "bew" = (
@@ -32494,6 +32497,7 @@
 /area/engine/atmos)
 "bhw" = (
 /obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/machinery/atmospherics/miner/nitrogen,
 /turf/open/floor/engine/n2,
 /area/engine/atmos)
 "bhx" = (
@@ -34606,6 +34610,7 @@
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide{
 	valve_open = 1
 	},
+/obj/machinery/atmospherics/miner/n2o,
 /turf/open/floor/engine/n2o,
 /area/engine/atmos)
 "bkI" = (
@@ -37308,7 +37313,6 @@
 /obj/item/clothing/accessory/armband/deputy,
 /obj/item/clothing/accessory/armband/deputy,
 /obj/item/clothing/accessory/armband/deputy,
-/obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},

_maps/map_files/MetaStation/MetaStation.dmm

@@ -45855,6 +45855,7 @@
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide{
 	valve_open = 1
 	},
+/obj/machinery/atmospherics/miner/n2o,
 /turf/open/floor/engine/n2o,
 /area/engine/atmos)
 "bKJ" = (
@@ -48899,6 +48900,7 @@
 /area/engine/atmos)
 "bQY" = (
 /obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/atmospherics/miner/toxins,
 /turf/open/floor/engine/plasma,
 /area/engine/atmos)
 "bQZ" = (
@@ -51342,6 +51344,7 @@
 /area/engine/atmos)
 "bVO" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/machinery/atmospherics/miner/carbon_dioxide,
 /turf/open/floor/engine/co2,
 /area/engine/atmos)
 "bVP" = (
@@ -58454,6 +58457,7 @@
 /area/engine/atmos)
 "cjd" = (
 /obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/machinery/atmospherics/miner/nitrogen,
 /turf/open/floor/engine/n2,
 /area/engine/atmos)
 "cje" = (
@@ -58468,6 +58472,7 @@
 /area/engine/atmos)
 "cjg" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/atmospherics/miner/oxygen,
 /turf/open/floor/engine/o2,
 /area/engine/atmos)
 "cjh" = (

_maps/map_files/OmegaStation/OmegaStation.dmm

@@ -16186,11 +16186,13 @@
 "aCs" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/machinery/light/small,
+/obj/machinery/atmospherics/miner/oxygen,
 /turf/open/floor/engine/o2,
 /area/engine/atmos)
 "aCw" = (
 /obj/machinery/portable_atmospherics/canister/nitrogen,
 /obj/machinery/light/small,
+/obj/machinery/atmospherics/miner/nitrogen,
 /turf/open/floor/engine/n2,
 /area/engine/atmos)
 "aCz" = (
@@ -37669,6 +37671,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/machinery/atmospherics/miner/n2o,
 /turf/open/floor/engine/n2o,
 /area/engine/atmos)
 "gcw" = (
@@ -37974,6 +37977,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/machinery/atmospherics/miner/carbon_dioxide,
 /turf/open/floor/engine/co2,
 /area/engine/atmos)
 "hTn" = (
@@ -38421,6 +38425,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/machinery/atmospherics/miner/toxins,
 /turf/open/floor/engine/plasma,
 /area/engine/atmos)
 "kiw" = (

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -41105,6 +41105,7 @@
 /area/engine/atmos)
 "bQa" = (
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
+/obj/machinery/atmospherics/miner/n2o,
 /turf/open/floor/engine/n2o,
 /area/engine/atmos)
 "bQb" = (
@@ -42511,6 +42512,7 @@
 /area/engine/atmos)
 "bSX" = (
 /obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/atmospherics/miner/toxins,
 /turf/open/floor/engine/plasma,
 /area/engine/atmos)
 "bSY" = (
@@ -44016,6 +44018,7 @@
 /area/engine/atmos)
 "bWf" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/machinery/atmospherics/miner/carbon_dioxide,
 /turf/open/floor/engine/co2,
 /area/engine/atmos)
 "bWg" = (
@@ -46129,6 +46132,7 @@
 /area/engine/atmos)
 "cbt" = (
 /obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/machinery/atmospherics/miner/nitrogen,
 /turf/open/floor/engine/n2,
 /area/engine/atmos)
 "cbu" = (
@@ -46136,6 +46140,7 @@
 /area/engine/atmos)
 "cbv" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/atmospherics/miner/oxygen,
 /turf/open/floor/engine/o2,
 /area/engine/atmos)
 "cbw" = (

code/__DEFINES/food.dm

@@ -11,6 +11,7 @@
 #define GROSS 		(1<<10)
 #define TOXIC 		(1<<11)
 #define PINEAPPLE	(1<<12)
+#define BREAKFAST	(1<<13)
 
 #define DRINK_NICE	1
 #define DRINK_GOOD	2

code/_globalvars/lists/mapping.dm

@@ -48,3 +48,5 @@ GLOBAL_LIST_EMPTY(sortedAreas)
 GLOBAL_LIST_EMPTY_TYPED(areas_by_type, /area)
 
 GLOBAL_LIST_EMPTY(all_abstract_markers)
+
+GLOBAL_LIST_EMPTY(stationroom_landmarks) //List of all spawns for stationrooms

code/controllers/configuration/config_entry.dm

@@ -151,6 +151,7 @@
 	var/key_mode
 	var/value_mode
 	var/splitter = " "
+	var/lowercase = TRUE
 
 /datum/config_entry/keyed_list/New()
 	. = ..()
@@ -167,7 +168,9 @@
 	var/key_value = null
 
 	if(key_pos || value_mode == VALUE_MODE_FLAG)
-		key_name = lowertext(copytext(str_val, 1, key_pos))
+		key_name = copytext(str_val, 1, key_pos)
+		if(lowercase)
+			key_name = lowertext(key_name)
 		key_value = copytext(str_val, key_pos + 1)
 		var/new_key
 		var/new_value

code/controllers/configuration/entries/game_options.dm

@@ -376,6 +376,12 @@
 
 /datum/config_entry/flag/disable_stambuffer
 
+/datum/config_entry/keyed_list/box_random_engine
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_FLAG
+	lowercase = FALSE
+	splitter = "-"
+
 /datum/config_entry/number/auto_transfer_delay
 	config_entry_value = 72000
 	min_val = 0

code/controllers/subsystem/air.dm

@@ -382,6 +382,9 @@ SUBSYSTEM_DEF(air)
 		CHECK_TICK
 
 /datum/controller/subsystem/air/proc/setup_template_machinery(list/atmos_machines)
+	if(!initialized)
+		return
+
 	for(var/A in atmos_machines)
 		var/obj/machinery/atmospherics/AM = A
 		AM.atmosinit()

code/controllers/subsystem/mapping.dm

@@ -91,6 +91,7 @@ SUBSYSTEM_DEF(mapping)
 	var/list/space_ruins = levels_by_trait(ZTRAIT_SPACE_RUINS)
 	if (space_ruins.len)
 		seedRuins(space_ruins, CONFIG_GET(number/space_budget), /area/space, space_ruins_templates)
+	SSmapping.seedStation()
 	loading_ruins = FALSE
 #endif
 	repopulate_sorted_areas()
@@ -363,6 +364,8 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 			lava_ruins_templates[R.name] = R
 		else if(istype(R, /datum/map_template/ruin/space))
 			space_ruins_templates[R.name] = R
+		else if(istype(R, /datum/map_template/ruin/station))
+			station_room_templates[R.name] = R
 
 /datum/controller/subsystem/mapping/proc/preloadShuttleTemplates()
 	var/list/unbuyable = generateMapList("[global.config.directory]/unbuyableshuttles.txt")
@@ -524,4 +527,15 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 	if(!isolated_ruins_z)
 		isolated_ruins_z = add_new_zlevel("Isolated Ruins/Reserved", list(ZTRAIT_RESERVED = TRUE, ZTRAIT_ISOLATED_RUINS = TRUE))
 		initialize_reserved_level(isolated_ruins_z.z_value)
-	return isolated_ruins_z.z_value
+	return isolated_ruins_z.z_value
+
+	// Station Ruins
+/datum/controller/subsystem/mapping
+	var/list/station_room_templates = list()
+
+/datum/controller/subsystem/mapping/proc/seedStation()
+	for(var/V in GLOB.stationroom_landmarks)
+		var/obj/effect/landmark/stationroom/LM = V
+		LM.load()
+	if(GLOB.stationroom_landmarks.len)
+		seedStation() //I'm sure we can trust everyone not to insert a 1x1 rooms which loads a landmark which loads a landmark which loads a la...

code/datums/components/sizzle.dm

@@ -0,0 +1,25 @@
+/datum/component/sizzle
+	var/mutable_appearance/sizzling
+	var/sizzlealpha = 0
+	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+
+/datum/component/sizzle/Initialize()
+	if(!isatom(parent))
+		return COMPONENT_INCOMPATIBLE
+	setup_sizzle()
+
+/datum/component/sizzle/InheritComponent(datum/component/C, i_am_original)
+	var/atom/food = parent
+	sizzlealpha += 5
+	sizzling.alpha = sizzlealpha
+	food.cut_overlay(sizzling)
+	food.add_overlay(sizzling)
+
+/datum/component/sizzle/proc/setup_sizzle()
+	var/atom/food = parent
+	var/icon/grill_marks = icon(initial(food.icon), initial(food.icon_state))	//we only want to apply grill marks to the initial icon_state for each object
+	grill_marks.Blend("#fff", ICON_ADD) 	//fills the icon_state with white (except where it's transparent)
+	grill_marks.Blend(icon('icons/obj/kitchen.dmi', "grillmarks"), ICON_MULTIPLY) //adds grill marks and the remaining white areas become transparent
+	sizzling = new(grill_marks)
+	sizzling.alpha = sizzlealpha
+	food.add_overlay(sizzling)

code/datums/looping_sounds/machinery_sounds.dm

@@ -4,7 +4,7 @@
 	mid_sounds = list('sound/machines/shower/shower_mid1.ogg'=1,'sound/machines/shower/shower_mid2.ogg'=1,'sound/machines/shower/shower_mid3.ogg'=1)
 	mid_length = 10
 	end_sound = 'sound/machines/shower/shower_end.ogg'
-	volume = 20
+	volume = 10
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -32,7 +32,7 @@
 	mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
 	mid_length = 2
 	end_sound = 'sound/machines/fryer/deep_fryer_emerge.ogg'
-	volume = 15
+	volume = 5
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -43,3 +43,12 @@
 	mid_length = 10
 	end_sound = 'sound/machines/microwave/microwave-end.ogg'
 	volume = 90
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/datum/looping_sound/grill
+	mid_length = 2
+	mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
+	volume = 10
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

code/datums/mood_events/generic_positive_events.dm

@@ -134,6 +134,12 @@
 	mood_change = 3
 	timeout = 3000
 
+/datum/mood_event/breakfast
+	description = "<span class='nicegreen'>Nothing like a hearty breakfast to start the shift.</span>\n"
+	mood_change = 2
+	timeout = 15 MINUTES
+
+//Power gamer stuff below
 /datum/mood_event/drankblood
 	description = "<span class='nicegreen'>I have fed greedly from that which nourishes me.</span>\n"
 	mood_change = 10
@@ -143,6 +149,7 @@
 	description = "<span class='nicegreen'>I slept in a coffin during the day. I feel whole again.</span>\n"
 	mood_change = 8
 	timeout = 1200
+
 //Cursed stuff below.
 
 /datum/mood_event/orgasm

code/datums/ruins/station.dm

@@ -0,0 +1,21 @@
+/datum/map_template/ruin/station
+	prefix = "_maps/RandomRuins/StationRuins/"
+	cost = 0
+
+// Boxstation
+	// Engine
+
+/datum/map_template/ruin/station/box/engine
+	id = "engine_sm"
+	suffix = "Box/Engine/engine_sm.dmm"
+	name = "Engine SM"
+
+/datum/map_template/ruin/station/box/engine/singulo
+	id = "engine_singulo"
+	suffix = "Box/Engine/engine_singulo.dmm"
+	name = "Engine Singulo"
+
+/datum/map_template/ruin/station/box/engine/tesla
+	id = "engine_tesla"
+	suffix = "Box/Engine/engine_tesla.dmm"
+	name = "Engine Tesla"

code/game/objects/effects/decals/cleanable/misc.dm

@@ -72,6 +72,11 @@
 	desc = "It's still good. Four second rule!"
 	icon_state = "flour"
 
+/obj/effect/decal/cleanable/greenglow/ecto
+	name = "ectoplasmic puddle"
+	desc = "You know who to call."
+	light_power = 2
+
 /obj/effect/decal/cleanable/greenglow
 	name = "glowing goo"
 	desc = "Jeez. I hope that's not for lunch."

code/game/objects/effects/landmarks.dm

@@ -432,3 +432,52 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	GLOB.ruin_landmarks -= src
 	ruin_template = null
 	. = ..()
+
+//------Station Rooms Landmarks------------//
+/obj/effect/landmark/stationroom
+	var/list/template_names = list()
+	layer = BULLET_HOLE_LAYER
+
+/obj/effect/landmark/stationroom/New()
+	..()
+	GLOB.stationroom_landmarks += src
+
+/obj/effect/landmark/stationroom/Destroy()
+	if(src in GLOB.stationroom_landmarks)
+		GLOB.stationroom_landmarks -= src
+	return ..()
+
+/obj/effect/landmark/stationroom/proc/load(template_name)
+	var/turf/T = get_turf(src)
+	if(!T)
+		return FALSE
+	if(!template_name)
+		for(var/t in template_names)
+			if(!SSmapping.station_room_templates[t])
+				log_world("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list")
+				template_names -= t
+		template_name = safepick(template_names)
+	if(!template_name)
+		GLOB.stationroom_landmarks -= src
+		qdel(src)
+		return FALSE
+	var/datum/map_template/template = SSmapping.station_room_templates[template_name]
+	if(!template)
+		return FALSE
+	testing("Room \"[template_name]\" placed at ([T.x], [T.y], [T.z])")
+	template.load(T, centered = FALSE)
+	template.loaded++
+	GLOB.stationroom_landmarks -= src
+	qdel(src)
+	return TRUE
+
+// The landmark for the Engine on Box
+
+/obj/effect/landmark/stationroom/box/engine
+	template_names = list("Engine SM", "Engine Singulo", "Engine Tesla")
+	icon = 'icons/rooms/box/engine.dmi'
+
+
+/obj/effect/landmark/stationroom/box/engine/New()
+	. = ..()
+	template_names = CONFIG_GET(keyed_list/box_random_engine)

code/game/objects/items/gift.dm

@@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 		/obj/item/clothing/suit/poncho/red,
 		/obj/item/clothing/suit/snowman,
 		/obj/item/clothing/head/snowman,
-		/obj/item/trash/coal)
+		/obj/item/stack/sheet/mineral/coal)
 
 	gift_type_list += subtypesof(/obj/item/clothing/head/collectable)
 	gift_type_list += subtypesof(/obj/item/toy) - (((typesof(/obj/item/toy/cards) - /obj/item/toy/cards/deck) + /obj/item/toy/figure + /obj/item/toy/ammo)) //All toys, except for abstract types and syndicate cards.

code/game/objects/items/stacks/medical.dm

@@ -2,8 +2,8 @@
 	name = "medical pack"
 	singular_name = "medical pack"
 	icon = 'icons/obj/stack_objects.dmi'
-	amount = 6
-	max_amount = 6
+	amount = 12
+	max_amount = 12
 	w_class = WEIGHT_CLASS_TINY
 	full_w_class = WEIGHT_CLASS_TINY
 	throw_speed = 3
@@ -55,9 +55,8 @@
 	icon_state = "brutepack"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
-	var/heal_brute = 25
+	var/heal_brute = 20
 	self_delay = 20
-	max_amount = 12
 	grind_results = list("styptic_powder" = 10)
 
 /obj/item/stack/medical/bruise_pack/heal(mob/living/M, mob/user)
@@ -92,7 +91,6 @@
 	var/stop_bleeding = 1800
 	var/heal_brute = 5
 	self_delay = 10
-	max_amount = 12
 
 /obj/item/stack/medical/gauze/heal(mob/living/M, mob/user)
 	if(ishuman(M))
@@ -125,6 +123,7 @@
 	singular_name = "improvised gauze"
 	desc = "A roll of cloth roughly cut from something that can stop bleeding, but does not heal wounds."
 	stop_bleeding = 900
+	heal_brute = 0
 
 /obj/item/stack/medical/gauze/cyborg
 	materials = list()
@@ -139,9 +138,8 @@
 	icon_state = "ointment"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
-	var/heal_burn = 25
+	var/heal_burn = 20
 	self_delay = 20
-	max_amount = 12
 	grind_results = list("silver_sulfadiazine" = 10)
 
 /obj/item/stack/medical/ointment/heal(mob/living/M, mob/user)

code/game/objects/items/stacks/sheets/mineral.dm

@@ -4,7 +4,6 @@ Mineral Sheets
 		- Sandstone
 		- Sandbags
 		- Diamond
-		- Snow
 		- Uranium
 		- Plasma
 		- Gold
@@ -15,8 +14,9 @@ Mineral Sheets
 	Others:
 		- Adamantine
 		- Mythril
-		- Enriched Uranium
+		- Snow
 		- Abductor
+		- Coal
 */
 
 /obj/item/stack/sheet/mineral/Initialize(mapload)
@@ -410,3 +410,36 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
 /obj/item/stack/sheet/mineral/abductor/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.abductor_recipes
 	. = ..()
+
+/*
+ * Coal
+ */
+
+/obj/item/stack/sheet/mineral/coal
+	name = "coal"
+	desc = "Someone's gotten on the naughty list."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "slag"
+	singular_name = "coal lump"
+	merge_type = /obj/item/stack/sheet/mineral/coal
+	grind_results = list("carbon" = 20)
+
+/obj/item/stack/sheet/mineral/coal/attackby(obj/item/W, mob/user, params)
+	if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite
+		var/turf/T = get_turf(src)
+		message_admins("Coal ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
+		log_game("Coal ignited by [key_name(user)] in [AREACOORD(T)]")
+		fire_act(W.get_temperature())
+		return TRUE
+	else
+		return ..()
+
+/obj/item/stack/sheet/mineral/coal/fire_act(exposed_temperature, exposed_volume)
+	atmos_spawn_air("co2=[amount*10];TEMP=[exposed_temperature]")
+	qdel(src)
+
+/obj/item/stack/sheet/mineral/coal/five
+	amount = 5
+
+/obj/item/stack/sheet/mineral/coal/ten
+	amount = 10

code/game/objects/items/trash.dm

@@ -72,17 +72,10 @@
 	resistance_flags = NONE
 	grind_results = list("aluminium" = 10)
 
+/obj/item/trash/boritos
+	name = "boritos bag"
+	icon_state = "boritos"
+	grind_results = list("aluminium" = 1) //from the mylar bag
+
 /obj/item/trash/attack(mob/M, mob/living/user)
 	return
-
-/obj/item/trash/coal
-	name = "lump of coal"
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "slag"
-	desc = "Someone's gotten on the naughty list."
-	grind_results = list("carbon" = 20)
-
-/obj/item/trash/coal/burn()
-	visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...")
-	new /obj/item/stack/ore/diamond(loc)
-	qdel(src)

code/modules/cargo/packs/organic.dm

@@ -176,6 +176,23 @@
 					/obj/item/storage/bag/tray)
 	crate_name = "fruit crate"
 
+/datum/supply_pack/organic/grill
+	name = "Grilling Starter Kit"
+	desc = "Hey dad I'm Hungry. Hi Hungry I'm THE NEW GRILLING STARTER KIT ONLY 5000 BUX GET NOW! Contains a cooking grill and five fuel coal sheets."
+	cost = 3000
+	crate_type = /obj/structure/closet/crate
+	contains = list(/obj/item/stack/sheet/mineral/coal/five,
+					/obj/machinery/grill/unwrenched)
+	crate_name = "grilling starter kit crate"
+
+/datum/supply_pack/organic/grillfuel
+	name = "Grilling Fuel Kit"
+	desc = "Contains coal and coal accessories. (Note: only ten coal sheets.)"
+	cost = 1000
+	crate_type = /obj/structure/closet/crate
+	contains = list(/obj/item/stack/sheet/mineral/coal/ten)
+	crate_name = "grilling fuel kit crate"
+
 /datum/supply_pack/organic/cream_piee
 	name = "High-yield Clown-grade Cream Pie Crate"
 	desc = "Designed by Aussec's Advanced Warfare Research Division, these high-yield, Clown-grade cream pies are powered by a synergy of performance and efficiency. Guaranteed to provide maximum results."

code/modules/food_and_drinks/drinks/drinks.dm

@@ -198,6 +198,7 @@
 	spillable = TRUE
 	resistance_flags = FREEZE_PROOF
 	isGlass = FALSE
+	foodtype = BREAKFAST
 
 //Used by MREs
 /obj/item/reagent_containers/food/drinks/coffee/type2
@@ -317,27 +318,27 @@
 				icon_state = "orangebox"
 				name = "orange juice box"
 				desc = "A great source of vitamins. Stay healthy!"
-				foodtype = FRUIT
+				foodtype = FRUIT | BREAKFAST
 			if("milk")
 				icon_state = "milkbox"
 				name = "carton of milk"
 				desc = "An excellent source of calcium for growing space explorers."
-				foodtype = DAIRY
+				foodtype = DAIRY | BREAKFAST
 			if("applejuice")
 				icon_state = "juicebox"
 				name = "apple juice box"
 				desc = "Sweet apple juice. Don't be late for school!"
-				foodtype = FRUIT
+				foodtype = FRUIT | BREAKFAST
 			if("grapejuice")
 				icon_state = "grapebox"
 				name = "grape juice box"
 				desc = "Tasty grape juice in a fun little container. Non-alcoholic!"
-				foodtype = FRUIT
+				foodtype = FRUIT | BREAKFAST
 			if("chocolate_milk")
 				icon_state = "chocolatebox"
 				name = "carton of chocolate milk"
 				desc = "Milk for cool kids!"
-				foodtype = SUGAR
+				foodtype = SUGAR | BREAKFAST
 			if("eggnog")
 				icon_state = "nog2"
 				name = "carton of eggnog"
@@ -524,3 +525,10 @@
 	desc = "There is no air shortage. Do not drink."
 	icon_state = "air"
 	list_reagents = list("nitrogen" = 24, "oxygen" = 6)
+
+/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
+	name = "Monkey Energy"
+	desc = "Unleash the ape!"
+	icon_state = "monkey_energy"
+	list_reagents = list("monkey_energy" = 50)
+	foodtype = SUGAR | JUNKFOOD

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -429,7 +429,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
 	list_reagents = list("orangejuice" = 100)
-	foodtype = FRUIT
+	foodtype = FRUIT| BREAKFAST
 
 /obj/item/reagent_containers/food/drinks/bottle/cream
 	name = "milk cream"

code/modules/food_and_drinks/food.dm

@@ -5,6 +5,9 @@
 /// the parent to the exclusion list in code/__HELPERS/unsorted.dm's
 /// get_random_food proc.
 ////////////////////////////////////////////////////////////////////////////////
+
+#define STOP_SERVING_BREAKFAST (15 MINUTES)
+
 /obj/item/reagent_containers/food
 	possible_transfer_amounts = list()
 	volume = 50	//Sets the default container amount for all food items.
@@ -40,4 +43,8 @@
 				if(foodtype & H.dna.species.toxic_food)
 					to_chat(H, "<span class='warning'>You don't feel so good...</span>")
 					H.adjust_disgust(25 + 30 * fraction)
+			if((foodtype & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
+				SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
 			last_check_time = world.time
+
+#undef STOP_SERVING_BREAKFAST

code/modules/food_and_drinks/food/condiment.dm

@@ -26,6 +26,7 @@
 	 "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
 	 "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"),
 	 "mayonnaise" = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."),
+	 "bbqsauce" = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
 	 "peanut_butter" = list("peanutbutter", "peanut butter jar", "A deliciously and sticky spread made from peanuts."))
 	var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
 
@@ -299,3 +300,8 @@
 	name = "astrotame pack"
 	originalname = "astrotame"
 	list_reagents = list("astrotame" = 5)
+
+/obj/item/reagent_containers/food/condiment/pack/bbqsauce
+	name = "bbq sauce pack"
+	originalname = "bbq sauce"
+	list_reagents = list("bbqsauce" = 10)

code/modules/food_and_drinks/food/snacks.dm

@@ -50,6 +50,8 @@ All foods are distributed among various categories. Use common sense.
 	var/list/bonus_reagents //the amount of reagents (usually nutriment and vitamin) added to crafted/cooked snacks, on top of the ingredients reagents.
 	var/customfoodfilling = 1 // whether it can be used as filling in custom food
 	var/list/tastes  // for example list("crisps" = 2, "salt" = 1)
+	var/dunkable = FALSE // for dunkable food, make true
+	var/dunk_amount = 10 // how much reagent is transferred per dunk
 
 	//Placeholder for effect that trigger on eating that aren't tied to reagents.
 
@@ -326,6 +328,24 @@ All foods are distributed among various categories. Use common sense.
 					M.emote("me", EMOTE_VISIBLE, "[sattisfaction_text]")
 				qdel(src)
 
+//////////////////////////////////////////Dunking///////////////////////////////////////////
+
+/obj/item/reagent_containers/food/snacks/afterattack(obj/item/reagent_containers/M, mob/user, proximity)
+	. = ..()
+	if(!dunkable || !proximity)
+		return
+	if(istype(M, /obj/item/reagent_containers/glass) || istype(M, /obj/item/reagent_containers/food/drinks))	//you can dunk dunkable snacks into beakers or drinks
+		if(!M.is_drainable())
+			to_chat(user, "<span class='warning'>[M] is unable to be dunked in!</span>")
+			return
+		if(M.reagents.trans_to(src, dunk_amount))	//if reagents were transfered, show the message
+			to_chat(user, "<span class='notice'>You dunk the [M].</span>")
+			return
+		if(!M.reagents.total_volume)
+			to_chat(user, "<span class='warning'>[M] is empty!</span>")
+		else
+			to_chat(user, "<span class='warning'>[src] is full!</span>")
+
 // //////////////////////////////////////////////Store////////////////////////////////////////
 /// All the food items that can store an item inside itself, like bread or cake.
 /obj/item/reagent_containers/food/snacks/store

code/modules/food_and_drinks/food/snacks/meat.dm

@@ -57,6 +57,33 @@
 	else if(subjectjob)
 		S.name = "[subjectjob] meatsteak"
 
+/obj/item/reagent_containers/food/snacks/meat/rawcrab
+	name = "raw crab meat"
+	desc = "A pile of raw crab meat."
+	icon_state = "crabmeatraw"
+	cooked_type = /obj/item/reagent_containers/food/snacks/meat/crab
+	bitesize = 3
+	list_reagents = list("nutriment" = 1, "cooking_oil" = 3)
+	filling_color = "#EAD079"
+	tastes = list("raw crab" = 1)
+	foodtype = RAW | MEAT
+
+/obj/item/reagent_containers/food/snacks/meat/crab
+	name = "crab meat"
+	desc = "Some deliciously cooked crab meat."
+	icon_state = "crabmeat"
+	list_reagents = list("nutriment" = 2)
+	bonus_reagents = list("nutriment" = 3, "vitamin" = 2, "cooking_oil" = 2)
+	filling_color = "#DFB73A"
+	tastes = list("crab" = 1)
+	foodtype = MEAT
+
+/obj/item/reagent_containers/food/snacks/meat/slab/chicken
+	name = "chicken meat"
+	desc = "A slab of raw chicken. Remember to wash your hands!"
+	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/chicken
+	slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/chicken
+	tastes = list("chicken" = 1)
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
 	icon_state = "slimemeat"
@@ -205,7 +232,6 @@
 	tastes = list("meat" = 1, "salmon" = 1)
 	foodtype = RAW | MEAT
 
-
 /obj/item/reagent_containers/food/snacks/meat/slab/xeno
 	name = "xeno meat"
 	desc = "A slab of meat."
@@ -229,7 +255,6 @@
 	tastes = list("cobwebs" = 1)
 	foodtype = RAW | MEAT | TOXIC
 
-
 /obj/item/reagent_containers/food/snacks/meat/slab/goliath
 	name = "goliath meat"
 	desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
@@ -277,7 +302,7 @@
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 1, "cooking_oil" = 2)
 	filling_color = "#854817"
 	tastes = list("bacon" = 1)
-	foodtype = MEAT
+	foodtype = MEAT | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/meat/slab/gondola
 	name = "gondola meat"
@@ -303,6 +328,10 @@
 	foodtype = MEAT
 	tastes = list("meat" = 1)
 
+/obj/item/reagent_containers/food/snacks/meat/steak/chicken
+	name = "chicken steak" //Can you have chicken steaks? Maybe this should be renamed once it gets new sprites.
+	tastes = list("chicken" = 1)
+
 /obj/item/reagent_containers/food/snacks/meat/steak/plain
 	foodtype = MEAT
 
@@ -310,6 +339,10 @@
 	tastes = list("tender meat" = 1)
 	foodtype = MEAT | GROSS
 
+/obj/item/reagent_containers/food/snacks/meat/steak/penguin
+	name = "penguin steak"
+	tastes = list("beef" = 1, "cod fish" = 1)
+
 /obj/item/reagent_containers/food/snacks/meat/steak/killertomato
 	name = "killer tomato steak"
 	tastes = list("tomato" = 1)
@@ -376,6 +409,11 @@
 	else if(subjectjob)
 		S.name = "[subjectjob] [initial(S.name)]"
 
+/obj/item/reagent_containers/food/snacks/meat/rawcutlet/chicken
+	name = "raw chicken cutlet"
+	cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/chicken
+	tastes = list("chicken" = 1)
+
 /obj/item/reagent_containers/food/snacks/meat/rawcutlet/killertomato
 	name = "raw killer tomato cutlet"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/killertomato
@@ -441,3 +479,11 @@
 /obj/item/reagent_containers/food/snacks/meat/cutlet/gondola
 	name = "gondola cutlet"
 	tastes = list("meat" = 1, "tranquility" = 1)
+
+/obj/item/reagent_containers/food/snacks/meat/cutlet/penguin
+	name = "penguin cutlet"
+	tastes = list("beef" = 1, "cod fish" = 1)
+
+/obj/item/reagent_containers/food/snacks/meat/cutlet/chicken
+	name = "chicken cutlet"
+	tastes = list("chicken" = 1)

code/modules/food_and_drinks/food/snacks_bread.dm

@@ -5,7 +5,7 @@
 	slices_num = 5
 	tastes = list("bread" = 10)
 	foodtype = GRAIN
-
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/breadslice
 	icon = 'icons/obj/food/burgerbread.dmi'
@@ -16,6 +16,7 @@
 	slot_flags = ITEM_SLOT_HEAD
 	customfoodfilling = 0 //to avoid infinite bread-ception
 	foodtype = GRAIN
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/store/bread/plain
 	name = "bread"
@@ -270,6 +271,7 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
 	list_reagents = list("nutriment" = 4)
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
 	tastes = list("butter" = 1, "toast" = 1)
+	foodtype = GRAIN | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/butterbiscuit
 	name = "butter biscuit"
@@ -280,6 +282,7 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
 	list_reagents = list("nutriment" = 5)
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
 	tastes = list("butter" = 1, "biscuit" = 1)
+	foodtype = GRAIN | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/butterdog
 	name = "butterdog"

code/modules/food_and_drinks/food/snacks_burgers.dm

@@ -134,13 +134,54 @@
 	tastes = list("bun" = 4, "brains" = 2)
 	foodtype = GRAIN | MEAT | GROSS
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /obj/item/reagent_containers/food/snacks/burger/ghost
 	name = "ghost burger"
 	desc = "Too Spooky!"
-	alpha = 125
+	icon_state = "ghostburger"
 	bonus_reagents = list("nutriment" = 5, "vitamin" = 12)
 	tastes = list("bun" = 4, "ectoplasm" = 2)
 	foodtype = GRAIN
+	alpha = 170
+	verb_say = "moans"
+	verb_yell = "wails"
+
+/obj/item/reagent_containers/food/snacks/burger/ghost/Initialize()
+	. = ..()
+	START_PROCESSING(SSobj, src)
+
+/obj/item/reagent_containers/food/snacks/burger/ghost/process()
+	if(!isturf(loc)) //no floating out of bags
+		return
+	var/paranormal_activity = rand(100)
+	switch(paranormal_activity)
+		if(97 to 100)
+			audible_message("[src] rattles a length of chain.")
+			playsound(loc,'sound/spookoween/chain_rattling.ogg', 300, TRUE)
+		if(91 to 96)
+			say(pick("OoOoOoo.", "OoooOOooOoo!!"))
+		if(84 to 90)
+			dir = pick(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
+			step(src, dir)
+		if(71 to 83)
+			step(src, dir)
+		if(65 to 70)
+			var/obj/machinery/light/L = locate(/obj/machinery/light) in view(4, src)
+			if(L)
+				L.flicker()
+		if(62 to 64)
+			playsound(loc,pick('sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg'), 50, TRUE, ignore_walls = FALSE)
+		if(61)
+			visible_message("[src] spews out a glob of ectoplasm!")
+			new /obj/effect/decal/cleanable/greenglow/ecto(loc)
+			playsound(loc,'sound/effects/splat.ogg', 200, TRUE)
+
+		//If i was less lazy i would make the burger forcefeed itself to a nearby mob here.
+
+/obj/item/reagent_containers/food/snacks/burger/ghost/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	. = ..()
+//////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /obj/item/reagent_containers/food/snacks/burger/red
 	name = "red burger"
@@ -281,3 +322,49 @@
 	bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
 	tastes = list("bun" = 4, "bacon" = 2)
 	foodtype = GRAIN | MEAT
+
+/obj/item/reagent_containers/food/snacks/burger/soylent
+	name = "soylent burger"
+	desc = "A eco-friendly burger made using upcycled low value biomass."
+	icon_state = "soylentburger"
+	bonus_reagents = list("nutriment" = 5, "vitamin" = 3)
+	tastes = list("bun" = 2, "assistant" = 4)
+	foodtype = GRAIN | MEAT | DAIRY
+
+/obj/item/reagent_containers/food/snacks/burger/rib
+	name = "mcrib"
+	desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it."
+	icon_state = "mcrib"
+	bonus_reagents = list("bbqsauce" = 5, "vitamin" = 3)
+	tastes = list("bun" = 2, "pork patty" = 4)
+	foodtype = GRAIN | MEAT
+
+/obj/item/reagent_containers/food/snacks/burger/mcguffin
+	name = "mcguffin"
+	desc = "A cheap and greasy imitation of an eggs benedict."
+	icon_state = "mcguffin"
+	tastes = list("muffin" = 2, "bacon" = 3)
+	bonus_reagents = list("eggyolk" = 3, "nutriment" = 1)
+	foodtype = GRAIN | MEAT | BREAKFAST
+
+/obj/item/reagent_containers/food/snacks/burger/chicken
+	name = "chicken sandwich" //Apparently the proud people of Americlapstan object to this thing being called a burger. Apparently McDonald's just calls it a burger in Europe as to not scare and confuse us.
+	desc = "A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize homosexuality on the space frontier."
+	icon_state = "chickenburger"
+	tastes = list("bun" = 2, "chicken" = 4, "God's covenant" = 1)
+	bonus_reagents = list("mayonnaise" = 3, "cooking_oil" = 2, "nutriment" = 2)
+	foodtype = GRAIN | MEAT | FRIED
+
+/obj/item/reagent_containers/food/snacks/burger/cheese
+	name = "cheese burger"
+	desc = "This noble burger stands proudly clad in golden cheese."
+	icon_state = "cheeseburger"
+	tastes = list("bun" = 2, "beef patty" = 4, "cheese" = 3)
+	bonus_reagents = list("nutriment" = 1)
+	foodtype = GRAIN | MEAT | DAIRY
+
+/obj/item/reagent_containers/food/snacks/burger/cheese/Initialize()
+	. = ..()
+	if(prob(33))
+		icon_state = "cheeseburgeralt"
+

code/modules/food_and_drinks/food/snacks_cake.dm

@@ -379,3 +379,21 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	filling_color = "#00FFFF"
 	tastes = list("cake" = 1, "sugar" = 1, "peachjuice" = 10)
 	foodtype = GRAIN | SUGAR | DAIRY
+
+/obj/item/reagent_containers/food/snacks/store/cake/trumpet
+	name = "spaceman's cake"
+	desc = "A spaceman's trumpet frosted cake."
+	icon_state = "trumpetcake"
+	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/trumpet
+	bonus_reagents = list("polypyr" = 15, "cream" = 5, "vitamin" = 5, "berryjuice" = 5)
+	filling_color = "#7A3D80"
+	tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
+	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/reagent_containers/food/snacks/cakeslice/trumpet
+	name = "spaceman's cake"
+	desc = "A spaceman's trumpet frosted cake."
+	icon_state = "trumpetcakeslice"
+	filling_color = "#7A3D80"
+	tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
+	foodtype = GRAIN | DAIRY | FRUIT | SUGAR

code/modules/food_and_drinks/food/snacks_egg.dm

@@ -94,7 +94,7 @@
 	filling_color = "#FFFFF0"
 	list_reagents = list("nutriment" = 3)
 	tastes = list("egg" = 4, "salt" = 1, "pepper" = 1)
-	foodtype = MEAT | FRIED
+	foodtype = MEAT | FRIED | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/boiledegg
 	name = "boiled egg"
@@ -104,7 +104,7 @@
 	filling_color = "#FFFFF0"
 	list_reagents = list("nutriment" = 2, "vitamin" = 1)
 	tastes = list("egg" = 1)
-	foodtype = MEAT
+	foodtype = MEAT | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/omelette	//FUCK THIS
 	name = "omelette du fromage"
@@ -116,7 +116,7 @@
 	bitesize = 1
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("egg" = 1, "cheese" = 1)
-	foodtype = MEAT
+	foodtype = MEAT | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/omelette/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/kitchen/fork))
@@ -145,5 +145,4 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	list_reagents = list("nutriment" = 6, "vitamin" = 4)
 	tastes = list("egg" = 1, "bacon" = 1, "bun" = 1)
-
-	foodtype = MEAT
+	foodtype = MEAT | BREAKFAST

code/modules/food_and_drinks/food/snacks_frozen.dm

@@ -81,16 +81,15 @@
 	filling_color = "#87CEFA"
 	tastes = list("blue cherries" = 2, "ice cream" = 2)
 	foodtype = FRUIT | DAIRY
-
 /////////////
 //SNOWCONES//
 /////////////
 
 /obj/item/reagent_containers/food/snacks/snowcones //We use this as a base for all other snowcones
-	name = "flaverless snowcone"
-	desc = "Its just harden water slivers. Still fun to chew on."
+	name = "flavorless snowcone"
+	desc = "It's just shaved ice. Still fun to chew on."
 	icon = 'icons/obj/food/snowcones.dmi'
-	icon_state = "flaverless_sc"
+	icon_state = "flavorless_sc"
 	trash = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups
 	bonus_reagents = list("water" = 10) //Base line will allways give water
 	list_reagents = list("water" = 1) // We dont get food for water/juices
@@ -99,106 +98,106 @@
 	foodtype = SUGAR //We use SUGAR as a base line to act in as junkfood, other wise we use fruit
 
 /obj/item/reagent_containers/food/snacks/snowcones/lime
-	name = "lime flavored snowcone"
-	desc = "A lime flavord snowball in a paper cup."
+	name = "lime snowcone"
+	desc = "Lime syrup drizzled over a snowball in a paper cup."
 	icon_state = "lime_sc"
 	list_reagents = list("nutriment" = 1, "limejuice" = 5)
 	tastes = list("ice" = 1, "water" = 1, "limes" = 5)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/snowcones/lemon
-	name = "lemon flavored snowcone"
-	desc = "A lemon flavord snowball in a paper cup."
+	name = "lemon snowcone"
+	desc = "Lemon syrup drizzled over a snowball in a paper cup."
 	icon_state = "lemon_sc"
 	list_reagents = list("nutriment" = 1, "lemonjuice" = 5)
 	tastes = list("ice" = 1, "water" = 1, "lemons" = 5)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/snowcones/apple
-	name = "apple flavored snowcone"
-	desc = "A apple flavord snowball in a paper cup."
-	icon_state = "blue_sc"
+	name = "apple snowcone"
+	desc = "Apple syrup drizzled over a snowball in a paper cup."
+	icon_state = "amber_sc"
 	list_reagents = list("nutriment" = 1, "applejuice" = 5)
 	tastes = list("ice" = 1, "water" = 1, "apples" = 5)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/snowcones/grape
-	name = "grape flavored snowcone"
-	desc = "A grape flavord snowball in a paper cup."
+	name = "grape snowcone"
+	desc = "Grape syrup drizzled over a snowball in a paper cup."
 	icon_state = "grape_sc"
-	list_reagents = list("nutriment" = 1, "berryjuice" = 5)
+	list_reagents = list("nutriment" = 1, "grapejuice" = 5)
 	tastes = list("ice" = 1, "water" = 1, "grape" = 5)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/snowcones/orange
-	name = "orange flavored snowcone"
-	desc = "A orange flavor dizzled on a snowball in a paper cup."
+	name = "orange snowcone"
+	desc = "Orange syrup drizzled over a snowball in a paper cup."
 	icon_state = "orange_sc"
-	list_reagents = list("nutriment" = 1, "orangejuice" = 10)
-	tastes = list("ice" = 1, "water" = 1, "berries" = 5)
+	list_reagents = list("nutriment" = 1, "orangejuice" = 5)
+	tastes = list("ice" = 1, "water" = 1, "orange" = 5)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/snowcones/blue
-	name = "bluecherry flavored snowcone"
-	desc = "A bluecharry flavord snowball in a paper cup, how rare!"
-	icon_state = "red_sc"
+	name = "bluecherry snowcone"
+	desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!"
+	icon_state = "blue_sc"
 	list_reagents = list("nutriment" = 1, "bluecherryjelly" = 5)
-	tastes = list("ice" = 1, "water" = 1, "blue" = 5)
+	tastes = list("ice" = 1, "water" = 1, "blue" = 5, "cherries" = 5)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/snowcones/red
-	name = "cherry flavored snowcone"
-	desc = "A cherry flavord snowball in a paper cup."
-	icon_state = "blue_sc"
+	name = "cherry snowcone"
+	desc = "Cherry syrup drizzled over a snowball in a paper cup."
+	icon_state = "red_sc"
 	list_reagents = list("nutriment" = 1, "cherryjelly" = 5)
-	tastes = list("ice" = 1, "water" = 1, "red" = 5)
+	tastes = list("ice" = 1, "water" = 1, "red" = 5, "cherries" = 5)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/snowcones/kiwi
-	name = "kiwi flavored snowcone"
-	desc = "A kiwi flavord snowball in a paper cup."
+	name = "kiwi snowcone"
+	desc = "A kiwi snowball in a paper cup."
 	icon_state = "kiwi_sc"
 	list_reagents = list("nutriment" = 3, "vitamin" = 6)
 	tastes = list("ice" = 1, "space" = 3, "kiwi" = 5)
 	foodtype = FRUIT
 
-/obj/item/reagent_containers/food/snacks/snowcones/mix
-	name = "mixed berry flavored snowcone"
-	desc = "A mix of different flavors dizzled on a snowball in a paper cup."
-	icon_state = "berry_sc"
-	list_reagents = list("nutriment" = 1, "berryjuice" = 10)
-	tastes = list("ice" = 1, "water" = 1, "berries" = 5)
-	foodtype = FRUIT
-
 /obj/item/reagent_containers/food/snacks/snowcones/peach
-	name = "peach flavored snowcone"
-	desc = "A peach flavord snowball in a paper cup."
+	name = "peach snowcone"
+	desc = "A peach snowball in a paper cup."
 	icon_state = "peach_sc"
 	list_reagents = list("nutriment" = 1, "peachjuice" = 10)
 	tastes = list("ice" = 1, "water" = 1, " peach" = 5)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/snowcones/strawberry
-	name = "strawberry flavored snowcone"
-	desc = "A strawberry flavord snowball in a paper cup."
+	name = "strawberry snowcone"
+	desc = "A strawberry snowball in a paper cup."
 	icon_state = "blue_sc"
 	list_reagents = list("nutriment" = 1, "berryjuice" = 10)
 	tastes = list("ice" = 1, "water" = 1, " strawberry" = 5)
 	foodtype = FRUIT
 
+/obj/item/reagent_containers/food/snacks/snowcones/berry
+	name = "berry snowcone"
+	desc = "Berry syrup drizzled over a snowball in a paper cup."
+	icon_state = "berry_sc"
+	list_reagents = list("nutriment" = 1, "berryjuice" = 5)
+	tastes = list("ice" = 1, "water" = 1, "berries" = 5)
+	foodtype = FRUIT
+
 /obj/item/reagent_containers/food/snacks/snowcones/fruitsalad
-	name = "mixed fruit flavored snowcone"
-	desc = "A mix of different flavors dizzled on a snowball in a paper cup."
+	name = "fruit salad snowcone"
+	desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup."
 	icon_state = "fruitsalad_sc"
-	list_reagents = list("nutriment" = 1, "limejuice" = 5, "lemonjuice" = 5, "orangejuice" = 5)
-	tastes = list("ice" = 1, "water" = 1, "fruits" = 25)
+	list_reagents = list("nutriment" = 1, "lemonjuice" = 5, "limejuice" = 5, "orangejuice" = 5)
+	tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "limes" = 5, "lemons" = 5, "citrus" = 5, "salad" = 5)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/snowcones/pineapple
-	name = "pineapple flavored snowcone"
-	desc = "A pineapple flavord snowball in a paper cup."
+	name = "pineapple snowcone"
+	desc = "Pineapple syrup drizzled over a snowball in a paper cup."
 	icon_state = "pineapple_sc"
-	list_reagents = list("nutriment" = 1, "water" = 1)
+	list_reagents = list("nutriment" = 1, "water" = 10)
 	tastes = list("ice" = 1, "water" = 1, "pineapples" = 5)
 	foodtype = PINEAPPLE //Pineapple to allow all that like pineapple to enjoy
 
@@ -207,41 +206,46 @@
 	desc = "..."
 	icon_state = "mime_sc"
 	list_reagents = list("nutriment" = 1, "nothing" = 5)
-	tastes = list("nothing" = 5)
+	tastes = list("ice" = 1, "water" = 1, "nothing" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/clown
-	name = "joke flavored snowcone"
-	desc = "A waterd down jokeful flavord snowball in a paper cup."
+	name = "clown snowcone"
+	desc = "Laughter drizzled over a snowball in a paper cup."
 	icon_state = "clown_sc"
 	list_reagents = list("nutriment" = 1, "laughter" = 5)
-	tastes = list("jokes" = 5, "brainfreeze" = 5, "joy" = 5)
+	tastes = list("ice" = 1, "water" = 1, "jokes" = 5, "brainfreeze" = 5, "joy" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/soda
-	name = "sodawater flavored snowcone"
-	desc = "A waterd down sodawater flavored snowcone snowball in a paper cup."
+	name = "space cola snowcone"
+	desc = "Space Cola drizzled over a snowball in a paper cup."
 	icon_state = "soda_sc"
-	list_reagents = list("nutriment" = 1, "sodawater" = 5)
-	tastes = list("surgar" = 1, "water" = 5, "soda" = 5)
-	foodtype = JUNKFOOD | SUGAR
+	list_reagents = list("nutriment" = 1, "space_cola" = 5)
+	tastes = list("ice" = 1, "water" = 1, "cola" = 5)
 
-/obj/item/reagent_containers/food/snacks/snowcones/pwgrmer
-	name = "pwergamer flavored snowcone"
-	desc = "A waterd down pwergamer soda flavord snowball in a paper cup."
-	icon_state = "pwergamer_sc"
-	list_reagents = list("nutriment" = 1, "laughter" = 1)
-	tastes = list("vaild" = 5, "salt" = 5, "wats" = 5)
-	foodtype = JUNKFOOD | SUGAR
+/obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind
+	name = "Space Mountain Wind snowcone"
+	desc = "Space Mountain Wind drizzled over a snowball in a paper cup."
+	icon_state = "kiwi_sc"
+	list_reagents = list("nutriment" = 1, "spacemountainwind" = 5)
+	tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5)
+
+/obj/item/reagent_containers/food/snacks/snowcones/pwrgame
+	name = "pwrgame snowcone"
+	desc = "Pwrgame soda drizzled over a snowball in a paper cup."
+	icon_state = "pwrgame_sc"
+	list_reagents = list("nutriment" = 1, "pwr_game" = 5)
+	tastes = list("ice" = 1, "water" = 1, "valid" = 5, "salt" = 5, "wats" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/honey
-	name = "honey flavored snowcone"
-	desc = "A honey flavord snowball in a paper cup."
-	icon_state = "honey_sc"
+	name = "honey snowcone"
+	desc = "Honey drizzled over a snowball in a paper cup."
+	icon_state = "amber_sc"
 	list_reagents = list("nutriment" = 1, "honey" = 5)
-	tastes = list("pollen" = 5, "sweetness" = 5, "wax" = 1)
+	tastes = list("ice" = 1, "water" = 1, "flowers" = 5, "sweetness" = 5, "wax" = 1)
 
 /obj/item/reagent_containers/food/snacks/snowcones/rainbow
-	name = "rainbow color snowcone"
-	desc = "A rainbow color snowball in a paper cup."
+	name = "rainbow snowcone"
+	desc = "A very colorful snowball in a paper cup."
 	icon_state = "rainbow_sc"
 	list_reagents = list("nutriment" = 5, "laughter" = 25)
-	tastes = list("sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3)
+	tastes = list("ice" = 1, "water" = 1, "sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3)

code/modules/food_and_drinks/food/snacks_meat.dm

@@ -149,7 +149,7 @@
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
 	tastes = list("meat" = 1)
-	foodtype = MEAT
+	foodtype = MEAT | BREAKFAST
 	var/roasted = FALSE
 
 /obj/item/reagent_containers/food/snacks/sausage/Initialize()
@@ -344,3 +344,19 @@
 	icon_state = "doubleratkebab"
 	tastes = list("rat meat" = 2, "metal" = 1)
 	bonus_reagents = list("nutriment" = 6, "vitamin" = 2)
+
+/obj/item/reagent_containers/food/snacks/kebab/fiesta
+	name = "fiesta skewer"
+	icon_state = "fiestaskewer"
+	tastes = list("tex-mex" = 3, "cumin" = 2)
+	bonus_reagents = list("vitamin" = 5, "capsaicin" = 3)
+
+/obj/item/reagent_containers/food/snacks/bbqribs
+	name = "bbq ribs"
+	desc = "BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist."
+	icon_state = "ribs"
+	w_class = WEIGHT_CLASS_NORMAL
+	list_reagents = list("nutriment" = 8, "vitamin" = 2, "bbqsauce" = 5)
+	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	tastes = list("meat" = 3, "smokey sauce" = 1)
+	foodtype = MEAT

code/modules/food_and_drinks/food/snacks_other.dm

@@ -47,6 +47,7 @@
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/hugemushroomslice
 	name = "huge mushroom slice"
@@ -90,6 +91,7 @@
 	filling_color = "#FFD700"
 	tastes = list("fries" = 3, "salt" = 1)
 	foodtype = VEGETABLES | GRAIN | FRIED
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/tatortot
 	name = "tator tot"
@@ -99,6 +101,7 @@
 	filling_color = "FFD700"
 	tastes = list("potato" = 3, "valids" = 1)
 	foodtype = FRIED | VEGETABLES
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/soydope
 	name = "soy dope"
@@ -109,6 +112,7 @@
 	filling_color = "#DEB887"
 	tastes = list("soy" = 1)
 	foodtype = VEGETABLES
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/cheesyfries
 	name = "cheesy fries"
@@ -128,6 +132,7 @@
 	list_reagents = list("bad_food" = 30)
 	filling_color = "#8B4513"
 	foodtype = GROSS
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/carrotfries
 	name = "carrot fries"
@@ -401,7 +406,6 @@
 	tastes = list("death" = 2, "rock" = 1, "meat" = 1, "hot peppers" = 1)
 	foodtype = MEAT
 
-
 /obj/item/reagent_containers/food/snacks/powercrepe
 	name = "Powercrepe"
 	desc = "With great power, comes great crepes.  It looks like a pancake filled with jelly but packs quite a punch."
@@ -583,6 +587,7 @@
 	filling_color = "#ffdf26"
 	tastes = list("strawberries" = 5, "chocolate" = 3)
 	foodtype = FRUIT | SUGAR
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/chocolatebanana
 	name = "Chocolate dipped banana"
@@ -591,4 +596,17 @@
 	list_reagents = list("sugar" = 5, "nutriment" = 3, "vitamin" = 1)
 	filling_color = "#ffdf26"
 	tastes = list("banana" = 5, "chocolate" = 3)
-	foodtype = FRUIT | SUGAR
+	foodtype = FRUIT | SUGAR
+	dunkable = TRUE
+
+/obj/item/reagent_containers/food/snacks/cornchips
+	name = "boritos corn chips"
+	desc = "Triangular corn chips. They do seem a bit bland but would probably go well with some kind of dipping sauce."
+	icon_state = "boritos"
+	trash = /obj/item/trash/boritos
+	bitesize = 2
+	list_reagents = list("nutriment" = 3, "cooking_oil" = 2, "sodiumchloride" = 3)
+	filling_color = "#ECA735"
+	tastes = list("fried corn" = 1)
+	foodtype = JUNKFOOD | FRIED
+	dunkable = TRUE

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -5,28 +5,31 @@
 /obj/item/reagent_containers/food/snacks/donut
 	name = "donut"
 	desc = "Goes great with robust coffee."
-	icon_state = "donut1"
+	icon = 'icons/obj/food/donut.dmi'
+	icon_state = "donut"
 	bitesize = 5
 	bonus_reagents = list("sugar" = 1)
 	list_reagents = list("nutriment" = 3, "sprinkles" = 1, "sugar" = 2)
 	filling_color = "#D2691E"
 	tastes = list("donut" = 1)
-	foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR
-	var/frosted_icon = "donut2"
-	var/is_frosted = FALSE
+	foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR | BREAKFAST
+	dunkable = TRUE
+	var/decorated_icon = "donut_homer"
+	var/is_decorated = FALSE
 	var/extra_reagent = null
+	var/decorated_adjective = "sprinkled"
 
 /obj/item/reagent_containers/food/snacks/donut/Initialize()
 	. = ..()
 	if(prob(30))
-		frost_donut()
+		decorate_donut()
 
-/obj/item/reagent_containers/food/snacks/donut/proc/frost_donut()
-	if(is_frosted || !frosted_icon)
+/obj/item/reagent_containers/food/snacks/donut/proc/decorate_donut()
+	if(is_decorated || !decorated_icon)
 		return
-	is_frosted = TRUE
-	name = "frosted [name]"
-	icon_state = frosted_icon //delish~!
+	is_decorated = TRUE
+	name = "[decorated_adjective] [name]"
+	icon_state = decorated_icon //delish~!
 	reagents.add_reagent(/datum/reagent/consumable/sprinkles, 1)
 	filling_color = "#FF69B4"
 	return TRUE
@@ -43,9 +46,13 @@
 				return
 	..()
 
+/obj/item/reagent_containers/food/snacks/donut/plain
+	//Use this donut ingame
+
 /obj/item/reagent_containers/food/snacks/donut/chaos
 	name = "chaos donut"
 	desc = "Like life, it never quite tastes the same."
+	icon_state = "donut_chaos"
 	bitesize = 10
 	tastes = list("donut" = 3, "chaos" = 1)
 
@@ -57,53 +64,268 @@
 					/datum/reagent/medicine/omnizine)
 	reagents.add_reagent(extra_reagent, 3)
 
+/obj/item/reagent_containers/food/snacks/donut/meat
+	name = "Meat Donut"
+	desc = "Tastes as gross as it looks."
+	icon_state = "donut_meat"
+	bonus_reagents = list("ketchup" = 1)
+	list_reagents = list("nutriment" = 3, "ketchup" = 2)
+	tastes = list("meat" = 1)
+	foodtype = JUNKFOOD | MEAT | GROSS | FRIED | BREAKFAST
+
+/obj/item/reagent_containers/food/snacks/donut/berry
+	name = "pink donut"
+	desc = "Goes great with a soy latte."
+	icon_state = "donut_pink"
+	bonus_reagents = list("berryjuice" = 3, "sprinkles" = 1) //Extra sprinkles to reward frosting
+	filling_color = "#E57d9A"
+	decorated_icon = "donut_homer"
+
+/obj/item/reagent_containers/food/snacks/donut/trumpet
+	name = "spaceman's donut"
+	desc = "Goes great with a cold beaker of malk."
+	icon_state = "donut_purple"
+	bonus_reagents = list("polypyr" = 3, "sprinkles" = 1)
+	tastes = list("donut" = 3, "violets" = 1)
+	is_decorated = TRUE
+	filling_color = "#8739BF"
+
+/obj/item/reagent_containers/food/snacks/donut/apple
+	name = "apple donut"
+	desc = "Goes great with a shot of cinnamon schnapps."
+	icon_state = "donut_green"
+	bonus_reagents = list("applejuice" = 3, "sprinkles" = 1)
+	tastes = list("donut" = 3, "green apples" = 1)
+	is_decorated = TRUE
+	filling_color = "#6ABE30"
+
+/obj/item/reagent_containers/food/snacks/donut/caramel
+	name = "caramel donut"
+	desc = "Goes great with a mug of hot coco."
+	icon_state = "donut_beige"
+	bonus_reagents = list("caramel" = 3, "sprinkles" = 1)
+	tastes = list("donut" = 3, "buttery sweetness" = 1)
+	is_decorated = TRUE
+	filling_color = "#D4AD5B"
+
+/obj/item/reagent_containers/food/snacks/donut/choco
+	name = "chocolate donut"
+	desc = "Goes great with a glass of warm milk."
+	icon_state = "donut_choc"
+	bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1) //the coco reagent is just bitter.
+	tastes = list("donut" = 4, "bitterness" = 1)
+	decorated_icon = "donut_choc_sprinkles"
+	filling_color = "#4F230D"
+
+/obj/item/reagent_containers/food/snacks/donut/blumpkin
+	name = "blumpkin donut"
+	desc = "Goes great with a mug of soothing drunken blumpkin."
+	icon_state = "donut_blue"
+	bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1)
+	tastes = list("donut" = 2, "blumpkin" = 1)
+	is_decorated = TRUE
+	filling_color = "#2788C4"
+
+/obj/item/reagent_containers/food/snacks/donut/bungo
+	name = "bungo donut"
+	desc = "Goes great with a mason jar of hippie's delight."
+	icon_state = "donut_yellow"
+	bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1)
+	tastes = list("donut" = 3, "tropical sweetness" = 1)
+	is_decorated = TRUE
+	filling_color = "#DEC128"
+
+/obj/item/reagent_containers/food/snacks/donut/matcha
+	name = "matcha donut"
+	desc = "Goes great with a cup of tea."
+	icon_state = "donut_olive"
+	bonus_reagents = list("teapowder = 3", "sprinkles" = 1)
+	tastes = list("donut" = 3, "matcha" = 1)
+	is_decorated = TRUE
+	filling_color = "#879630"
+
+//////////////////////JELLY DONUTS/////////////////////////
+
 /obj/item/reagent_containers/food/snacks/donut/jelly
 	name = "jelly donut"
 	desc = "You jelly?"
-	icon_state = "jdonut1"
-	frosted_icon = "jdonut2"
+	icon_state = "jelly"
+	decorated_icon = "jelly_homer"
 	bonus_reagents = list("sugar" = 1, "vitamin" = 1)
 	extra_reagent = "berryjuice"
 	tastes = list("jelly" = 1, "donut" = 3)
-	foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT | SUGAR
+	foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT | SUGAR | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/donut/jelly/Initialize()
 	. = ..()
 	if(extra_reagent)
 		reagents.add_reagent(extra_reagent, 3)
 
+/obj/item/reagent_containers/food/snacks/donut/jelly/plain //use this ingame to avoid inheritance related crafting issues.
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/berry
+	name = "pink jelly donut"
+	desc = "Goes great with a soy latte."
+	icon_state = "jelly_pink"
+	bonus_reagents = list("berryjuice" = 3, "sprinkles" = 1, "vitamin" = 1) //Extra sprinkles to reward frosting.
+	filling_color = "#E57d9A"
+	decorated_icon = "jelly_homer"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/trumpet
+	name = "spaceman's jelly donut"
+	desc = "Goes great with a cold beaker of malk."
+	icon_state = "jelly_purple"
+	bonus_reagents = list("polypyr" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 3, "violets" = 1)
+	is_decorated = TRUE
+	filling_color = "#8739BF"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/apple
+	name = "apple jelly donut"
+	desc = "Goes great with a shot of cinnamon schnapps."
+	icon_state = "jelly_green"
+	bonus_reagents = list("applejuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 3, "green apples" = 1)
+	is_decorated = TRUE
+	filling_color = "#6ABE30"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/caramel
+	name = "caramel jelly donut"
+	desc = "Goes great with a mug of hot coco."
+	icon_state = "jelly_beige"
+	bonus_reagents = list("caramel" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 3, "buttery sweetness" = 1)
+	is_decorated = TRUE
+	filling_color = "#D4AD5B"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/choco
+	name = "chocolate jelly donut"
+	desc = "Goes great with a glass of warm milk."
+	icon_state = "jelly_choc"
+	bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1, "vitamin" = 1) //the coco reagent is just bitter.
+	tastes = list("jelly" = 1, "donut" = 4, "bitterness" = 1)
+	decorated_icon = "jelly_choc_sprinkles"
+	filling_color = "#4F230D"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin
+	name = "blumpkin jelly donut"
+	desc = "Goes great with a mug of soothing drunken blumpkin."
+	icon_state = "jelly_blue"
+	bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 2, "blumpkin" = 1)
+	is_decorated = TRUE
+	filling_color = "#2788C4"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/bungo
+	name = "bungo jelly donut"
+	desc = "Goes great with a mason jar of hippie's delight."
+	icon_state = "jelly_yellow"
+	bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 3, "tropical sweetness" = 1)
+	is_decorated = TRUE
+	filling_color = "#DEC128"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/matcha
+	name = "matcha jelly donut"
+	desc = "Goes great with a cup of tea."
+	icon_state = "jelly_olive"
+	bonus_reagents = list("teapowder" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 3, "matcha" = 1)
+	is_decorated = TRUE
+	filling_color = "#879630"
+
+//////////////////////////SLIME DONUTS/////////////////////////
+
 /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly
 	name = "jelly donut"
 	desc = "You jelly?"
-	icon_state = "jdonut1"
+	icon_state = "jelly"
 	extra_reagent = "slimejelly"
-	foodtype = JUNKFOOD | GRAIN | FRIED | TOXIC | SUGAR
+	foodtype = JUNKFOOD | GRAIN | FRIED | TOXIC | SUGAR | BREAKFAST
 
-/obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly
-	name = "jelly donut"
-	desc = "You jelly?"
-	icon_state = "jdonut1"
-	extra_reagent = "cherryjelly"
-	foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT
+/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain
 
-/obj/item/reagent_containers/food/snacks/donut/meat
-	bonus_reagents = list("ketchup" = 1)
-	list_reagents = list("nutriment" = 3, "ketchup" = 2)
-	tastes = list("meat" = 1)
-	foodtype = JUNKFOOD | MEAT | GROSS | FRIED
+/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry
+	name = "pink jelly donut"
+	desc = "Goes great with a soy latte."
+	icon_state = "jelly_pink"
+	bonus_reagents = list("berryjuice" = 3, "sprinkles" = 1, "vitamin" = 1) //Extra sprinkles to reward frosting
+	filling_color = "#E57d9A"
 
-/obj/item/reagent_containers/food/snacks/donut/semen
-	name = "\"cream\" donut"
-	desc = "That cream looks a little runny..."
-	icon_state = "donut3"
+/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet
+	name = "spaceman's jelly donut"
+	desc = "Goes great with a cold beaker of malk."
+	icon_state = "jelly_purple"
+	bonus_reagents = list("polypyr" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 3, "violets" = 1)
+	is_decorated = TRUE
+	filling_color = "#8739BF"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple
+	name = "apple jelly donut"
+	desc = "Goes great with a shot of cinnamon schnapps."
+	icon_state = "jelly_green"
+	bonus_reagents = list("applejuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 3, "green apples" = 1)
+	is_decorated = TRUE
+	filling_color = "#6ABE30"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/caramel
+	name = "caramel jelly donut"
+	desc = "Goes great with a mug of hot coco."
+	icon_state = "jelly_beige"
+	bonus_reagents = list("caramel" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 3, "buttery sweetness" = 1)
+	is_decorated = TRUE
+	filling_color = "#D4AD5B"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco
+	name = "chocolate jelly donut"
+	desc = "Goes great with a glass of warm milk."
+	icon_state = "jelly_choc"
+	bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1, "vitamin" = 1) //the coco reagent is just bitter.
+	tastes = list("jelly" = 1, "donut" = 4, "bitterness" = 1)
+	decorated_icon = "jelly_choc_sprinkles"
+	filling_color = "#4F230D"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin
+	name = "blumpkin jelly donut"
+	desc = "Goes great with a mug of soothing drunken blumpkin."
+	icon_state = "jelly_blue"
+	bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 2, "blumpkin" = 1)
+	is_decorated = TRUE
+	filling_color = "#2788C4"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo
+	name = "bungo jelly donut"
+	desc = "Goes great with a mason jar of hippie's delight."
+	icon_state = "jelly_yellow"
+	bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 3, "tropical sweetness" = 1)
+	is_decorated = TRUE
+	filling_color = "#DEC128"
+
+/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha
+	name = "matcha jelly donut"
+	desc = "Goes great with a cup of tea."
+	icon_state = "jelly_olive"
+	bonus_reagents = list("teapowder" = 3, "sprinkles" = 1, "vitamin" = 1)
+	tastes = list("jelly" = 1, "donut" = 3, "matcha" = 1)
+	is_decorated = TRUE
+	filling_color = "#879630"
+
+/obj/item/reagent_containers/food/snacks/donut/glaze
+	name = "glazed donut"
+	desc = "A sugar glazed donut."
+	icon_state = "donut_glaze"
 	bitesize = 10
-	bonus_reagents = list("semen" = 1)
-	list_reagents = list("nutriment" = 3, "sugar" = 2, "semen" = 5)
+	bonus_reagents = list("sugar" = 3)
+	list_reagents = list("nutriment" = 3, "sugar" = 8)
 	filling_color = "#FFFFFF"
 	tastes = list("donut" = 1, "salt" = 3)
 	foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR
 
-
 ////////////////////////////////////////////MUFFINS////////////////////////////////////////////
 
 /obj/item/reagent_containers/food/snacks/muffin
@@ -114,14 +336,14 @@
 	list_reagents = list("nutriment" = 6)
 	filling_color = "#F4A460"
 	tastes = list("muffin" = 1)
-	foodtype = GRAIN | SUGAR
+	foodtype = GRAIN | SUGAR | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/muffin/berry
 	name = "berry muffin"
 	icon_state = "berrymuffin"
 	desc = "A delicious and spongy little cake, with berries."
 	tastes = list("muffin" = 3, "berry" = 1)
-	foodtype = GRAIN | FRUIT | SUGAR
+	foodtype = GRAIN | FRUIT | SUGAR | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/muffin/booberry
 	name = "booberry muffin"
@@ -129,7 +351,7 @@
 	alpha = 125
 	desc = "My stomach is a graveyard! No living being can quench my bloodthirst!"
 	tastes = list("muffin" = 3, "spookiness" = 1)
-	foodtype = GRAIN | FRUIT | SUGAR
+	foodtype = GRAIN | FRUIT | SUGAR | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/chawanmushi
 	name = "chawanmushi"
@@ -152,7 +374,7 @@
 	list_reagents = list("nutriment" = 8, "vitamin" = 1)
 	filling_color = "#D2691E"
 	tastes = list("waffles" = 1)
-	foodtype = GRAIN | SUGAR
+	foodtype = GRAIN | SUGAR | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/soylentgreen
 	name = "\improper Soylent Green"
@@ -163,7 +385,7 @@
 	list_reagents = list("nutriment" = 10, "vitamin" = 1)
 	filling_color = "#9ACD32"
 	tastes = list("waffles" = 7, "people" = 1)
-	foodtype = GRAIN | GROSS | MEAT
+	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/soylenviridians
 	name = "\improper Soylent Virdians"
@@ -186,7 +408,7 @@
 	list_reagents = list("nutriment" = 8, "mushroomhallucinogen" = 2, "vitamin" = 2)
 	filling_color = "#00BFFF"
 	tastes = list("waffle" = 1, "mushrooms" = 1)
-	foodtype = GRAIN | VEGETABLES | TOXIC | SUGAR
+	foodtype = GRAIN | VEGETABLES | SUGAR | BREAKFAST
 
 ////////////////////////////////////////////OTHER////////////////////////////////////////////
 
@@ -199,7 +421,8 @@
 	list_reagents = list("nutriment" = 1)
 	filling_color = "#F0E68C"
 	tastes = list("cookie" = 1)
-	foodtype = SUGAR
+	foodtype = GRAIN | SUGAR
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/donkpocket
 	name = "\improper Donk-pocket"
@@ -216,6 +439,7 @@
 	desc = "The heated food of choice for the seasoned traitor."
 	bonus_reagents = list("omnizine" = 3)
 	list_reagents = list("nutriment" = 4, "omnizine" = 3)
+	cooked_type = null
 	tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
 	foodtype = GRAIN
 
@@ -318,6 +542,7 @@
 	filling_color = "#CD853F"
 	tastes = list("sweetness" = 1)
 	foodtype = GRAIN | JUNKFOOD | SUGAR
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/chococornet
 	name = "chocolate cornet"
@@ -338,6 +563,7 @@
 	filling_color = "#D2691E"
 	tastes = list("cookie" = 2, "oat" = 1)
 	foodtype = GRAIN
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/raisincookie
 	name = "raisin cookie"
@@ -348,6 +574,7 @@
 	filling_color = "#F0E68C"
 	tastes = list("cookie" = 1, "raisins" = 1)
 	foodtype = GRAIN | FRUIT
+	dunkable = TRUE
 
 /obj/item/reagent_containers/food/snacks/cherrycupcake
 	name = "cherry cupcake"
@@ -370,7 +597,7 @@
 	foodtype = GRAIN | FRUIT | SUGAR
 
 /obj/item/reagent_containers/food/snacks/strawberrycupcake
-	name = "Strawberry cupcake"
+	name = "strawberry cupcake"
 	desc = "Strawberry inside a delicious cupcake."
 	icon_state = "strawberrycupcake"
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
@@ -387,9 +614,9 @@
 	list_reagents = list("nutriment" = 5, "honey" = 5)
 	filling_color = "#F2CE91"
 	tastes = list("pastry" = 1, "sweetness" = 1)
-	foodtype = GRAIN
+	foodtype = GRAIN | SUGAR
 
-#define PANCAKE_MAX_STACK 30
+#define PANCAKE_MAX_STACK 10
 
 /obj/item/reagent_containers/food/snacks/pancakes
 	name = "pancake"
@@ -400,7 +627,7 @@
 	list_reagents = list("nutriment" = 4, "vitamin" = 1)
 	filling_color = "#D2691E"
 	tastes = list("pancakes" = 1)
-	foodtype = GRAIN | SUGAR
+	foodtype = GRAIN | SUGAR | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/pancakes/blueberry
 	name = "blueberry pancake"

code/modules/food_and_drinks/food/snacks_salad.dm

@@ -47,7 +47,7 @@
 	bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
 	list_reagents = list("nutriment" = 7, "milk" = 10, "vitamin" = 2)
 	tastes = list("oats" = 1, "milk" = 1)
-	foodtype = DAIRY | GRAIN
+	foodtype = DAIRY | GRAIN | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/salad/fruit
 	name = "fruit salad"
@@ -55,7 +55,7 @@
 	icon_state = "fruitsalad"
 	bonus_reagents = list("nutriment" = 2, "vitamin" = 4)
 	tastes = list("fruit" = 1)
-	foodtype = FRUIT
+	foodtype = FRUIT | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/salad/jungle
 	name = "jungle salad"
@@ -64,7 +64,7 @@
 	bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
 	list_reagents = list("nutriment" = 7, "banana" = 5, "vitamin" = 4)
 	tastes = list("fruit" = 1, "the jungle" = 1)
-	foodtype = FRUIT
+	foodtype = FRUIT | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/salad/citrusdelight
 	name = "citrus delight"
@@ -73,7 +73,7 @@
 	bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
 	list_reagents = list("nutriment" = 7, "vitamin" = 5)
 	tastes = list("sourness" = 1, "leaves" = 1)
-	foodtype = FRUIT
+	foodtype = FRUIT | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/salad/ricebowl
 	name = "ricebowl"
@@ -91,7 +91,7 @@
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
 	list_reagents = list("nutriment" = 5, "vitamin" = 1)
 	tastes = list("rice" = 1)
-	foodtype = GRAIN
+	foodtype = GRAIN | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/salad/ricepudding
 	name = "rice pudding"

code/modules/food_and_drinks/food/snacks_soup.dm

@@ -227,3 +227,22 @@
 	bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
 	tastes = list("beet" = 1)
 	foodtype = VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/soup/electron
+	name = "electron soup"
+	desc = "A gastronomic curiosity of ethereal origin. It is famed for the minature weather system formed over a properly prepared soup."
+	icon_state = "electronsoup"
+	list_reagents = list("nutriment" = 3, "liquidelectricity" = 5)
+	tastes = list("mushroom" = 1, "electrons" = 4, "shockingly good")
+	filling_color = "#CC2B52"
+	foodtype = VEGETABLES | TOXIC
+
+/obj/item/reagent_containers/food/snacks/soup/bungocurry
+	name = "bungo curry"
+	desc = "A spicy vegetable curry made with the humble bungo fruit, Exotic!"
+	icon_state = "bungocurry"
+	bonus_reagents = list("vitamin" = 11)
+	list_reagents = list("nutriment" = 6, "capsaicin" = 5)
+	tastes = list("bungo" = 2, "hot curry" = 4, "tropical sweetness" = 1)
+	filling_color = "#E6A625"
+	foodtype = VEGETABLES | FRUIT | DAIRY

code/modules/food_and_drinks/kitchen_machinery/grill.dm

@@ -0,0 +1,139 @@
+/obj/machinery/grill
+	name = "grill"
+	desc = "Just like the old days."
+	icon = 'icons/obj/kitchen.dmi'
+	icon_state = "grill_open"
+	density = TRUE
+	layer = BELOW_OBJ_LAYER
+	use_power = NO_POWER_USE
+	var/grill_fuel = 0
+	var/obj/item/reagent_containers/food/grilled_item
+	var/grill_time = 0
+	var/datum/looping_sound/grill/grill_loop
+
+/obj/machinery/grill/Initialize()
+	. = ..()
+	grill_loop = new(list(src), FALSE)
+
+/obj/machinery/grill/update_icon()
+	if(grilled_item)
+		icon_state = "grill"
+	else if(grill_fuel)
+		icon_state = "grill_on"
+	else
+		icon_state = "grill_open"
+
+/obj/machinery/grill/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/stack/sheet/mineral/coal) || istype(I, /obj/item/stack/sheet/mineral/wood))
+		var/obj/item/stack/S = I
+		var/stackamount = S.get_amount()
+		to_chat(user, "<span class='notice'>You put [stackamount] [I]s in [src].</span>")
+		if(istype(I, /obj/item/stack/sheet/mineral/coal))
+			grill_fuel += (500 * stackamount)
+		else
+			grill_fuel += (50 * stackamount)
+		S.use(stackamount)
+		update_icon()
+		return
+	if(I.resistance_flags & INDESTRUCTIBLE)
+		to_chat(user, "<span class='warning'>You don't feel it would be wise to grill [I]...</span>")
+		return ..()
+	if(istype(I, /obj/item/reagent_containers))
+		if(istype(I, /obj/item/reagent_containers/food) && !istype(I, /obj/item/reagent_containers/food/drinks))
+			if(HAS_TRAIT(I, TRAIT_NODROP) || (I.item_flags & (ABSTRACT | DROPDEL)))
+				return ..()
+			else if(!grill_fuel)
+				to_chat(user, "<span class='notice'>There is not enough fuel.</span>")
+				return
+			else if(!grilled_item && user.transferItemToLoc(I, src))
+				grilled_item = I
+				to_chat(user, "<span class='notice'>You put the [grilled_item] on [src].</span>")
+				update_icon()
+				grill_loop.start()
+				return
+		else
+			if(I.reagents.has_reagent("monkey_energy"))
+				grill_fuel += (20 * (I.reagents.get_reagent_amount("monkey_energy")))
+				to_chat(user, "<span class='notice'>You pour the Monkey Energy in [src].</span>")
+				I.reagents.remove_reagent("monkey_energy", I.reagents.get_reagent_amount("monkey_energy"))
+				update_icon()
+				return
+	..()
+
+/obj/machinery/grill/process()
+	..()
+	update_icon()
+	if(!grill_fuel)
+		return
+	else
+		grill_fuel -= 1
+		if(prob(1))
+			var/datum/effect_system/smoke_spread/bad/smoke = new
+			smoke.set_up(1, loc)
+			smoke.start()
+	if(grilled_item)
+		grill_time += 1
+		grilled_item.reagents.add_reagent("char", 1)
+		grill_fuel -= 10
+		grilled_item.AddComponent(/datum/component/sizzle)
+
+/obj/machinery/grill/Exited(atom/movable/AM)
+	if(AM == grilled_item)
+		finish_grill()
+		grilled_item = null
+	..()
+
+/obj/machinery/grill/Destroy()
+	grilled_item = null
+	. = ..()
+
+/obj/machinery/grill/handle_atom_del(atom/A)
+	if(A == grilled_item)
+		grilled_item = null
+	. = ..()
+
+/obj/machinery/grill/wrench_act(mob/living/user, obj/item/I)
+	. = ..()
+	if(default_unfasten_wrench(user, I) != CANT_UNFASTEN)
+		return TRUE
+
+/obj/machinery/grill/deconstruct(disassembled = TRUE)
+	finish_grill()
+	if(!(flags_1 & NODECONSTRUCT_1))
+		new /obj/item/stack/sheet/metal(loc, 5)
+		new /obj/item/stack/rods(loc, 5)
+	..()
+
+/obj/machinery/grill/attack_ai(mob/user)
+	return
+
+/obj/machinery/grill/attack_hand(mob/user)
+	if(grilled_item)
+		to_chat(user, "<span class='notice'>You take out [grilled_item] from [src].</span>")
+		grilled_item.forceMove(drop_location())
+		update_icon()
+		return
+	return ..()
+
+/obj/machinery/grill/proc/finish_grill()
+	switch(grill_time) //no 0-9 to prevent spam
+		if(10 to 15)
+			grilled_item.name = "lightly-grilled [grilled_item.name]"
+			grilled_item.desc = "[grilled_item.desc] It's been lightly grilled."
+		if(16 to 39)
+			grilled_item.name = "grilled [grilled_item.name]"
+			grilled_item.desc = "[grilled_item.desc] It's been grilled."
+			grilled_item.foodtype |= FRIED
+		if(40 to 50)
+			grilled_item.name = "heavily grilled [grilled_item.name]"
+			grilled_item.desc = "[grilled_item.desc] It's been heavily grilled."
+			grilled_item.foodtype |= FRIED
+		if(51 to INFINITY) //grill marks reach max alpha
+			grilled_item.name = "Powerfully Grilled [grilled_item.name]"
+			grilled_item.desc = "A [grilled_item.name]. Reminds you of your deepfryer skills, wait, no, it's better!"
+			grilled_item.foodtype |= FRIED
+	grill_time = 0
+	grill_loop.stop()
+
+/obj/machinery/grill/unwrenched
+	anchored = FALSE

code/modules/food_and_drinks/recipes/food_mixtures.dm

@@ -76,6 +76,22 @@
 	required_reagents = list("corn_starch" = 1, "sacid" = 1)
 	required_temp = 374
 
+/datum/chemical_reaction/caramel
+	name = "Caramel"
+	id = "caramel"
+	results = list("caramel" = 1)
+	required_reagents = list("sugar" = 1)
+	required_temp = 413
+	mob_react = FALSE
+
+/datum/chemical_reaction/caramel_burned
+	name = "Caramel burned"
+	id = "caramel_burned"
+	results = list("carbon" = 1)
+	required_reagents = list("caramel" = 1)
+	required_temp = 483
+	mob_react = FALSE
+
 /datum/chemical_reaction/cheesewheel
 	name = "Cheesewheel"
 	id = "cheesewheel"
@@ -161,3 +177,9 @@
 	new /obj/item/reagent_containers/food/snacks/salad/ricebowl(location)
 	if(holder && holder.my_atom)
 		qdel(holder.my_atom)
+
+/datum/chemical_reaction/bbqsauce
+	name = "BBQ Sauce"
+	id = "bbqsauce"
+	results = list("bbqsauce" = 5)
+	required_reagents = list("ash" = 1, "tomatojuice" = 1, "salglu_solution" = 3, "blackpepper" = 1)

code/modules/food_and_drinks/recipes/processor_recipes.dm

@@ -44,6 +44,10 @@
 	input = /obj/item/reagent_containers/food/snacks/grown/parsnip
 	output = /obj/item/reagent_containers/food/snacks/roastparsnip
 
+/datum/food_processor_process/tortilla
+	input = /obj/item/reagent_containers/food/snacks/tortilla
+	output = /obj/item/reagent_containers/food/snacks/cornchips
+
 /datum/food_processor_process/mob/slime
 	input = /mob/living/simple_animal/slime
 	output = null

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

@@ -76,6 +76,7 @@
 	name = "Fish burger"
 	reqs = list(
 		/obj/item/reagent_containers/food/snacks/carpmeat = 1,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
 		/obj/item/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/burger/fish
@@ -94,6 +95,7 @@
 	name = "Ghost burger"
 	reqs = list(
 		/obj/item/ectoplasm = 1,
+		/datum/reagent/consumable/sodiumchloride = 2,
 		/obj/item/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/burger/ghost
@@ -176,7 +178,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/burger/purple
 	subcategory = CAT_BURGER
-	
+
 /datum/crafting_recipe/food/blackburger
 	name = "Black burger"
 	reqs = list(
@@ -186,7 +188,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/burger/black
 	subcategory = CAT_BURGER
-	
+
 /datum/crafting_recipe/food/whiteburger
 	name = "White burger"
 	reqs = list(
@@ -218,6 +220,7 @@
 	name = "Big bite burger"
 	reqs = list(
 		/obj/item/reagent_containers/food/snacks/meat/steak/plain = 3,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 2,
 		/obj/item/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/burger/bigbite
@@ -231,7 +234,8 @@
 		/obj/item/reagent_containers/food/snacks/meat/steak/plain = 5,
 		/obj/item/reagent_containers/food/snacks/grown/tomato = 4,
 		/obj/item/reagent_containers/food/snacks/cheesewedge = 3,
-		/obj/item/reagent_containers/food/snacks/boiledegg = 2,
+		/obj/item/reagent_containers/food/snacks/boiledegg = 1,
+		/obj/item/reagent_containers/food/snacks/meat/bacon = 1,
 		/obj/item/reagent_containers/food/snacks/bun = 1
 
 	)
@@ -260,6 +264,7 @@
 	name = "Five alarm burger"
 	reqs = list(
 			/obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2,
+			/obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
 			/obj/item/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/burger/fivealarm
@@ -293,3 +298,53 @@
 
 	result = /obj/item/reagent_containers/food/snacks/burger/baconburger
 	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/cheeseburger
+	name = "Cheese Burger"
+	reqs = list(
+			/obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+			/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+			/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/cheese
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/soylentburger
+	name = "Soylent Burger"
+	reqs = list(
+			/obj/item/reagent_containers/food/snacks/soylentgreen = 1, //two full meats worth.
+			/obj/item/reagent_containers/food/snacks/cheesewedge = 2,
+			/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/soylent
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/ribburger
+	name = "McRib"
+	reqs = list(
+			/obj/item/reagent_containers/food/snacks/bbqribs = 1,     //The sauce is already included in the ribs
+			/obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome.
+			/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/rib
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/mcguffin
+	name = "McGuffin"
+	reqs = list(
+			/obj/item/reagent_containers/food/snacks/friedegg = 1,
+			/obj/item/reagent_containers/food/snacks/meat/bacon = 2,
+			/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/mcguffin
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/chickenburger
+	name = "Chicken Sandwich"
+	reqs = list(
+			/obj/item/reagent_containers/food/snacks/meat/steak/chicken = 1,
+			/datum/reagent/consumable/mayonnaise = 5,
+			/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/chicken
+	subcategory = CAT_BURGER

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

@@ -180,6 +180,17 @@
 	result = /obj/item/reagent_containers/food/snacks/store/cake/peach_cake
 	subcategory = CAT_CAKE
 
+/datum/crafting_recipe/food/trumpetcake
+	name = "Spaceman's Cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/trumpet = 2,
+		/datum/reagent/consumable/cream = 5,
+		/datum/reagent/consumable/berryjuice = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/trumpet
+	subcategory = CAT_CAKE
+
 /datum/crafting_recipe/food/cak
 	name = "Living cat/cake hybrid"
 	reqs = list(

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

@@ -1,4 +1,8 @@
 
+/////////////////
+//Misc. Frozen.//
+/////////////////
+
 /datum/crafting_recipe/food/icecreamsandwich
 	name = "Icecream sandwich"
 	reqs = list(
@@ -90,11 +94,10 @@
 
 //////////////////////////SNOW CONES///////////////////////
 
-/datum/crafting_recipe/food/flaverless_sc
-	name = "Flaverless snowcone"
+/datum/crafting_recipe/food/flavorless_sc
+	name = "Flavorless snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15
 	)
 	result = /obj/item/reagent_containers/food/snacks/snowcones
@@ -104,7 +107,6 @@
 	name = "Pineapple snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/obj/item/reagent_containers/food/snacks/pineappleslice = 2
 	)
@@ -115,7 +117,6 @@
 	name = "Lime snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/limejuice = 5
 	)
@@ -126,7 +127,6 @@
 	name = "Lemon snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/lemonjuice = 5
 	)
@@ -137,7 +137,6 @@
 	name = "Apple snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/applejuice = 5
 	)
@@ -148,9 +147,8 @@
 	name = "Grape snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/berryjuice = 5
+		/datum/reagent/consumable/grapejuice = 5
 	)
 	result = /obj/item/reagent_containers/food/snacks/snowcones/grape
 	subcategory = CAT_ICE
@@ -159,7 +157,6 @@
 	name = "Orange snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/orangejuice = 5
 	)
@@ -170,7 +167,6 @@
 	name = "Bluecherry snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/bluecherryjelly= 5
 	)
@@ -181,22 +177,20 @@
 	name = "Cherry snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/cherryjelly= 5
 	)
 	result = /obj/item/reagent_containers/food/snacks/snowcones/red
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/mix_sc
-	name = "Mixed berrie snowcone"
+/datum/crafting_recipe/food/berry_sc
+	name = "Berry snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/berryjuice = 15
+		/datum/reagent/consumable/berryjuice = 5
 	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/mix
+	result = /obj/item/reagent_containers/food/snacks/snowcones/berry
 	subcategory = CAT_ICE
 
 /datum/crafting_recipe/food/fruitsalad_sc
@@ -216,7 +210,6 @@
 	name = "Mime snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/nothing = 5
 	)
@@ -227,86 +220,57 @@
 	name = "Clown snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/clownstears = 5
+		/datum/reagent/consumable/laughter = 5
 	)
 	result = /obj/item/reagent_containers/food/snacks/snowcones/clown
 	subcategory = CAT_ICE
 
 /datum/crafting_recipe/food/soda_sc
-	name = "Soda water snowcone"
+	name = "Space Cola snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/sodawater = 15
+		/datum/reagent/consumable/space_cola = 5
 	)
 	result = /obj/item/reagent_containers/food/snacks/snowcones/soda
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/pwgrmer_sc
-	name = "Pwergamer snowcone"
+/datum/crafting_recipe/food/spacemountainwind_sc
+	name = "Space Mountain Wind snowcone"
+	reqs = list(
+		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/datum/reagent/consumable/ice = 15,
+		/datum/reagent/consumable/spacemountainwind = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind
+
+/datum/crafting_recipe/food/pwrgame_sc
+	name = "Pwrgame snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/pwr_game = 15
 	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/pwgrmer
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/kiwi_sc
-	name = "Kiwi snowcone"
-	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/obj/item/reagent_containers/food/snacks/egg/kiwiEgg = 1,
-		/datum/reagent/water  = 5,
-		/datum/reagent/consumable/ice = 15
-	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/kiwi
+	result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame
 	subcategory = CAT_ICE
 
 /datum/crafting_recipe/food/honey_sc
 	name = "Honey snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/honey = 5
 	)
 	result = /obj/item/reagent_containers/food/snacks/snowcones/honey
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/peach_sc
-	name = "Peach snowcone"
-	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
-		/datum/reagent/consumable/ice = 15,
-		/obj/item/reagent_containers/food/snacks/grown/peach = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/peach
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/strawberry_sc
-	name = "Strawberry snowcone"
-	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
-		/datum/reagent/consumable/ice = 15,
-		/obj/item/reagent_containers/food/snacks/grown/strawberry = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/strawberry
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/honey_sc
+/datum/crafting_recipe/food/rainbow_sc
 	name = "Rainbow snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/colorful_reagent = 1 //Hard to make
+		/datum/reagent/colorful_reagent = 1 //Harder to make
 	)
 	result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow
-	subcategory = CAT_ICE
+	subcategory = CAT_ICE

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

@@ -166,3 +166,25 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/salad/ricepork
 	subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/fiestaskewer
+	name = "Fiesta Skewer"
+	reqs = list(
+		/obj/item/stack/rods = 1,
+		/obj/item/reagent_containers/food/snacks/grown/chili = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+		/obj/item/reagent_containers/food/snacks/grown/corn = 1,
+		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/kebab/fiesta
+	subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/ribs
+	name = "BBQ Ribs"
+	reqs = list(
+		/datum/reagent/consumable/bbqsauce = 5,
+		/obj/item/reagent_containers/food/snacks/meat/steak/plain = 2,
+		/obj/item/stack/rods = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/bbqribs
+	subcategory = CAT_MEAT

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

@@ -1,18 +1,7 @@
-
 // see code/module/crafting/table.dm
 
 ////////////////////////////////////////////////DONUTS////////////////////////////////////////////////
 
-/datum/crafting_recipe/food/chaosdonut
-	name = "Chaos donut"
-	reqs = list(
-		/datum/reagent/consumable/frostoil = 5,
-		/datum/reagent/consumable/capsaicin = 5,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/donut/chaos
-	subcategory = CAT_PASTRY
-
 /datum/crafting_recipe/food/donut
 	time = 15
 	name = "Donut"
@@ -20,18 +9,17 @@
 		/datum/reagent/consumable/sugar = 1,
 		/obj/item/reagent_containers/food/snacks/pastrybase = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut
+	result = /obj/item/reagent_containers/food/snacks/donut/plain
 	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/donut/semen
-	time = 15
-	name = "Semen donut"
+/datum/crafting_recipe/food/donut/chaos
+	name = "Chaos donut"
 	reqs = list(
-		/datum/reagent/consumable/semen = 10,
+		/datum/reagent/consumable/frostoil = 5,
+		/datum/reagent/consumable/capsaicin = 5,
 		/obj/item/reagent_containers/food/snacks/pastrybase = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/semen
-	subcategory = CAT_PASTRY
+	result = /obj/item/reagent_containers/food/snacks/donut/chaos
 
 datum/crafting_recipe/food/donut/meat
 	time = 15
@@ -41,35 +29,232 @@ datum/crafting_recipe/food/donut/meat
 		/obj/item/reagent_containers/food/snacks/pastrybase = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/donut/meat
-	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/jellydonut
+/datum/crafting_recipe/food/donut/jelly
 	name = "Jelly donut"
 	reqs = list(
 		/datum/reagent/consumable/berryjuice = 5,
 		/obj/item/reagent_containers/food/snacks/pastrybase = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/jelly
-	subcategory = CAT_PASTRY
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/plain
 
-/datum/crafting_recipe/food/cherryjellydonut
-	name = "Cherry jelly donut"
-	reqs = list(
-		/datum/reagent/consumable/cherryjelly = 5,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/slimejellydonut
+/datum/crafting_recipe/food/donut/slimejelly
 	name = "Slime jelly donut"
 	reqs = list(
 		/datum/reagent/toxin/slimejelly = 5,
 		/obj/item/reagent_containers/food/snacks/pastrybase = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain
+
+/datum/crafting_recipe/food/donut/glaze
+	time = 15
+	name = "glaze donut"
+	reqs = list(
+				/datum/reagent/consumable/sugar = 10,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/glaze
 	subcategory = CAT_PASTRY
 
+/datum/crafting_recipe/food/donut/berry
+	name = "Berry Donut"
+	reqs = list(
+		/datum/reagent/consumable/berryjuice = 3,
+		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/berry
+
+/datum/crafting_recipe/food/donut/trumpet
+	name = "Spaceman's Donut"
+	reqs = list(
+		/datum/reagent/medicine/polypyr = 3,
+		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+	)
+
+	result = /obj/item/reagent_containers/food/snacks/donut/trumpet
+
+/datum/crafting_recipe/food/donut/apple
+	name = "Apple Donut"
+	reqs = list(
+		/datum/reagent/consumable/applejuice = 3,
+		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/apple
+
+/datum/crafting_recipe/food/donut/caramel
+	name = "Caramel Donut"
+	reqs = list(
+		/datum/reagent/consumable/caramel = 3,
+		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/caramel
+
+/datum/crafting_recipe/food/donut/choco
+	name = "Chocolate Donut"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/choco
+
+/datum/crafting_recipe/food/donut/blumpkin
+	name = "Blumpkin Donut"
+	reqs = list(
+		/datum/reagent/consumable/blumpkinjuice = 3,
+		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/blumpkin
+
+/datum/crafting_recipe/food/donut/bungo
+	name = "Bungo Donut"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/bungo
+
+/datum/crafting_recipe/food/donut/matcha
+	name = "Matcha Donut"
+	reqs = list(
+		/datum/reagent/toxin/teapowder = 3,
+		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/matcha
+
+////////////////////////////////////////////////////JELLY DONUTS///////////////////////////////////////////////////////
+
+/datum/crafting_recipe/food/donut/jelly/berry
+	name = "Berry Jelly Donut"
+	reqs = list(
+		/datum/reagent/consumable/berryjuice = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/berry
+
+/datum/crafting_recipe/food/donut/jelly/trumpet
+	name = "Spaceman's Jelly Donut"
+	reqs = list(
+		/datum/reagent/medicine/polypyr = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+	)
+
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet
+
+/datum/crafting_recipe/food/donut/jelly/apple
+	name = "Apple Jelly Donut"
+	reqs = list(
+		/datum/reagent/consumable/applejuice = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/apple
+
+/datum/crafting_recipe/food/donut/jelly/caramel
+	name = "Caramel Jelly Donut"
+	reqs = list(
+		/datum/reagent/consumable/caramel = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/caramel
+
+/datum/crafting_recipe/food/donut/jelly/choco
+	name = "Chocolate Jelly Donut"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/choco
+
+/datum/crafting_recipe/food/donut/jelly/blumpkin
+	name = "Blumpkin Jelly Donut"
+	reqs = list(
+		/datum/reagent/consumable/blumpkinjuice = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin
+
+/datum/crafting_recipe/food/donut/jelly/bungo
+	name = "Bungo Jelly Donut"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/bungo
+
+/datum/crafting_recipe/food/donut/jelly/matcha
+	name = "Matcha Jelly Donut"
+	reqs = list(
+		/datum/reagent/toxin/teapowder = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/matcha
+
+////////////////////////////////////////////////////SLIME  DONUTS///////////////////////////////////////////////////////
+
+/datum/crafting_recipe/food/donut/slimejelly/berry
+	name = "Berry Slime Donut"
+	reqs = list(
+		/datum/reagent/consumable/berryjuice = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry
+
+/datum/crafting_recipe/food/donut/slimejelly/trumpet
+	name = "Spaceman's Slime Donut"
+	reqs = list(
+		/datum/reagent/medicine/polypyr = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
+	)
+
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet
+
+/datum/crafting_recipe/food/donut/slimejelly/apple
+	name = "Apple Slime Donut"
+	reqs = list(
+		/datum/reagent/consumable/applejuice = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple
+
+/datum/crafting_recipe/food/donut/slimejelly/caramel
+	name = "Caramel Slime Donut"
+	reqs = list(
+		/datum/reagent/consumable/caramel = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/caramel
+
+/datum/crafting_recipe/food/donut/slimejelly/choco
+	name = "Chocolate Slime Donut"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco
+
+/datum/crafting_recipe/food/donut/slimejelly/blumpkin
+	name = "Blumpkin Slime Donut"
+	reqs = list(
+		/datum/reagent/consumable/blumpkinjuice = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin
+
+/datum/crafting_recipe/food/donut/slimejelly/bungo
+	name = "Bungo Slime Donut"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo
+
+/datum/crafting_recipe/food/donut/slimejelly/matcha
+	name = "Matcha Slime Donut"
+	reqs = list(
+		/datum/reagent/toxin/teapowder = 3,
+		/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha
+
 ////////////////////////////////////////////////WAFFLES AND PANCAKES////////////////////////////////////////////////
 
 /datum/crafting_recipe/food/waffles
@@ -341,4 +526,4 @@ datum/crafting_recipe/food/donut/meat
 		/datum/reagent/consumable/honey = 5
 	)
 	result = /obj/item/reagent_containers/food/snacks/honeybun
-	subcategory = CAT_PASTRY
+	subcategory = CAT_PASTRY

code/modules/mob/living/carbon/carbon_defense.dm

@@ -279,6 +279,12 @@
 			M.visible_message("<span class='notice'>[M] shakes [src] trying to get [p_them()] up!</span>", \
 							"<span class='notice'>You shake [src] trying to get [p_them()] up!</span>")
 
+		else if(check_zone(M.zone_selected) == "mouth") // I ADDED BOOP-EH-DEH-NOSEH - Jon
+			M.visible_message( \
+				"<span class='notice'>[M] boops [src]'s nose.</span>", \
+				"<span class='notice'>You boop [src] on the nose.</span>", )
+			playsound(src, 'sound/items/Nose_boop.ogg', 50, 0)
+
 		else if(check_zone(M.zone_selected) == "head")
 			var/mob/living/carbon/human/H = src
 			var/datum/species/pref_species = H.dna.species
@@ -322,12 +328,6 @@
 				"<span class='notice'>[M] shakes [src]'s hand.</span>", \
 				"<span class='notice'>You shake [src]'s hand.</span>", )
 
-		else if(check_zone(M.zone_selected) == "mouth") // I ADDED BOOP-EH-DEH-NOSEH - Jon
-			M.visible_message( \
-				"<span class='notice'>[M] boops [src]'s nose.</span>", \
-				"<span class='notice'>You boop [src] on the nose.</span>", )
-			playsound(src, 'sound/items/Nose_boop.ogg', 50, 0)
-
 		else
 			M.visible_message("<span class='notice'>[M] hugs [src] to make [p_them()] feel better!</span>", \
 						"<span class='notice'>You hug [src] to make [p_them()] feel better!</span>")

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -286,8 +286,8 @@
 	if(health < maxHealth)
 		adjustBruteLoss(-8) //Fast life regen
 	for(var/obj/item/reagent_containers/food/snacks/donut/D in range(1, src)) //Frosts nearby donuts!
-		if(!D.is_frosted)
-			D.frost_donut()
+		if(!D.is_decorated)
+			D.decorate_donut()
 
 /mob/living/simple_animal/pet/cat/cak/attack_hand(mob/living/L)
 	..()

code/modules/mob/living/simple_animal/friendly/farm_animals.dm

@@ -197,7 +197,7 @@
 	density = FALSE
 	speak_chance = 2
 	turns_per_move = 2
-	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/chicken = 1)
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
@@ -246,7 +246,7 @@
 	density = FALSE
 	speak_chance = 2
 	turns_per_move = 3
-	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/chicken = 2)
 	var/egg_type = /obj/item/reagent_containers/food/snacks/egg
 	var/food_type = /obj/item/reagent_containers/food/snacks/grown/wheat
 	response_help  = "pets"

code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

@@ -201,7 +201,7 @@
 		mother.children_list -= src
 	visible_message("<span class='warning'>[src] explodes!</span>")
 	explosion(get_turf(loc),0,0,0,flame_range = 3, adminlog = FALSE)
-	gib()
+	qdel()
 
 //Tentacles have less stun time compared to regular variant, to balance being able to use them much more often.  Also, 10 more damage.
 /obj/effect/temp_visual/goliath_tentacle/broodmother/trip()

code/modules/mob/mob.dm

@@ -566,9 +566,9 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 /mob/proc/is_muzzled()
 	return 0
 
-/mob/Stat()
-	..()
-
+/mob/Stat(delayoverride)
+	. = ..()
+	var/statdelay = delayoverride || 10
 	if(statpanel("Status"))
 		if (client)
 			stat(null, "Ping: [round(client.lastping, 1)]ms (Average: [round(client.avgping, 1)]ms)")
@@ -576,7 +576,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 		var/datum/map_config/cached = SSmapping.next_map_config
 		if(cached)
 			stat(null, "Next Map: [cached.map_name]")
-		stat(null, "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]")
+		stat(null, "Round ID: [GLOB.round_id || "NULL"]")
 		stat(null, "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]")
 		stat(null, "Round Time: [WORLDTIME2TEXT("hh:mm:ss")]")
 		stat(null, "Station Time: [STATION_TIME_TIMESTAMP("hh:mm:ss")]")
@@ -586,8 +586,9 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 			if(ETA)
 				stat(null, "[ETA] [SSshuttle.emergency.getTimerStr()]")
 
-	if(client && client.holder)
+	if(client?.holder)
 		if(statpanel("MC"))
+			statdelay = 0		//It's assumed that if you're doing this you are doing debug stuff, don't do ioditic things.
 			var/turf/T = get_turf(client.eye)
 			stat("Location:", COORD(T))
 			stat("CPU:", "[world.cpu]")
@@ -613,6 +614,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 			GLOB.ahelp_tickets.stat_entry()
 		if(length(GLOB.sdql2_queries))
 			if(statpanel("SDQL2"))
+				statdelay = 0		//It's assumed that if you're doing this you are doing debug stuff, don't do ioditic things.
 				stat("Access Global SDQL2 List", GLOB.sdql2_vv_statobj)
 				for(var/i in GLOB.sdql2_queries)
 					var/datum/SDQL2_query/Q = i
@@ -636,14 +638,13 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 				if(A.IsObscured())
 					continue
 				statpanel(listed_turf.name, null, A)
-
-
 	if(mind)
 		add_spells_to_statpanel(mind.spell_list)
 		var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
 		if(changeling)
 			add_stings_to_statpanel(changeling.purchasedpowers)
 	add_spells_to_statpanel(mob_spell_list)
+	sleep(statdelay)
 
 /mob/proc/add_spells_to_statpanel(list/spells)
 	for(var/obj/effect/proc_holder/spell/S in spells)
@@ -976,4 +977,4 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 
 /mob/setMovetype(newval)
 	. = ..()
-	update_movespeed(FALSE)
+	update_movespeed(FALSE)

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

@@ -951,3 +951,21 @@
 		to_chat(M, "<span class = 'notice'>[pick("Headpats feel nice.", "Backrubs would be nice.", "Mew")]</span>")
 	M.adjustArousalLoss(5)
 	..()
+
+/datum/reagent/consumable/monkey_energy
+	name = "Monkey Energy"
+	id = "monkey_energy"
+	description = "The only drink that will make you unleash the ape."
+	color = "#f39b03" // rgb: 243, 155, 3
+	taste_description = "barbecue and nostalgia"
+	glass_icon_state = "monkey_energy_glass"
+	glass_name = "glass of Monkey Energy"
+	glass_desc = "You can unleash the ape, but without the pop of the can?"
+
+/datum/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/M)
+	M.Jitter(20)
+	M.dizziness +=1
+	M.drowsyness = 0
+	M.AdjustSleeping(-40, FALSE)
+	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
+	..()

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -799,6 +799,16 @@
 	..()
 	. = TRUE
 
+/datum/reagent/consumable/caramel
+	name = "Caramel"
+	id = "caramel"
+	description = "Who would have guessed that heated sugar could be so delicious?"
+	nutriment_factor = 10 * REAGENTS_METABOLISM
+	color = "#D98736"
+	taste_mult = 2
+	taste_description = "caramel"
+	reagent_state = SOLID
+
 /datum/reagent/consumable/secretsauce
 	name = "secret sauce"
 	id = "secret_sauce"
@@ -810,3 +820,27 @@
 	taste_mult = 100
 	can_synth = FALSE
 	pH = 6.1
+
+/datum/reagent/consumable/char
+	name = "Char"
+	id = "char"
+	description = "Essence of the grill. Has strange properties when overdosed."
+	reagent_state = LIQUID
+	nutriment_factor = 5 * REAGENTS_METABOLISM
+	color = "#C8C8C8"
+	taste_mult = 6
+	taste_description = "smoke"
+	overdose_threshold = 25
+
+/datum/reagent/consumable/char/overdose_process(mob/living/carbon/M)
+	if(prob(10))
+		M.say(pick("I hate my grill.", "I just want to grill something right for once...", "I wish I could just go on my lawnmower and cut the grass.", "Yep, Tetris. That was a good game..."))
+
+/datum/reagent/consumable/bbqsauce
+	name = "BBQ Sauce"
+	id = "bbqsauce"
+	description = "Sweet, Smokey, Savory, and gets everywhere. Perfect for Grilling."
+	nutriment_factor = 5 * REAGENTS_METABOLISM
+	color = "#78280A" // rgb: 120 40, 10
+	taste_mult = 2.5 //sugar's 1.5, capsacin's 1.5, so a good middle ground.
+	taste_description = "smokey sweetness"

code/modules/shuttle/supply.dm

@@ -28,6 +28,11 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
 		/obj/item/hilbertshotel
 	)))
 
+GLOBAL_LIST_INIT(cargo_shuttle_leave_behind_typecache, typecacheof(list(
+	/mob/living/simple_animal/revenant,
+	/mob/living/simple_animal/slaughter
+	)))
+
 /obj/docking_port/mobile/supply
 	name = "supply shuttle"
 	id = "supply"
@@ -50,16 +55,27 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
 
 /obj/docking_port/mobile/supply/canMove()
 	if(is_station_level(z))
-		return check_blacklist(shuttle_areas)
+		return check_blacklist(shuttle_areas, GLOB.blacklisted_cargo_types - GLOB.cargo_shuttle_leave_behind_typecache)
 	return ..()
 
-/obj/docking_port/mobile/supply/proc/check_blacklist(areaInstances)
+/obj/docking_port/mobile/supply/enterTransit()
+	var/list/leave_behind = list()
+	for(var/i in check_blacklist(shuttle_areas, GLOB.cargo_shuttle_leave_behind_typecache))
+		var/atom/movable/AM = i
+		leave_behind[AM] = AM.loc
+	. = ..()
+	for(var/kicked in leave_behind)
+		var/atom/movable/victim = kicked
+		var/atom/oldloc = leave_behind[victim]
+		victim.forceMove(oldloc)
+
+/obj/docking_port/mobile/supply/proc/check_blacklist(areaInstances, list/typecache)
 	for(var/place in areaInstances)
 		var/area/shuttle/shuttle_area = place
 		for(var/trf in shuttle_area)
 			var/turf/T = trf
 			for(var/a in T.GetAllContents())
-				if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types))
+				if(is_type_in_typecache(a, typecache))
 					return FALSE
 				if(istype(a, /obj/structure/closet))//Prevents eigenlockers from ending up at CC
 					var/obj/structure/closet/c = a

code/modules/vending/cola.dm

@@ -17,7 +17,8 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6)
 	premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,
 					/obj/item/reagent_containers/food/drinks/soda_cans/air = 1,
-					/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1)
+					/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1,
+					/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 1)
 	refill_canister = /obj/item/vending_refill/cola
 
 /obj/item/vending_refill/cola

config/game_options.txt

@@ -574,3 +574,8 @@ MONKEYCAP 64
 
 #Replaces standard extended/secret dichotomy with extended and calm/chaotic votes for dynamic.
 DYNAMIC_VOTING
+
+## Choose which Engine to start the round with, comment to remove an Engine from the rotation
+BOX_RANDOM_ENGINE Engine SM
+BOX_RANDOM_ENGINE Engine Tesla
+BOX_RANDOM_ENGINE Engine Singulo

html/changelogs/AutoChangeLog-pr-10093.yml

@@ -0,0 +1,15 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - rscadd: "ports all the new donuts, burgars, and chicken stuff from RG"
+  - rscadd: "ports new snowcone"
+  - rscadd: "ports grill"
+  - rscadd: "ports beakfeast tag/mood lit as TG has it"
+  - rscadd: "ports all the amazing new sprites"
+  - tweak: "ports crafting for many things like snowcones needing water"
+  - balance: "ports of many craftings"
+  - soundadd: "lowers fryers sound"
+  - imageadd: "ported icons for new food/grill"
+  - imagedel: "ports the deletion of some icons and images"
+  - spellcheck: "ports a spell check for the snowcones"
+  - code_imp: "ports fixes for stuff I didnt know were even broken with snowcones"

html/changelogs/AutoChangeLog-pr-10210.yml

@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - rscadd: "Cargo shuttle now silently ignores slaughter demons/revenants instead of being blocked even while they are jaunted. A drawback is that manifested ones can't block it either, any more."

html/changelogs/AutoChangeLog-pr-10218.yml

@@ -0,0 +1,4 @@
+author: "GrayRachnid"
+delete-after: True
+changes: 
+  - bugfix: "fixes consistency"

html/changelogs/AutoChangeLog-pr-10245.yml

@@ -0,0 +1,5 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Added submaps for the SM, Tesla and Singulo"
+  - rscadd: "Added a placeholder on Boxstation for the Engines"

html/changelogs/AutoChangeLog-pr-10246.yml

@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - tweak: "Stat() slowed down for anti-lag measures."

html/changelogs/AutoChangeLog-pr-10254.yml

@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - bugfix: "fixed Nose boops not triggering"

html/changelogs/AutoChangeLog-pr-10274.yml

@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes: 
+  - bugfix: "broodmother baby lag"

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -458,3 +458,33 @@ datum/gear/darksabresheath
 	category = SLOT_NECK
 	path = /obj/item/clothing/neck/necklace/onion
 	ckeywhitelist = list("cdrcross")
+
+/datum/gear/mikubikini
+	name = "starlight singer bikini"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/mikubikini
+	ckeywhitelist = list("grandvegeta")
+
+/datum/gear/mikujacket
+	name = "starlight singer jacket"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/mikujacket
+	ckeywhitelist = list("grandvegeta")
+
+/datum/gear/mikuhair
+	name = "starlight singer hair"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/head/mikuhair
+	ckeywhitelist = list("grandvegeta")
+
+/datum/gear/mikugloves
+	name = "starlight singer gloves"
+	category = SLOT_GLOVES
+	path = /obj/item/clothing/gloves/mikugloves
+	ckeywhitelist = list("grandvegeta")
+
+/datum/gear/mikuleggings
+	name = "starlight singer leggings"
+	category = SLOT_SHOES
+	path = /obj/item/clothing/shoes/sneakers/mikuleggings
+	ckeywhitelist = list("grandvegeta")

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -510,3 +510,49 @@
 	icon_state = "onion"
 	item_state = "onion"
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+
+/obj/item/clothing/under/mikubikini
+	name = "starlight singer bikini"
+	desc = " "
+	icon_state = "mikubikini"
+	item_state = "mikubikini"
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/suit/mikujacket
+	name = "starlight singer jacket"
+	desc = " "
+	icon_state = "mikujacket"
+	item_state = "mikujacket"
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/head/mikuhair
+	name = "starlight singer hair"
+	desc = " "
+	icon_state = "mikuhair"
+	item_state = "mikuhair"
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	flags_inv = HIDEHAIR
+
+/obj/item/clothing/gloves/mikugloves
+	name = "starlight singer gloves"
+	desc = " "
+	icon_state = "mikugloves"
+	item_state = "mikugloves"
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/shoes/sneakers/mikuleggings
+	name = "starlight singer leggings"
+	desc = " "
+	icon_state = "mikuleggings"
+	item_state = "mikuleggings"
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION

tgstation.dme

@@ -385,6 +385,7 @@
 #include "code\datums\components\rotation.dm"
 #include "code\datums\components\shrapnel.dm"
 #include "code\datums\components\shrink.dm"
+#include "code\datums\components\sizzle.dm"
 #include "code\datums\components\slippery.dm"
 #include "code\datums\components\spooky.dm"
 #include "code\datums\components\squeak.dm"
@@ -500,6 +501,7 @@
 #include "code\datums\mutations\telekinesis.dm"
 #include "code\datums\ruins\lavaland.dm"
 #include "code\datums\ruins\space.dm"
+#include "code\datums\ruins\station.dm"
 #include "code\datums\status_effects\buffs.dm"
 #include "code\datums\status_effects\debuffs.dm"
 #include "code\datums\status_effects\gas.dm"
@@ -1789,6 +1791,7 @@
 #include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm"
+#include "code\modules\food_and_drinks\kitchen_machinery\grill.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\microwave.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\monkeyrecycler.dm"