Merge branch 'master' into SpaceRuins

_maps/map_files/BoxStation/BoxStation.dmm

@@ -31389,6 +31389,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "bzg" = (
@@ -55013,6 +55014,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
+"jUN" = (
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/sleeper)
 "jVl" = (
 /obj/structure/cable{
 	icon_state = "4-8"

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -86375,6 +86375,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/white,
 /area/medical/storage)
 "cPF" = (
@@ -127461,6 +127462,22 @@
 /obj/machinery/light/small,
 /turf/open/floor/plasteel,
 /area/security/prison)
+"vEq" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/storage)
 "wei" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
@@ -174855,7 +174872,7 @@ cAm
 cKO
 cMm
 cNO
-cPF
+vEq
 cRi
 cSV
 cUN

_maps/map_files/MetaStation/MetaStation.dmm

@@ -52211,6 +52211,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/white,
 /area/medical/storage)
 "bZZ" = (
@@ -54651,6 +54652,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 4
 	},
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/white,
 /area/medical/storage)
 "cez" = (

_maps/map_files/Mining/Lavaland.dmm

@@ -2034,6 +2034,13 @@
 /obj/structure/stone_tile,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
+"DQ" = (
+/obj/structure/stone_tile{
+	dir = 4
+	},
+/obj/item/book/granter/crafting_recipe/bone_bow,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/ash_walkers)
 "Ef" = (
 /obj/structure/stone_tile/block/cracked,
 /turf/open/lava/smooth{
@@ -2401,6 +2408,7 @@
 	},
 /obj/structure/table/wood,
 /obj/item/kitchen/knife/combat/bone,
+/obj/item/book/granter/crafting_recipe/bone_bow,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "TN" = (
@@ -2507,6 +2515,11 @@
 /obj/structure/stone_tile/surrounding_tile/cracked,
 /turf/closed/mineral/volcanic/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
+"WA" = (
+/obj/structure/stone_tile/block/cracked,
+/obj/item/book/granter/crafting_recipe/bone_bow,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/ash_walkers)
 "WL" = (
 /obj/structure/stone_tile{
 	dir = 4
@@ -57415,7 +57428,7 @@ Ds
 Ds
 KV
 nI
-Ad
+DQ
 Si
 aa
 ab
@@ -57915,7 +57928,7 @@ aa
 aa
 Rk
 Si
-sR
+WA
 rz
 qh
 pq

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -57031,6 +57031,10 @@
 	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
+"naS" = (
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
 "ncm" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
@@ -61095,6 +61099,13 @@
 	},
 /turf/open/floor/wood,
 /area/lawoffice)
+"wtE" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
 "wun" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -88795,7 +88806,7 @@ bzQ
 ioj
 bsA
 bEw
-bkh
+naS
 bkh
 bId
 bFO
@@ -89566,7 +89577,7 @@ bBc
 bCm
 bDr
 bEz
-bnF
+wtE
 buh
 bIg
 bjc

code/__DEFINES/construction.dm

@@ -79,17 +79,19 @@
 #define CAT_BREAD	"Breads"
 #define CAT_BURGER	"Burgers"
 #define CAT_CAKE	"Cakes"
+#define CAT_DONUT	"Donuts"
 #define CAT_EGG	"Egg-Based Food"
 #define CAT_MEAT	"Meats"
+#define CAT_MEXICAN	"Mexican"
 #define CAT_MISCFOOD	"Misc. Food"
 #define CAT_PASTRY	"Pastries"
-#define CAT_PIE	"Pies"
+#define CAT_PIE	"Pies & Sweets"
 #define CAT_PIZZA	"Pizzas"
 #define CAT_SALAD	"Salads"
+#define CAT_SEAFOOD    "Seafood"
 #define CAT_SANDWICH	"Sandwiches"
 #define CAT_SOUP	"Soups"
 #define CAT_SPAGHETTI	"Spaghettis"
-#define CAT_FISH	"Fish"
 #define CAT_ICE	"Frozen"
 
 #define RCD_FLOORWALL 1

code/__DEFINES/jobs.dm

@@ -23,6 +23,7 @@
 #define DOCTOR			(1<<4)
 #define GENETICIST		(1<<5)
 #define VIROLOGIST		(1<<6)
+#define PARAMEDIC		(1<<7)
 
 
 #define CIVILIAN		(1<<2)
@@ -58,32 +59,33 @@
 #define JOB_DISPLAY_ORDER_ASSISTANT 1
 #define JOB_DISPLAY_ORDER_CAPTAIN 2
 #define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 3
-#define JOB_DISPLAY_ORDER_BARTENDER 4
-#define JOB_DISPLAY_ORDER_COOK 5
-#define JOB_DISPLAY_ORDER_BOTANIST 6
-#define JOB_DISPLAY_ORDER_JANITOR 7
-#define JOB_DISPLAY_ORDER_CLOWN 8
-#define JOB_DISPLAY_ORDER_MIME 9
-#define JOB_DISPLAY_ORDER_CURATOR 10
-#define JOB_DISPLAY_ORDER_LAWYER 11
-#define JOB_DISPLAY_ORDER_CHAPLAIN 12
-#define JOB_DISPLAY_ORDER_QUARTERMASTER 13
-#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 14
-#define JOB_DISPLAY_ORDER_SHAFT_MINER 15
-#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 16
-#define JOB_DISPLAY_ORDER_STATION_ENGINEER 17
-#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 18
-#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 19
-#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 20
-#define JOB_DISPLAY_ORDER_CHEMIST 21
-#define JOB_DISPLAY_ORDER_GENETICIST 22
-#define JOB_DISPLAY_ORDER_VIROLOGIST 23
-#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 24
-#define JOB_DISPLAY_ORDER_SCIENTIST 25
-#define JOB_DISPLAY_ORDER_ROBOTICIST 26
-#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 27
-#define JOB_DISPLAY_ORDER_WARDEN 28
-#define JOB_DISPLAY_ORDER_DETECTIVE 29
-#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 30
-#define JOB_DISPLAY_ORDER_AI 31
-#define JOB_DISPLAY_ORDER_CYBORG 32
+#define JOB_DISPLAY_ORDER_QUARTERMASTER 4
+#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 5
+#define JOB_DISPLAY_ORDER_SHAFT_MINER 6
+#define JOB_DISPLAY_ORDER_BARTENDER 7
+#define JOB_DISPLAY_ORDER_COOK 8
+#define JOB_DISPLAY_ORDER_BOTANIST 9
+#define JOB_DISPLAY_ORDER_JANITOR 10
+#define JOB_DISPLAY_ORDER_CLOWN 11
+#define JOB_DISPLAY_ORDER_MIME 12
+#define JOB_DISPLAY_ORDER_CURATOR 13
+#define JOB_DISPLAY_ORDER_LAWYER 14
+#define JOB_DISPLAY_ORDER_CHAPLAIN 15
+#define JOB_DISPLAY_ORDER_AI 16
+#define JOB_DISPLAY_ORDER_CYBORG 17
+#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 18
+#define JOB_DISPLAY_ORDER_STATION_ENGINEER 19
+#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 20
+#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 21
+#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 22
+#define JOB_DISPLAY_ORDER_PARAMEDIC 23
+#define JOB_DISPLAY_ORDER_CHEMIST 24
+#define JOB_DISPLAY_ORDER_VIROLOGIST 25
+#define JOB_DISPLAY_ORDER_GENETICIST 26
+#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27
+#define JOB_DISPLAY_ORDER_SCIENTIST 28
+#define JOB_DISPLAY_ORDER_ROBOTICIST 29
+#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30
+#define JOB_DISPLAY_ORDER_WARDEN 31
+#define JOB_DISPLAY_ORDER_DETECTIVE 32
+#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33

code/controllers/configuration/entries/game_options.dm

@@ -408,10 +408,6 @@
 	lowercase = FALSE
 	splitter = ","
 
-/datum/config_entry/number/auto_transfer_delay
-	config_entry_value = 72000
-	min_val = 0
-
 /datum/config_entry/flag/pai_custom_holoforms
 
 /datum/config_entry/number/marauder_delay_non_reebe

code/controllers/configuration/entries/general.dm

@@ -82,6 +82,18 @@
 	config_entry_value = 600
 	min_val = 0
 
+/datum/config_entry/number/vote_autotransfer_initial //length of time before the first autotransfer vote is called (deciseconds, default 2 hours)
+	config_entry_value = 72000
+	min_val = 0
+
+/datum/config_entry/number/vote_autotransfer_interval //length of time to wait before subsequent autotransfer votes (deciseconds, default 30 minutes)
+	config_entry_value = 18000
+	min_val = 0
+
+/datum/config_entry/number/vote_autotransfer_maximum // maximum extensions until the round autoends
+	config_entry_value = 4
+	min_val = 0
+
 /datum/config_entry/flag/default_no_vote	// vote does not default to nochange/norestart
 
 /datum/config_entry/flag/no_dead_vote	// dead people can't vote

code/controllers/subsystem/autotransfer.dm

@@ -0,0 +1,27 @@
+SUBSYSTEM_DEF(autotransfer)
+	name = "Autotransfer Vote"
+	flags = SS_KEEP_TIMING | SS_BACKGROUND
+	wait = 1 MINUTES
+
+	var/starttime
+	var/targettime
+	var/voteinterval
+	var/maxvotes
+	var/curvotes
+
+/datum/controller/subsystem/autotransfer/Initialize(timeofday)
+	starttime = world.time
+	targettime = starttime + CONFIG_GET(number/vote_autotransfer_initial)
+	voteinterval = CONFIG_GET(number/vote_autotransfer_interval)
+	maxvotes = CONFIG_GET(number/vote_autotransfer_maximum)
+	curvotes = 0
+	return ..()
+
+/datum/controller/subsystem/autotransfer/fire()
+	if(maxvotes > curvotes)
+		if(world.time > targettime)
+			SSvote.initiate_vote("transfer",null) //TODO figure out how to not use null as the user
+			targettime = targettime + voteinterval
+			curvotes += 1
+	else
+		SSshuttle.autoEnd()

code/controllers/subsystem/shuttle.dm

@@ -55,7 +55,8 @@ SUBSYSTEM_DEF(shuttle)
 
 	var/lockdown = FALSE	//disallow transit after nuke goes off
 
-	var/auto_call = 72000 //CIT CHANGE - time before in deciseconds in which the shuttle is auto called. Default is 2ish hours plus 15 for the shuttle. So total is 3.
+	var/endvote_passed = FALSE
+
 	var/realtimeofstart = 0
 
 /datum/controller/subsystem/shuttle/Initialize(timeofday)
@@ -78,7 +79,6 @@ SUBSYSTEM_DEF(shuttle)
 	if(!supply)
 		WARNING("No /obj/docking_port/mobile/supply placed on the map!")
 	realtimeofstart = world.realtime
-	auto_call = CONFIG_GET(number/auto_transfer_delay)
 	return ..()
 
 /datum/controller/subsystem/shuttle/proc/initial_load()
@@ -643,10 +643,11 @@ SUBSYSTEM_DEF(shuttle)
 
 	QDEL_LIST(remove_images)
 
-/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 2 hours have passed.
-	if((world.realtime - SSshuttle.realtimeofstart) > auto_call && EMERGENCY_IDLE_OR_RECALLED) //2 hours
+/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end without being a proper shuttle call?
+	if(EMERGENCY_IDLE_OR_RECALLED)
 		SSshuttle.emergency.request(silent = TRUE)
 		priority_announce("The shift has come to an end and the shuttle called. [seclevel2num(get_security_level()) == SEC_LEVEL_RED ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [emergency.timeLeft(600)] minutes.", null, "shuttlecalled", "Priority")
-		log_game("Round time limit reached. Shuttle has been auto-called.")
-		message_admins("Round time limit reached. Shuttle called.")
-		emergencyNoRecall = TRUE
+		log_game("Round end vote passed. Shuttle has been auto-called.")
+		message_admins("Round end vote passed. Shuttle has been auto-called.")
+	emergencyNoRecall = TRUE
+	endvote_passed = TRUE

code/controllers/subsystem/ticker.dm

@@ -213,7 +213,7 @@ SUBSYSTEM_DEF(ticker)
 			check_queue()
 			check_maprotate()
 			scripture_states = scripture_unlock_alert(scripture_states)
-			SSshuttle.autoEnd()
+			//SSshuttle.autoEnd()
 
 			if(!roundend_check_paused && mode.check_finished(force_ending) || force_ending)
 				current_state = GAME_STATE_FINISHED

code/controllers/subsystem/vote.dm

@@ -89,6 +89,20 @@ SUBSYSTEM_DEF(vote)
 					choices[GLOB.master_mode] += non_voters.len
 					if(choices[GLOB.master_mode] >= greatest_votes)
 						greatest_votes = choices[GLOB.master_mode]
+			else if(mode == "transfer") // austation begin -- Crew autotransfer vote
+				var/factor = 1
+				switch(world.time / (1 MINUTES))
+					if(0 to 60)
+						factor = 0.5
+					if(61 to 120)
+						factor = 0.8
+					if(121 to 240)
+						factor = 1
+					if(241 to 300)
+						factor = 1.2
+					else
+						factor = 1.4
+				choices["Initiate Crew Transfer"] += round(non_voters.len * factor) // austation end
 	//get all options with that many votes and return them in a list
 	. = list()
 	if(greatest_votes)
@@ -365,6 +379,12 @@ SUBSYSTEM_DEF(vote)
 				log_admin("The map has been voted for and will change to: [VM.map_name]")
 				if(SSmapping.changemap(config.maplist[.]))
 					to_chat(world, "<span class='boldannounce'>The map vote has chosen [VM.map_name] for next round!</span>")
+			if("transfer") // austation begin -- Crew autotransfer vote
+				if(. == "Initiate Crew Transfer")
+					SSshuttle.autoEnd()
+					var/obj/machinery/computer/communications/C = locate() in GLOB.machines
+					if(C)
+						C.post_status("shuttle") // austation end
 	if(restart)
 		var/active_admins = 0
 		for(var/client/C in GLOB.admins)
@@ -444,6 +464,7 @@ SUBSYSTEM_DEF(vote)
 				to_chat(usr, "<span class='warning'>A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!</span>")
 				return 0
 
+		SEND_SOUND(world, sound('sound/misc/notice2.ogg'))
 		reset()
 		obfuscated = hideresults //CIT CHANGE - adds obfuscated votes
 		switch(vote_type)
@@ -465,6 +486,8 @@ SUBSYSTEM_DEF(vote)
 					if(targetmap.max_round_search_span && count_occurences_of_value(lastmaps, M, targetmap.max_round_search_span) >= targetmap.max_rounds_played)
 						continue
 					choices |= M
+			if("transfer") // austation begin -- Crew autotranfer vote
+				choices.Add("Initiate Crew Transfer","Continue Playing") // austation end
 			if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote
 				choices.Add("secret", "extended")
 			if("mode tiers")
@@ -496,7 +519,7 @@ SUBSYSTEM_DEF(vote)
 			else
 				return 0
 		mode = vote_type
-		initiator = initiator_key
+		initiator = initiator_key ? initiator_key : "the Server" // austation -- Crew autotransfer vote
 		started_time = world.time
 		var/text = "[capitalize(mode)] vote started by [initiator]."
 		if(mode == "custom")

code/datums/action.dm

@@ -301,10 +301,7 @@
 /datum/action/item_action/synthswitch/Trigger()
 	if(istype(target, /obj/item/instrument/piano_synth))
 		var/obj/item/instrument/piano_synth/synth = target
-		var/chosen = input("Choose the type of instrument you want to use", "Instrument Selection", "piano") as null|anything in synth.insTypes
-		if(!synth.insTypes[chosen])
-			return
-		return synth.changeInstrument(chosen)
+		return synth.selectInstrument()
 	return ..()
 
 /datum/action/item_action/vortex_recall
@@ -827,4 +824,4 @@
 	for(var/datum/action/A in M.actions)
 		if(istype(A, action_type))
 			return A
-	return 
+	return 

code/datums/components/crafting/craft.dm

@@ -27,14 +27,16 @@
 					CAT_BREAD,
 					CAT_BURGER,
 					CAT_CAKE,
+					CAT_DONUT,
 					CAT_EGG,
-					CAT_FISH,
 					CAT_ICE,
 					CAT_MEAT,
+					CAT_MEXICAN,
 					CAT_MISCFOOD,
 					CAT_PASTRY,
 					CAT_PIE,
 					CAT_PIZZA,
+					CAT_SEAFOOD,
 					CAT_SALAD,
 					CAT_SANDWICH,
 					CAT_SOUP,

code/datums/components/crafting/guncrafting.dm

@@ -16,6 +16,6 @@
 
 /obj/item/weaponcrafting/silkstring
 	name = "silkstring"
-	desc = "A long pice of silk looks like cable coil."
+	desc = "A long piece of silk with some resemblance to cable coil."
 	icon = 'icons/obj/improvised.dmi'
-	icon_state = "silkstring"
+	icon_state = "silkstring"

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -204,7 +204,7 @@
 	result =  /obj/item/gun/ballistic/bow/pipe
 	reqs = list(/obj/item/pipe = 5,
 	/obj/item/stack/sheet/plastic = 15,
-	/obj/item/weaponcrafting/silkstring = 10)
+	/obj/item/weaponcrafting/silkstring = 5)
 	time = 450
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
@@ -291,17 +291,17 @@
 /datum/crafting_recipe/arrow
 	name = "Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow
-	time = 40
+	time = 30
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
-				 /obj/item/weaponcrafting/silkstring = 1,
-				 /obj/item/stack/rods = 3) // 1 metal sheet is worth 1.5 arrows
+				 /obj/item/stack/sheet/silk = 1,
+				 /obj/item/stack/rods = 1) // 1 metal sheet = 2 rods = 2 arrows
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/bone_arrow
 	name = "Bone Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow/bone
-	time = 40
+	time = 30
 	always_availible = FALSE
 	reqs = list(/obj/item/stack/sheet/bone = 1,
 				 /obj/item/stack/sheet/sinew = 1,
@@ -310,15 +310,19 @@
 	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/ashen_arrow
-	name = "Harden Arrow"
+	name = "Bonfire-Hardened Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow/ashen
 	tools = list(/obj/structure/bonfire)
-	time = 20
+	time = 30
 	always_availible = FALSE
 	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1)
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 
+/datum/crafting_recipe/ashen_arrow/welder
+	name = "Welder-Hardened Arrow"
+	tools = list(TOOL_WELDER)
+
 /datum/crafting_recipe/smartdart
 	name = "Medical smartdart"
 	result =  /obj/item/reagent_containers/syringe/dart

code/datums/elements/ghost_role_eligibility.dm

@@ -17,7 +17,8 @@
 			penalty += roundstart_quit_limit - world.time
 		if(penalty)
 			penalty += world.realtime
-			if(penalty - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
+			var/maximumRoundEnd = SSautotransfer.starttime + SSautotransfer.voteinterval * SSautotransfer.maxvotes
+			if(penalty - SSshuttle.realtimeofstart > maximumRoundEnd + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
 				penalty = CANT_REENTER_ROUND
 			if(!(M.ckey in timeouts))
 				timeouts += M.ckey

code/datums/traits/negative.dm

@@ -55,6 +55,8 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 			heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie)
 		if("Medical Doctor")
 			heirloom_type = /obj/item/healthanalyzer/advanced
+		if("Paramedic")
+			heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag)
 		if("Station Engineer")
 			heirloom_type = /obj/item/wirecutters/brass
 		if("Atmospheric Technician")

code/game/gamemodes/dynamic/dynamic.dm

@@ -672,7 +672,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
 		// Time to inject some threat into the round
 		if(EMERGENCY_ESCAPED_OR_ENDGAMED) // Unless the shuttle is gone
 			return
-		if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) // no rules after shuttle is auto-called
+		if(SSshuttle.endvote_passed) // no rules after shuttle call is voted
 			return
 		message_admins("DYNAMIC: Checking for midround injection.")
 		log_game("DYNAMIC: Checking for midround injection.")
@@ -748,7 +748,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
 		return
 	if(EMERGENCY_ESCAPED_OR_ENDGAMED) // No more rules after the shuttle has left
 		return
-	if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) // no rules after shuttle is auto-called
+	if(SSshuttle.endvote_passed) // no rules after shuttle is auto-called
 		return
 	update_playercounts()
 

code/game/machinery/announcement_system.dm

@@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 /obj/machinery/announcement_system/Initialize()
 	. = ..()
 	GLOB.announcement_systems += src
-	radio = new /obj/item/radio/headset/ai(src)
+	radio = new /obj/item/radio/headset/silicon/ai(src)
 	update_icon()
 
 /obj/machinery/announcement_system/update_icon()

code/game/machinery/computer/communications.dm

@@ -194,7 +194,7 @@
 				state = STATE_CANCELSHUTTLE
 		if("cancelshuttle2")
 			if(authenticated)
-				if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) //Citadel Edit Removing auto_call caused recall.
+				if(SSshuttle.endvote_passed) //Citadel Edit - endvote passing = no recalls
 					say("Warning: Emergency shuttle recalls have been blocked by Central Command due to ongoing crew transfer procedures.")
 				else
 					SSshuttle.cancelEvac(usr)

code/game/machinery/computer/crew.dm

@@ -40,6 +40,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 	jobs["Geneticist"] = 22
 	jobs["Virologist"] = 23
 	jobs["Medical Doctor"] = 24
+	jobs["Paramedic"] = 25
 	jobs["Research Director"] = 30
 	jobs["Scientist"] = 31
 	jobs["Roboticist"] = 32
@@ -207,4 +208,4 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 		if ("select_person")
 			AI.ai_camera_track(params["name"])
 
-#undef SENSORS_UPDATE_PERIOD
+#undef SENSORS_UPDATE_PERIOD

code/game/objects/effects/landmarks.dm

@@ -151,6 +151,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
 	name = "Medical Doctor"
 	icon_state = "Medical Doctor"
 
+/obj/effect/landmark/start/paramedic
+	name = "Paramedic"
+	icon_state = "Paramedic"
+
 /obj/effect/landmark/start/scientist
 	name = "Scientist"
 	icon_state = "Scientist"

code/game/objects/items/devices/instruments.dm

@@ -108,6 +108,12 @@
 	song.instrumentDir = name
 	song.instrumentExt = insTypes[name]
 
+/obj/item/instrument/piano_synth/proc/selectInstrument() // Moved here so it can be used by the action and PAI software panel without copypasta
+	var/chosen = input("Choose the type of instrument you want to use", "Instrument Selection", song.instrumentDir) as null|anything in insTypes
+	if(!insTypes[chosen])
+		return
+	return changeInstrument(chosen)
+
 /obj/item/instrument/banjo
 	name = "banjo"
 	desc = "A 'Mura' brand banjo. It's pretty much just a drum with a neck and strings."

code/game/objects/items/devices/paicard.dm

@@ -94,10 +94,8 @@
 					to_chat(pai, "<span class='userdanger'>Your mental faculties leave you.</span>")
 					to_chat(pai, "<span class='rose'>oblivion... </span>")
 					qdel(pai)
-		if(href_list["wires"])
-			var/wire = text2num(href_list["wires"])
-			if(pai.radio)
-				pai.radio.wires.cut(wire)
+		if(href_list["wires"] && pai.radio)
+			pai.radio.wires.cut(href_list["wires"])
 		if(href_list["reset_radio_short"])
 			pai.unshort_radio()
 		if(href_list["setlaws"])

code/game/objects/items/devices/radio/headset.dm

@@ -254,12 +254,17 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	keyslot = null
 	bowman = TRUE
 
-/obj/item/radio/headset/ai
+/obj/item/radio/headset/silicon/pai
+	name = "\proper mini Integrated Subspace Transceiver "
+	subspace_transmission = FALSE
+
+
+/obj/item/radio/headset/silicon/ai
 	name = "\proper Integrated Subspace Transceiver "
 	keyslot2 = new /obj/item/encryptionkey/ai
 	command = TRUE
 
-/obj/item/radio/headset/ai/can_receive(freq, level)
+/obj/item/radio/headset/silicon/can_receive(freq, level)
 	return ..(freq, level, TRUE)
 
 /obj/item/radio/headset/attackby(obj/item/W, mob/user, params)

code/game/objects/items/granters.dm

@@ -491,12 +491,12 @@
 	remarks = list("Looks like these would sell much better in a plasma fire...", "Using glass bowls rather then cones?", "Mixing soda and ice-cream?", "Tall glasses with of liquids and solids...", "Just add a bit of icecream and cherry on top?")
 
 /obj/item/book/granter/crafting_recipe/bone_bow //Bow crafting for non-ashwalkers
-	name = "Sandstone manual on bows"
-	desc = "A standstone slab with everything you need to know for making bows and arrows just like an ashwalker would."
+	name = "bowyery sandstone slab" // this is an actual word
+	desc = "A sandstone slab with inscriptions describing the Ash Walkers of Lavaland's bowyery."
 	crafting_recipe_types = list(/datum/crafting_recipe/bone_arrow, /datum/crafting_recipe/bone_bow, /datum/crafting_recipe/ashen_arrow, /datum/crafting_recipe/quiver, /datum/crafting_recipe/bow_tablet)
 	icon_state = "stone_tablet"
 	oneuse = FALSE
-	remarks = list("Sticking burning arrows into the sand makes them stronger?", "Breaking the bone apart to get shards, not sharpening  the bone.", "Sinew is just like rope?")
+	remarks = list("Sticking burning arrows into the sand makes them stronger...", "Breaking the bone apart to get shards, not sharpening the bone...", "Sinew is just like rope...")
 
 /obj/item/book/granter/crafting_recipe/under_the_oven //Illegal cook book
 	name = "Under The Oven"

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

@@ -381,12 +381,12 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 4, time = 40), \
 	new/datum/stack_recipe("white gloves", /obj/item/clothing/gloves/color/white, 2, time = 40), \
 	null, \
-	new/datum/stack_recipe("silk string", /obj/item/weaponcrafting/silkstring, 2, time = 40), \
+	new/datum/stack_recipe("silk string", /obj/item/weaponcrafting/silkstring, 1, time = 40), \
 	))
 
 /obj/item/stack/sheet/silk
 	name = "silk"
-	desc = "A long soft material. This one is just made out of cotton rather then any spiders or wyrms"
+	desc = "A long, soft material. Made out of refined cotton, instead of relying on the habits of spiders or silkworms."
 	singular_name = "silk sheet"
 	icon_state = "sheet-silk"
 	item_state = "sheet-cloth"

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

@@ -327,6 +327,8 @@
 /obj/item/storage/bag/tray/ComponentInitialize()
 	. = ..()
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_NORMAL
+	STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food, /obj/item/reagent_containers/glass, /datum/reagent/consumable, /obj/item/kitchen/knife, /obj/item/kitchen/rollingpin, /obj/item/kitchen/fork, /obj/item/storage/box)) //Should cover: Bottles, Beakers, Bowls, Booze, Glasses, Food, Kitchen Tools, and ingredient boxes.
 	STR.insert_preposition = "on"
 
 /obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)

code/game/objects/items/teleportation.dm

@@ -142,7 +142,7 @@
 	return ..()
 
 /obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 30)
-	var/datum/beam/B = user.Beam(target)
+	var/datum/beam/B = user.Beam(target, icon_state = "rped_upgrade", maxdistance = 50)
 	if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target)))
 		qdel(target)
 		to_chat(user, "<span class='notice'>You dispel [target] with \the [src]!</span>")

code/modules/clothing/under/jobs/medsci.dm

@@ -158,6 +158,23 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
+/obj/item/clothing/under/rank/medical/paramedic
+	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic."
+	name = "paramedic jumpsuit"
+	icon_state = "paramedic"
+	item_state = "w_suit"
+	permeability_coefficient = 0.5
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
+
+/obj/item/clothing/under/rank/medical/paramedic/skirt
+	name = "paramedic jumpskirt"
+	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic."
+	icon_state = "paramedic_skirt"
+	item_state = "w_suit"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/nursesuit
 	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
 	name = "nurse's suit"

code/modules/clothing/under/trek.dm

@@ -19,7 +19,6 @@
 	icon_state = "trek_engsec"
 	item_color = "trek_engsec"
 	item_state = "r_suit"
-	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) //more sec than eng, but w/e.
 	strip_delay = 50
 
 /obj/item/clothing/under/trek/medsci
@@ -69,4 +68,4 @@
 	desc = "Something about it feels off..."
 	icon_state = "trek_Q"
 	item_color = "trek_Q"
-	item_state = "r_suit"
+	item_state = "r_suit"

code/modules/events/wizard/departmentrevolt.dm

@@ -19,7 +19,7 @@
 			jobs_to_revolt = list("Assistant")
 			nation_name = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Grigio", "Ass", "Assi")
 		if("white")
-			jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist")
+			jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Virologist")
 			nation_name = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych")
 		if("yellow")
 			jobs_to_revolt = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")

code/modules/food_and_drinks/food/snacks_cake.dm

@@ -85,6 +85,20 @@
 	tastes = list("cake" = 4, "cream cheese" = 3)
 	foodtype = GRAIN | DAIRY
 
+/obj/item/reagent_containers/food/snacks/store/cake/brioche
+	name = "brioche cake"
+	desc = "A ring of sweet, glazed buns."
+	icon_state = "briochecake"
+	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche
+	slices_num = 6
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
+
+/obj/item/reagent_containers/food/snacks/cakeslice/brioche
+	name = "brioche cake slice"
+	desc = "Delicious sweet-bread. Who needs anything else?"
+	icon_state = "briochecake_slice"
+	filling_color = "#FFD700"
+
 /obj/item/reagent_containers/food/snacks/cakeslice/cheese
 	name = "cheese cake slice"
 	desc = "Slice of pure cheestisfaction."

code/modules/food_and_drinks/food/snacks_egg.dm

@@ -101,7 +101,7 @@
 	desc = "A fried egg with a side of bacon. Delicious!"
 	icon_state = "baconegg"
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
-	bitesize = 1
+	bitesize = 2
 	filling_color = "#FFFFF0"
 	tastes = list("egg" = 2, "bacon" = 2, "salt" = 1, "pepper" = 1)
 	foodtype = MEAT | FRIED | BREAKFAST
@@ -151,8 +151,17 @@
 	desc = "There is only one egg on this, how rude."
 	icon_state = "benedict"
 	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
-	trash = /obj/item/trash/plate
 	w_class = WEIGHT_CLASS_NORMAL
+	trash = /obj/item/trash/plate
 	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("egg" = 1, "bacon" = 1, "bun" = 1)
 	foodtype = MEAT | BREAKFAST
+
+/obj/item/reagent_containers/food/snacks/scotchegg
+	name = "scotch egg"
+	desc = "A boiled egg wrapped in a delicious, seasoned meatball."
+	icon_state = "scotchegg"
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	bitesize = 3
+	filling_color = "#FFFFF0"
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)

code/modules/food_and_drinks/food/snacks_other.dm

@@ -674,3 +674,26 @@
 		if (7000 to INFINITY)
 			burn()
 	..()
+
+//Easter Stuff
+
+/obj/item/reagent_containers/food/snacks/chocolatebunny
+	name = "chocolate bunny"
+	desc = "Contains less than 10% real rabbit!"
+	icon_state = "chocolatebunny"
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
+	filling_color = "#A0522D"
+
+/obj/item/reagent_containers/food/snacks/soup/mammi
+	name = "Mammi"
+	desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement."
+	icon_state = "mammi"
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
+
+/obj/item/reagent_containers/food/snacks/hotcrossbun
+	bitesize = 2
+	name = "hot-cross bun"
+	desc = "The Cross represents the Assistants that died for your sins."
+	icon_state = "hotcrossbun"

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

@@ -3,36 +3,6 @@
 
 ////////////////////////////////////////////////BREAD////////////////////////////////////////////////
 
-/datum/crafting_recipe/food/meatbread
-	name = "Meat bread"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet/plain = 3,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 3
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/bread/meat
-	subcategory = CAT_BREAD
-
-/datum/crafting_recipe/food/xenomeatbread
-	name = "Xenomeat bread"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 3,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 3
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/bread/xenomeat
-	subcategory = CAT_BREAD
-
-/datum/crafting_recipe/food/spidermeatbread
-	name = "Spidermeat bread"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 3,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 3
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/bread/spidermeat
-	subcategory = CAT_BREAD
-
 /datum/crafting_recipe/food/banananutbread
 	name = "Banana nut bread"
 	reqs = list(
@@ -44,16 +14,6 @@
 	result = /obj/item/reagent_containers/food/snacks/store/bread/banana
 	subcategory = CAT_BREAD
 
-/datum/crafting_recipe/food/tofubread
-	name = "Tofu bread"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
-		/obj/item/reagent_containers/food/snacks/tofu = 3,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 3
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/bread/tofu
-	subcategory = CAT_BREAD
-
 /datum/crafting_recipe/food/creamcheesebread
 	name = "Cream cheese bread"
 	reqs = list(
@@ -64,6 +24,16 @@
 	result = /obj/item/reagent_containers/food/snacks/store/bread/creamcheese
 	subcategory = CAT_BREAD
 
+/datum/crafting_recipe/food/meatbread
+	name = "Meat bread"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet/plain = 3,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 3
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/bread/meat
+	subcategory = CAT_BREAD
+
 /datum/crafting_recipe/food/mimanabread
 	name = "Mimana bread"
 	reqs = list(
@@ -75,6 +45,38 @@
 	result = /obj/item/reagent_containers/food/snacks/store/bread/mimana
 	subcategory = CAT_BREAD
 
+/datum/crafting_recipe/food/spidermeatbread
+	name = "Spidermeat bread"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 3,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 3
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/bread/spidermeat
+	subcategory = CAT_BREAD
+
+/datum/crafting_recipe/food/tofubread
+	name = "Tofu bread"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+		/obj/item/reagent_containers/food/snacks/tofu = 3,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 3
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/bread/tofu
+	subcategory = CAT_BREAD
+
+/datum/crafting_recipe/food/xenomeatbread
+	name = "Xenomeat bread"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 3,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 3
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/bread/xenomeat
+	subcategory = CAT_BREAD
+
+////////////////////////////////////////////////TOAST////////////////////////////////////////////////
+
 /datum/crafting_recipe/food/butteredtoast
 	name = "Buttered Toast"
 	reqs = list(
@@ -84,6 +86,45 @@
 	result = /obj/item/reagent_containers/food/snacks/butteredtoast
 	subcategory = CAT_BREAD
 
+/datum/crafting_recipe/food/slimetoast
+	name = "Slime toast"
+	reqs = list(
+		/datum/reagent/toxin/slimejelly = 5,
+		/obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
+	subcategory = CAT_BREAD
+
+/datum/crafting_recipe/food/jelliedtoast
+	name = "Jellied toast"
+	reqs = list(
+		/datum/reagent/consumable/cherryjelly = 5,
+		/obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
+	subcategory = CAT_BREAD
+
+/datum/crafting_recipe/food/peanutbuttertoast
+	name = "Peanut butter toast"
+	reqs = list(
+		/datum/reagent/consumable/peanut_butter = 5,
+		/obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast
+	subcategory = CAT_BREAD
+
+////////////////////////////////////////////////MISC////////////////////////////////////////////////
+
+/datum/crafting_recipe/food/baguette
+	name = "Baguette"
+	time = 40
+	reqs = list(/datum/reagent/consumable/sodiumchloride = 1,
+				/datum/reagent/consumable/blackpepper = 1,
+				/obj/item/reagent_containers/food/snacks/pastrybase = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/baguette
+	subcategory = CAT_BREAD
+
 /datum/crafting_recipe/food/butterbiscuit
 	name = "Butter Biscuit"
 	reqs = list(
@@ -100,4 +141,13 @@
 		/obj/item/reagent_containers/food/snacks/butter = 3,
 		)
 	result = /obj/item/reagent_containers/food/snacks/butterdog
+	subcategory = CAT_BREAD
+
+/datum/crafting_recipe/food/twobread
+	name = "Two bread"
+	reqs = list(
+		/datum/reagent/consumable/ethanol/wine = 5,
+		/obj/item/reagent_containers/food/snacks/breadslice/plain = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/twobread
 	subcategory = CAT_BREAD

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

@@ -1,8 +1,74 @@
 
 // see code/module/crafting/table.dm
 
-////////////////////////////////////////////////BURGERS////////////////////////////////////////////////
+////////////////////////////////////////////////STANDARD BURGS////////////////////////////////////////////////
 
+/datum/crafting_recipe/food/burger
+	name = "Burger"
+	reqs = list(
+			/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/plain
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/baconburger
+	name = "Bacon Burger"
+	reqs = list(
+			/obj/item/reagent_containers/food/snacks/meat/bacon = 3,
+			/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+			/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+
+	result = /obj/item/reagent_containers/food/snacks/burger/baconburger
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/bigbiteburger
+	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
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/superbiteburger
+	name = "Super bite burger"
+	reqs = list(
+		/datum/reagent/consumable/sodiumchloride = 5,
+		/datum/reagent/consumable/blackpepper = 5,
+		/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 = 1,
+		/obj/item/reagent_containers/food/snacks/meat/bacon = 1,
+		/obj/item/reagent_containers/food/snacks/bun = 1
+
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/superbite
+	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/corgiburger
+	name = "Corgi burger"
+	reqs = list(
+			/obj/item/reagent_containers/food/snacks/meat/slab/corgi = 1,
+			/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+
+	result = /obj/item/reagent_containers/food/snacks/burger/corgi
+	subcategory = CAT_BURGER
 
 /datum/crafting_recipe/food/humanburger
 	name = "Human burger"
@@ -16,26 +82,37 @@
 	result = /obj/item/reagent_containers/food/snacks/burger/human
 	subcategory = CAT_BURGER
 
-/datum/crafting_recipe/food/burger
-	name = "Burger"
+/datum/crafting_recipe/food/ribburger
+	name = "McRib"
 	reqs = list(
-			/obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+			/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/plain
+	result = /obj/item/reagent_containers/food/snacks/burger/rib
 	subcategory = CAT_BURGER
 
-/datum/crafting_recipe/food/corgiburger
-	name = "Corgi burger"
+/datum/crafting_recipe/food/mcguffin
+	name = "McGuffin"
 	reqs = list(
-			/obj/item/reagent_containers/food/snacks/meat/slab/corgi = 1,
+			/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/corgi
+	result = /obj/item/reagent_containers/food/snacks/burger/mcguffin
 	subcategory = CAT_BURGER
 
+/datum/crafting_recipe/food/tofuburger
+	name = "Tofu burger"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/tofu = 1,
+		/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/tofu
+	subcategory = CAT_BURGER
+
+///////////////EXOTIC//////////////////
+
 /datum/crafting_recipe/food/appendixburger
 	name = "Appendix burger"
 	reqs = list(
@@ -54,15 +131,6 @@
 	result = /obj/item/reagent_containers/food/snacks/burger/brain
 	subcategory = CAT_BURGER
 
-/datum/crafting_recipe/food/xenoburger
-	name = "Xeno burger"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/meat/steak/xeno = 1,
-		/obj/item/reagent_containers/food/snacks/bun = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/burger/xeno
-	subcategory = CAT_BURGER
-
 /datum/crafting_recipe/food/bearger
 	name = "Bearger"
 	reqs = list(
@@ -72,6 +140,16 @@
 	result = /obj/item/reagent_containers/food/snacks/burger/bearger
 	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
+
 /datum/crafting_recipe/food/fishburger
 	name = "Fish burger"
 	reqs = list(
@@ -82,25 +160,73 @@
 	result = /obj/item/reagent_containers/food/snacks/burger/fish
 	subcategory = CAT_BURGER
 
-/datum/crafting_recipe/food/tofuburger
-	name = "Tofu burger"
+/datum/crafting_recipe/food/fivealarmburger
+	name = "Five alarm burger"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/tofu = 1,
-		/obj/item/reagent_containers/food/snacks/bun = 1
+			/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/tofu
+	result = /obj/item/reagent_containers/food/snacks/burger/fivealarm
 	subcategory = CAT_BURGER
 
-/datum/crafting_recipe/food/ghostburger
-	name = "Ghost burger"
+/datum/crafting_recipe/food/slimeburger
+	name = "Jelly burger"
 	reqs = list(
-		/obj/item/ectoplasm = 1,
-		/datum/reagent/consumable/sodiumchloride = 2,
+		/datum/reagent/toxin/slimejelly = 5,
 		/obj/item/reagent_containers/food/snacks/bun = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/burger/ghost
+	result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime
 	subcategory = CAT_BURGER
 
+/datum/crafting_recipe/food/jellyburger
+	name = "Jelly burger"
+	reqs = list(
+			/datum/reagent/consumable/cherryjelly = 5,
+			/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/baseballburger
+	name = "Home run baseball burger"
+	reqs = list(
+			/obj/item/melee/baseball_bat = 1,
+			/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/baseball
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/ratburger
+	name = "Rat burger"
+	reqs = list(
+			/obj/item/reagent_containers/food/snacks/deadmouse = 1,
+			/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/rat
+	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/xenoburger
+	name = "Xeno burger"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/meat/steak/xeno = 1,
+		/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/xeno
+	subcategory = CAT_BURGER
+
+////////////MYSTICAL////////////////
+
 /datum/crafting_recipe/food/clownburger
 	name = "Clown burger"
 	reqs = list(
@@ -119,6 +245,35 @@
 	result = /obj/item/reagent_containers/food/snacks/burger/mime
 	subcategory = CAT_BURGER
 
+/datum/crafting_recipe/food/ghostburger
+	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
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/spellburger
+	name = "Spell burger"
+	reqs = list(
+		/obj/item/clothing/head/wizard/fake = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/spell
+	subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/spellburger2
+	name = "Spell burger"
+	reqs = list(
+		/obj/item/clothing/head/wizard = 1,
+		/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/spell
+	subcategory = CAT_BURGER
+
+////////////COLORED BURGERS//////////////
+
 /datum/crafting_recipe/food/redburger
 	name = "Red burger"
 	reqs = list(
@@ -197,154 +352,4 @@
 		/obj/item/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/burger/white
-	subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/spellburger
-	name = "Spell burger"
-	reqs = list(
-		/obj/item/clothing/head/wizard/fake = 1,
-	)
-	result = /obj/item/reagent_containers/food/snacks/burger/spell
-	subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/spellburger2
-	name = "Spell burger"
-	reqs = list(
-		/obj/item/clothing/head/wizard = 1,
-		/obj/item/reagent_containers/food/snacks/bun = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/burger/spell
-	subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/bigbiteburger
-	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
-	subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/superbiteburger
-	name = "Super bite burger"
-	reqs = list(
-		/datum/reagent/consumable/sodiumchloride = 5,
-		/datum/reagent/consumable/blackpepper = 5,
-		/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 = 1,
-		/obj/item/reagent_containers/food/snacks/meat/bacon = 1,
-		/obj/item/reagent_containers/food/snacks/bun = 1
-
-	)
-	result = /obj/item/reagent_containers/food/snacks/burger/superbite
-	subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/slimeburger
-	name = "Jelly burger"
-	reqs = list(
-		/datum/reagent/toxin/slimejelly = 5,
-		/obj/item/reagent_containers/food/snacks/bun = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime
-	subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/jellyburger
-	name = "Jelly burger"
-	reqs = list(
-			/datum/reagent/consumable/cherryjelly = 5,
-			/obj/item/reagent_containers/food/snacks/bun = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry
-	subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/fivealarmburger
-	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
-	subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/ratburger
-	name = "Rat burger"
-	reqs = list(
-			/obj/item/reagent_containers/food/snacks/deadmouse = 1,
-			/obj/item/reagent_containers/food/snacks/bun = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/burger/rat
-	subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/baseballburger
-	name = "Home run baseball burger"
-	reqs = list(
-			/obj/item/melee/baseball_bat = 1,
-			/obj/item/reagent_containers/food/snacks/bun = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/burger/baseball
-	subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/baconburger
-	name = "Bacon Burger"
-	reqs = list(
-			/obj/item/reagent_containers/food/snacks/meat/bacon = 3,
-			/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
-			/obj/item/reagent_containers/food/snacks/bun = 1
-	)
-
-	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

@@ -1,7 +1,93 @@
 
 // see code/module/crafting/table.dm
 
-////////////////////////////////////////////////CAKE////////////////////////////////////////////////
+////////////////////////////////////////////////FRUIT CAKE////////////////////////////////////////////////
+
+/datum/crafting_recipe/food/applecake
+	name = "Apple cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/apple = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/apple
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/bscccake
+	name = "Blackberry and strawberry chocolate cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 2,
+		/obj/item/reagent_containers/food/snacks/grown/berries = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/bscc
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/bscvcake
+	name = "Blackberry and strawberry vanilla cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/berries = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/lemoncake
+	name = "Lemon cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/lemon
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/limecake
+	name = "Lime cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/lime
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/orangecake
+	name = "Orange cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/orange
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/peachcake
+	name = "Peach cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/peach = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/peach_cake
+	subcategory = CAT_CAKE
+
+///////////////////////////////////FANCY////////////////////////////////////////////
+
+/datum/crafting_recipe/food/birthdaycake
+	name = "Birthday cake"
+	reqs = list(
+		/datum/reagent/consumable/sugar = 5,
+		/datum/reagent/consumable/caramel =2,
+		/obj/item/candle = 1,
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/birthday
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/briochecake
+	name = "Brioche cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/datum/reagent/consumable/sugar = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/brioche
+	subcategory = CAT_CAKE
 
 /datum/crafting_recipe/food/carrotcake
 	name = "Carrot cake"
@@ -21,42 +107,6 @@
 	result = /obj/item/reagent_containers/food/snacks/store/cake/cheese
 	subcategory = CAT_CAKE
 
-/datum/crafting_recipe/food/applecake
-	name = "Apple cake"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/apple = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/apple
-	subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/orangecake
-	name = "Orange cake"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/orange
-	subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/limecake
-	name = "Lime cake"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/lime
-	subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/lemoncake
-	name = "Lemon cake"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/lemon
-	subcategory = CAT_CAKE
-
 /datum/crafting_recipe/food/chocolatecake
 	name = "Chocolate cake"
 	reqs = list(
@@ -66,35 +116,6 @@
 	result = /obj/item/reagent_containers/food/snacks/store/cake/chocolate
 	subcategory = CAT_CAKE
 
-/datum/crafting_recipe/food/birthdaycake
-	name = "Birthday cake"
-	reqs = list(
-		/datum/reagent/consumable/sugar = 5,
-		/datum/reagent/consumable/caramel =2,
-		/obj/item/candle = 1,
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/birthday
-	subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/braincake
-	name = "Brain cake"
-	reqs = list(
-		/obj/item/organ/brain = 1,
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/brain
-	subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/slimecake
-	name = "Slime cake"
-	reqs = list(
-		/obj/item/slime_extract = 1,
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/slimecake
-	subcategory = CAT_CAKE
-
 /datum/crafting_recipe/food/pumpkinspicecake
 	name = "Pumpkin spice cake"
 	reqs = list(
@@ -104,6 +125,26 @@
 	result = /obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice
 	subcategory = CAT_CAKE
 
+/datum/crafting_recipe/food/poundcake
+	name = "Pound cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 4
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/vanillacake
+	name = "Vanilla cake"
+	always_availible = FALSE
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/vanillapod = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake
+	subcategory = CAT_CAKE
+
+/////////////SPECIAL////////////
+
 /datum/crafting_recipe/food/holycake
 	name = "Angel food cake"
 	reqs = list(
@@ -113,12 +154,24 @@
 	result = /obj/item/reagent_containers/food/snacks/store/cake/holy_cake
 	subcategory = CAT_CAKE
 
-/datum/crafting_recipe/food/poundcake
-	name = "Pound cake"
+/datum/crafting_recipe/food/braincake
+	name = "Brain cake"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 4
+		/obj/item/organ/brain = 1,
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake
+	result = /obj/item/reagent_containers/food/snacks/store/cake/brain
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/clowncake
+	name = "Clown cake"
+	always_availible = FALSE
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/sundae = 2,
+		/obj/item/reagent_containers/food/snacks/grown/banana = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/clown_cake
 	subcategory = CAT_CAKE
 
 /datum/crafting_recipe/food/hardwarecake
@@ -131,53 +184,13 @@
 	result = /obj/item/reagent_containers/food/snacks/store/cake/hardware_cake
 	subcategory = CAT_CAKE
 
-/datum/crafting_recipe/food/bscccake
-	name = "blackberry and strawberry chocolate cake"
+/datum/crafting_recipe/food/slimecake
+	name = "Slime cake"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
-		/obj/item/reagent_containers/food/snacks/chocolatebar = 2,
-		/obj/item/reagent_containers/food/snacks/grown/berries = 5
+		/obj/item/slime_extract = 1,
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/bscc
-	subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/bscvcake
-	name = "blackberry and strawberry vanilla cake"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/berries = 5
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc
-	subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/clowncake
-	name = "clown cake"
-	always_availible = FALSE
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
-		/obj/item/reagent_containers/food/snacks/sundae = 2,
-		/obj/item/reagent_containers/food/snacks/grown/banana = 5
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/clown_cake
-	subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/vanillacake
-	name = "vanilla cake"
-	always_availible = FALSE
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/vanillapod = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake
-	subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/peachcake
-	name = "Peach cake"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/peach = 5
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/peach_cake
+	result = /obj/item/reagent_containers/food/snacks/store/cake/slimecake
 	subcategory = CAT_CAKE
 
 /datum/crafting_recipe/food/trumpetcake

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

@@ -0,0 +1,255 @@
+// see code/module/crafting/table.dm
+
+////////////////////////////////////////////////DONUTS////////////////////////////////////////////////
+
+/datum/crafting_recipe/food/donut
+	time = 15
+	name = "Donut"
+	reqs = list(
+		/datum/reagent/consumable/sugar = 1,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/plain
+	subcategory = CAT_DONUT
+
+/datum/crafting_recipe/food/donut/chaos
+	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
+
+datum/crafting_recipe/food/donut/meat
+	time = 15
+	name = "Meat donut"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/meat/slab = 1,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/meat
+
+/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/plain
+
+/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/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_DONUT
+
+/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(
+		/datum/reagent/consumable/bungojuice = 3,
+		/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/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/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/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(
+		/datum/reagent/consumable/bungojuice = 3,
+		/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/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/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
+
+/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
+
+////////////////////////////////////////////////////SLIME  DONUTS///////////////////////////////////////////////////////
+
+/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/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/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(
+		/datum/reagent/consumable/bungojuice = 3,
+		/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/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/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/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

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

@@ -59,4 +59,15 @@
 		/obj/item/reagent_containers/food/snacks/grown/corn = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/salad/eggbowl
+	subcategory = CAT_EGG
+
+/datum/crafting_recipe/food/scotchegg
+	name = "Scotch egg"
+	reqs = list(
+		/datum/reagent/consumable/sodiumchloride = 1,
+		/datum/reagent/consumable/blackpepper = 1,
+		/obj/item/reagent_containers/food/snacks/boiledegg = 1,
+		/obj/item/reagent_containers/food/snacks/faggot = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/scotchegg
 	subcategory = CAT_EGG

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

@@ -3,6 +3,64 @@
 //Misc. Frozen.//
 /////////////////
 
+/datum/crafting_recipe/food/banana_split
+	name = "Banana Split"
+	always_availible = FALSE
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/icecream = 3,
+		/obj/item/reagent_containers/food/snacks/grown/banana = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/banana_split
+	subcategory = CAT_ICE
+
+	/datum/crafting_recipe/food/bluecharrie_float
+	name = "Blue Cherry Shake"
+	always_availible = FALSE
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/icecream = 1,
+		/obj/item/reagent_containers/food/snacks/grown/bluecherries = 3,
+		/obj/item/reagent_containers/food/drinks/drinkingglass = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/bluecharrie_float
+	subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/charrie_float
+	name = "Cherry Shake"
+	always_availible = FALSE
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/icecream = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cherries = 3,
+		/obj/item/reagent_containers/food/drinks/drinkingglass = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/charrie_float
+	subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/root_float
+	name = "Cola Float"
+	always_availible = FALSE
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/icecream = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
+		/datum/reagent/consumable/space_cola = 10,
+		/obj/item/reagent_containers/food/drinks/drinkingglass = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/cola_float
+	subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/honkdae
+	name ="Honkdae"
+	reqs = list(
+		/datum/reagent/consumable/cream = 5,
+		/obj/item/clothing/mask/gas/clown_hat = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
+		/obj/item/reagent_containers/food/snacks/grown/banana = 2,
+		/obj/item/reagent_containers/food/snacks/icecream = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/honkdae
+	subcategory = CAT_ICE
+
 /datum/crafting_recipe/food/icecreamsandwich
 	name = "Icecream sandwich"
 	reqs = list(
@@ -14,7 +72,7 @@
 	subcategory = CAT_ICE
 
 /datum/crafting_recipe/food/spacefreezy
-	name ="Space freezy"
+	name ="Space Freezy"
 	reqs = list(
 		/datum/reagent/consumable/bluecherryjelly = 5,
 		/datum/reagent/consumable/spacemountainwind = 15,
@@ -34,105 +92,8 @@
 	result = /obj/item/reagent_containers/food/snacks/sundae
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/honkdae
-	name ="Honkdae"
-	reqs = list(
-		/datum/reagent/consumable/cream = 5,
-		/obj/item/clothing/mask/gas/clown_hat = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
-		/obj/item/reagent_containers/food/snacks/grown/banana = 2,
-		/obj/item/reagent_containers/food/snacks/icecream = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/honkdae
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/banana_split
-	name = "Banana Split"
-	always_availible = FALSE
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/icecream = 3,
-		/obj/item/reagent_containers/food/snacks/grown/banana = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
-		/obj/item/reagent_containers/food/snacks/chocolatebar = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/banana_split
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/root_float
-	name = "Cola Float"
-	always_availible = FALSE
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/icecream = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cherries = 1,
-		/datum/reagent/consumable/space_cola = 10,
-		/obj/item/reagent_containers/food/drinks/drinkingglass = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/cola_float
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/charrie_float
-	name = "Cherry Shake"
-	always_availible = FALSE
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/icecream = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cherries = 3,
-		/obj/item/reagent_containers/food/drinks/drinkingglass = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/charrie_float
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/bluecharrie_float
-	name = "Blue Cherry Shake"
-	always_availible = FALSE
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/icecream = 1,
-		/obj/item/reagent_containers/food/snacks/grown/bluecherries = 3,
-		/obj/item/reagent_containers/food/drinks/drinkingglass = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/bluecharrie_float
-	subcategory = CAT_ICE
-
 //////////////////////////SNOW CONES///////////////////////
 
-/datum/crafting_recipe/food/flavorless_sc
-	name = "Flavorless snowcone"
-	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/consumable/ice = 15
-	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/pineapple_sc
-	name = "Pineapple snowcone"
-	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/consumable/ice = 15,
-		/obj/item/reagent_containers/food/snacks/pineappleslice = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/lime_sc
-	name = "Lime snowcone"
-	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/limejuice = 5
-	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/lime
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/lemon_sc
-	name = "Lemon snowcone"
-	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/lemonjuice = 5
-	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/lemon
-	subcategory = CAT_ICE
-
 /datum/crafting_recipe/food/apple_sc
 	name = "Apple snowcone"
 	reqs = list(
@@ -143,24 +104,14 @@
 	result = /obj/item/reagent_containers/food/snacks/snowcones/apple
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/grape_sc
-	name = "Grape snowcone"
+/datum/crafting_recipe/food/berry_sc
+	name = "Berry snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/grapejuice = 5
+		/datum/reagent/consumable/berryjuice = 5
 	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/grape
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/orange_sc
-	name = "Orange snowcone"
-	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/orangejuice = 5
-	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/orange
+	result = /obj/item/reagent_containers/food/snacks/snowcones/berry
 	subcategory = CAT_ICE
 
 /datum/crafting_recipe/food/blue_sc
@@ -183,14 +134,13 @@
 	result = /obj/item/reagent_containers/food/snacks/snowcones/red
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/berry_sc
-	name = "Berry snowcone"
+/datum/crafting_recipe/food/flavorless_sc
+	name = "Flavorless snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/berryjuice = 5
+		/datum/reagent/consumable/ice = 15
 	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/berry
+	result = /obj/item/reagent_containers/food/snacks/snowcones
 	subcategory = CAT_ICE
 
 /datum/crafting_recipe/food/fruitsalad_sc
@@ -206,24 +156,84 @@
 	result = /obj/item/reagent_containers/food/snacks/snowcones/fruitsalad
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/mime_sc
-	name = "Mime snowcone"
+/datum/crafting_recipe/food/grape_sc
+	name = "Grape snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/nothing = 5
+		/datum/reagent/consumable/grapejuice = 5
 	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/mime
+	result = /obj/item/reagent_containers/food/snacks/snowcones/grape
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/clown_sc
-	name = "Clown snowcone"
+/datum/crafting_recipe/food/honey_sc
+	name = "Honey snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/laughter = 5
+		/datum/reagent/consumable/honey = 5
 	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/clown
+	result = /obj/item/reagent_containers/food/snacks/snowcones/honey
+	subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/lemon_sc
+	name = "Lemon snowcone"
+	reqs = list(
+		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/datum/reagent/consumable/ice = 15,
+		/datum/reagent/consumable/lemonjuice = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/snowcones/lemon
+	subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/lime_sc
+	name = "Lime snowcone"
+	reqs = list(
+		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/datum/reagent/consumable/ice = 15,
+		/datum/reagent/consumable/limejuice = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/snowcones/lime
+	subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/orange_sc
+	name = "Orange snowcone"
+	reqs = list(
+		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/datum/reagent/consumable/ice = 15,
+		/datum/reagent/consumable/orangejuice = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/snowcones/orange
+	subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/pineapple_sc
+	name = "Pineapple snowcone"
+	reqs = list(
+		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/datum/reagent/consumable/ice = 15,
+		/obj/item/reagent_containers/food/snacks/pineappleslice = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple
+	subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/pwrgame_sc
+	name = "Pwrgame snowcone"
+	reqs = list(
+		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/datum/reagent/consumable/ice = 15,
+		/datum/reagent/consumable/pwr_game = 15
+	)
+	result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame
+	subcategory = CAT_ICE
+
+/datum/crafting_recipe/food/rainbow_sc
+	name = "Rainbow snowcone"
+	reqs = list(
+		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/datum/reagent/consumable/ice = 15,
+		/datum/reagent/colorful_reagent = 1 //Harder to make
+	)
+	result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow
 	subcategory = CAT_ICE
 
 /datum/crafting_recipe/food/soda_sc
@@ -246,32 +256,24 @@
 	result = /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/pwrgame_sc
-	name = "Pwrgame snowcone"
+/////I don't like seperating the clown and mime.///
+
+/datum/crafting_recipe/food/mime_sc
+	name = "Mime snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/pwr_game = 15
+		/datum/reagent/consumable/nothing = 5
 	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame
+	result = /obj/item/reagent_containers/food/snacks/snowcones/mime
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/honey_sc
-	name = "Honey snowcone"
+/datum/crafting_recipe/food/clown_sc
+	name = "Clown snowcone"
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/honey = 5
+		/datum/reagent/consumable/laughter = 5
 	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/honey
-	subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/rainbow_sc
-	name = "Rainbow snowcone"
-	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
-		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/colorful_reagent = 1 //Harder to make
-	)
-	result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow
-	subcategory = CAT_ICE
+	result = /obj/item/reagent_containers/food/snacks/snowcones/clown
+	subcategory = CAT_ICE

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

@@ -1,3 +1,5 @@
+// see code/module/crafting/table.dm
+
 ////////////////////////////////////////////////KEBABS////////////////////////////////////////////////
 
 /datum/crafting_recipe/food/humankebab
@@ -36,6 +38,18 @@
 	result = /obj/item/reagent_containers/food/snacks/kebab/tail
 	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
+
 // see code/module/crafting/table.dm
 
 ////////////////////////////////////////////////MR SPIDER////////////////////////////////////////////////
@@ -52,6 +66,36 @@
 
 ////////////////////////////////////////////////MISC RECIPE's////////////////////////////////////////////////
 
+/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
+
+/datum/crafting_recipe/food/nugget
+	name = "Chicken nugget"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/nugget
+	subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/corndog
+	name = "Corndog meal"
+	reqs = list(
+		/obj/item/stack/rods = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+		/obj/item/reagent_containers/food/snacks/bun = 1,
+		/datum/reagent/consumable/mustard = 5,
+		/datum/reagent/consumable/ketchup = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/corndog
+	subcategory = CAT_MEAT
+
 /datum/crafting_recipe/food/cornedbeef
 	name = "Corned beef"
 	reqs = list(
@@ -72,16 +116,6 @@
 	result = /obj/item/reagent_containers/food/snacks/bearsteak
 	subcategory = CAT_MEAT
 
-/datum/crafting_recipe/food/enchiladas
-	name = "Enchiladas"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
-		/obj/item/reagent_containers/food/snacks/grown/chili = 2,
-		/obj/item/reagent_containers/food/snacks/tortilla = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/enchiladas
-	subcategory = CAT_MEAT
-
 /datum/crafting_recipe/food/stewedsoymeat
 	name = "Stewed soymeat"
 	reqs = list(
@@ -101,23 +135,6 @@
 	result = /obj/item/reagent_containers/food/snacks/sausage
 	subcategory = CAT_MEAT
 
-/datum/crafting_recipe/food/nugget
-	name = "Chicken nugget"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/meat/cutlet = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/nugget
-	subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/rawkhinkali
-	name = "Raw Khinkali"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/doughslice = 1,
-		/obj/item/reagent_containers/food/snacks/faggot = 1
-	)
-	result =  /obj/item/reagent_containers/food/snacks/rawkhinkali
-	subcategory = CAT_MEAT
-
 /datum/crafting_recipe/food/pigblanket
 	name = "Pig in a Blanket"
 	reqs = list(
@@ -128,18 +145,6 @@
 	result = /obj/item/reagent_containers/food/snacks/pigblanket
 	subcategory = CAT_MEAT
 
-/datum/crafting_recipe/food/corndog
-	name = "Corndog meal"
-	reqs = list(
-		/obj/item/stack/rods = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
-		/obj/item/reagent_containers/food/snacks/bun = 1,
-		/datum/reagent/consumable/mustard = 5,
-		/datum/reagent/consumable/ketchup = 5
-	)
-	result = /obj/item/reagent_containers/food/snacks/corndog
-	subcategory = CAT_MEAT
-
 /datum/crafting_recipe/food/ratkebab
 	name = "Rat Kebab"
 	reqs = list(
@@ -166,25 +171,3 @@
 	)
 	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_mexican.dm

@@ -0,0 +1,111 @@
+// see code/module/crafting/table.dm
+
+////////////////////////////////////////////////"MEXICAN"////////////////////////////////////////////////
+
+/datum/crafting_recipe/food/burrito
+	name ="Burrito"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/tortilla = 1,
+		/obj/item/reagent_containers/food/snacks/grown/soybeans = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/burrito
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/cheesyburrito
+	name ="Cheesy burrito"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/tortilla = 1,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 2,
+		/obj/item/reagent_containers/food/snacks/grown/soybeans = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/cheesyburrito
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/enchiladas
+	name = "Enchiladas"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+		/obj/item/reagent_containers/food/snacks/grown/chili = 2,
+		/obj/item/reagent_containers/food/snacks/tortilla = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/enchiladas
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/carneburrito
+	name ="Carne de asada burrito"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/tortilla = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+		/obj/item/reagent_containers/food/snacks/grown/soybeans = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/carneburrito
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/fuegoburrito
+	name ="Fuego plasma burrito"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/tortilla = 1,
+		/obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2,
+		/obj/item/reagent_containers/food/snacks/grown/soybeans = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/fuegoburrito
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/taco
+	name ="Classic Taco"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/tortilla = 1,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/taco
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/tacoplain
+	name ="Plain Taco"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/tortilla = 1,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/taco/plain
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/nachos
+	name ="Nachos"
+	reqs = list(
+		/datum/reagent/consumable/sodiumchloride = 1,
+		/obj/item/reagent_containers/food/snacks/tortilla = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/nachos
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/cheesynachos
+	name ="Cheesy nachos"
+	reqs = list(
+		/datum/reagent/consumable/sodiumchloride = 1,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+		/obj/item/reagent_containers/food/snacks/tortilla = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/cheesynachos
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/cubannachos
+	name ="Cuban nachos"
+	reqs = list(
+		/datum/reagent/consumable/ketchup = 5,
+		/obj/item/reagent_containers/food/snacks/grown/chili = 2,
+		/obj/item/reagent_containers/food/snacks/tortilla = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/cubannachos
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/wrap
+	name = "Wrap"
+	reqs = list(/datum/reagent/consumable/soysauce = 10,
+		/obj/item/reagent_containers/food/snacks/friedegg = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/eggwrap
+	subcategory = CAT_MEXICAN

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

@@ -1,62 +1,77 @@
 
 // see code/module/crafting/table.dm
 
-// MISC
+//////////////////Eastern Foods//////////////////////
 
-/datum/crafting_recipe/food/candiedapple
-	name = "Candied apple"
-	reqs = list(/datum/reagent/water = 5,
-		/datum/reagent/consumable/sugar = 5,
-		/obj/item/reagent_containers/food/snacks/grown/apple = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/candiedapple
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/spiderlollipop
-	name = "Spider Lollipop"
-	reqs = list(/obj/item/stack/rods = 1,
-		/datum/reagent/consumable/sugar = 5,
+/datum/crafting_recipe/food/chawanmushi
+	name = "Chawanmushi"
+	reqs = list(
 		/datum/reagent/water = 5,
-		/obj/item/reagent_containers/food/snacks/spiderling = 1
+		/datum/reagent/consumable/soysauce = 5,
+		/obj/item/reagent_containers/food/snacks/boiledegg = 2,
+		/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/spiderlollipop
+	result = /obj/item/reagent_containers/food/snacks/chawanmushi
 	subcategory = CAT_MISCFOOD
 
-/datum/crafting_recipe/food/chococoin
-	name = "Choco coin"
+/datum/crafting_recipe/food/khachapuri
+	name = "Khachapuri"
 	reqs = list(
-		/obj/item/coin = 1,
-		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+		/datum/reagent/consumable/eggyolk = 5,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/chococoin
+	result = /obj/item/reagent_containers/food/snacks/khachapuri
 	subcategory = CAT_MISCFOOD
 
-/datum/crafting_recipe/food/fudgedice
-	name = "Fudge dice"
+/datum/crafting_recipe/food/rawkhinkali
+	name = "Raw Khinkali"
 	reqs = list(
-		/obj/item/dice = 1,
-		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+		/obj/item/reagent_containers/food/snacks/doughslice = 1,
+		/obj/item/reagent_containers/food/snacks/faggot = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/fudgedice
+	result =  /obj/item/reagent_containers/food/snacks/rawkhinkali
 	subcategory = CAT_MISCFOOD
 
-/datum/crafting_recipe/food/chocoorange
-	name = "Choco orange"
+/datum/crafting_recipe/food/meatbun
+	name = "Meat bun"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
-		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+		/datum/reagent/consumable/soysauce = 5,
+		/obj/item/reagent_containers/food/snacks/bun = 1,
+		/obj/item/reagent_containers/food/snacks/faggot = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/chocoorange
+	result = /obj/item/reagent_containers/food/snacks/meatbun
 	subcategory = CAT_MISCFOOD
 
-/datum/crafting_recipe/food/loadedbakedpotato
-	name = "Loaded baked potato"
+/////////////////////////////////MISC/////////////////////////////////////
+
+/datum/crafting_recipe/food/beans
+	name = "Beans"
 	time = 40
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/grown/potato = 1,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 1
+	reqs = list(/datum/reagent/consumable/ketchup = 5,
+		/obj/item/reagent_containers/food/snacks/grown/soybeans = 2
 	)
-	result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
+	result = /obj/item/reagent_containers/food/snacks/beans
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/branrequests
+	name = "Bran Requests Cereal"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/grown/wheat = 1,
+		/obj/item/reagent_containers/food/snacks/no_raisin = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/branrequests
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/oatmeal
+	name = "Oatmeal"
+	reqs = list(
+		/datum/reagent/consumable/milk = 10,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/grown/oat = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/salad/oatmeal
 	subcategory = CAT_MISCFOOD
 
 /datum/crafting_recipe/food/cheesyfries
@@ -68,24 +83,6 @@
 	result = /obj/item/reagent_containers/food/snacks/cheesyfries
 	subcategory = CAT_MISCFOOD
 
-/datum/crafting_recipe/food/wrap
-	name = "Wrap"
-	reqs = list(/datum/reagent/consumable/soysauce = 10,
-		/obj/item/reagent_containers/food/snacks/friedegg = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
-	)
-	result = /obj/item/reagent_containers/food/snacks/eggwrap
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/beans
-	name = "Beans"
-	time = 40
-	reqs = list(/datum/reagent/consumable/ketchup = 5,
-		/obj/item/reagent_containers/food/snacks/grown/soybeans = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/beans
-	subcategory = CAT_MISCFOOD
-
 /datum/crafting_recipe/food/eggplantparm
 	name ="Eggplant parmigiana"
 	reqs = list(
@@ -95,91 +92,14 @@
 	result = /obj/item/reagent_containers/food/snacks/eggplantparm
 	subcategory = CAT_MISCFOOD
 
-/datum/crafting_recipe/food/baguette
-	name = "Baguette"
+/datum/crafting_recipe/food/loadedbakedpotato
+	name = "Loaded baked potato"
 	time = 40
-	reqs = list(/datum/reagent/consumable/sodiumchloride = 1,
-				/datum/reagent/consumable/blackpepper = 1,
-				/obj/item/reagent_containers/food/snacks/pastrybase = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/baguette
-	subcategory = CAT_MISCFOOD
-
-////////////////////////////////////////////////TOAST////////////////////////////////////////////////
-
-/datum/crafting_recipe/food/slimetoast
-	name = "Slime toast"
 	reqs = list(
-		/datum/reagent/toxin/slimejelly = 5,
-		/obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+		/obj/item/reagent_containers/food/snacks/grown/potato = 1,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/jelliedtoast
-	name = "Jellied toast"
-	reqs = list(
-		/datum/reagent/consumable/cherryjelly = 5,
-		/obj/item/reagent_containers/food/snacks/breadslice/plain = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/peanutbuttertoast
-	name = "Peanut butter toast"
-	reqs = list(
-		/datum/reagent/consumable/peanut_butter = 5,
-		/obj/item/reagent_containers/food/snacks/breadslice/plain = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/twobread
-	name = "Two bread"
-	reqs = list(
-		/datum/reagent/consumable/ethanol/wine = 5,
-		/obj/item/reagent_containers/food/snacks/breadslice/plain = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/twobread
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/burrito
-	name ="Burrito"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/tortilla = 1,
-		/obj/item/reagent_containers/food/snacks/grown/soybeans = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/burrito
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/cheesyburrito
-	name ="Cheesy burrito"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/tortilla = 1,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 2,
-		/obj/item/reagent_containers/food/snacks/grown/soybeans = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/cheesyburrito
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/carneburrito
-	name ="Carne de asada burrito"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/tortilla = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
-		/obj/item/reagent_containers/food/snacks/grown/soybeans = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/carneburrito
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/fuegoburrito
-	name ="Fuego plasma burrito"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/tortilla = 1,
-		/obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2,
-		/obj/item/reagent_containers/food/snacks/grown/soybeans = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/fuegoburrito
+	result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
 	subcategory = CAT_MISCFOOD
 
 /datum/crafting_recipe/food/melonfruitbowl
@@ -195,35 +115,6 @@
 	result = /obj/item/reagent_containers/food/snacks/melonfruitbowl
 	subcategory = CAT_MISCFOOD
 
-/datum/crafting_recipe/food/nachos
-	name ="Nachos"
-	reqs = list(
-		/datum/reagent/consumable/sodiumchloride = 1,
-		/obj/item/reagent_containers/food/snacks/tortilla = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/nachos
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/cheesynachos
-	name ="Cheesy nachos"
-	reqs = list(
-		/datum/reagent/consumable/sodiumchloride = 1,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/reagent_containers/food/snacks/tortilla = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/cheesynachos
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/cubannachos
-	name ="Cuban nachos"
-	reqs = list(
-		/datum/reagent/consumable/ketchup = 5,
-		/obj/item/reagent_containers/food/snacks/grown/chili = 2,
-		/obj/item/reagent_containers/food/snacks/tortilla = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/cubannachos
-	subcategory = CAT_MISCFOOD
-
 /datum/crafting_recipe/food/melonkeg
 	name ="Melon keg"
 	reqs = list(
@@ -235,16 +126,6 @@
 	result = /obj/item/reagent_containers/food/snacks/melonkeg
 	subcategory = CAT_MISCFOOD
 
-/datum/crafting_recipe/food/honeybar
-	name = "Honey nut bar"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/grown/oat = 1,
-		/datum/reagent/consumable/honey = 5
-	)
-	result = /obj/item/reagent_containers/food/snacks/honeybar
-	subcategory = CAT_MISCFOOD
-
-
 /datum/crafting_recipe/food/stuffedlegion
 	name = "Stuffed legion"
 	time = 40
@@ -257,7 +138,6 @@
 	result = /obj/item/reagent_containers/food/snacks/stuffedlegion
 	subcategory = CAT_MISCFOOD
 
-
 /datum/crafting_recipe/lizardwine //not a subtype of /datum/crafting_recipe/food due to a bug where the resulting bottle would contain 100u of lizardwine and 100u of ethanol.
 	name = "Lizard wine"
 	time = 40
@@ -269,7 +149,6 @@
 	category = CAT_FOOD
 	subcategory = CAT_MISCFOOD
 
-
 /datum/crafting_recipe/food/powercrepe
 	name = "Powercrepe"
 	time = 40
@@ -283,36 +162,6 @@
 	result = /obj/item/reagent_containers/food/snacks/powercrepe
 	subcategory = CAT_MISCFOOD
 
-/datum/crafting_recipe/food/taco
-	name ="Classic Taco"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/tortilla = 1,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
-	)
-	result = /obj/item/reagent_containers/food/snacks/taco
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/tacoplain
-	name ="Plain Taco"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/tortilla = 1,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
-	)
-	result = /obj/item/reagent_containers/food/snacks/taco/plain
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/branrequests
-	name = "Bran Requests Cereal"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/grown/wheat = 1,
-		/obj/item/reagent_containers/food/snacks/no_raisin = 1,
-	)
-	result = /obj/item/reagent_containers/food/snacks/branrequests
-	subcategory = CAT_MISCFOOD
-
 /datum/crafting_recipe/food/ricepudding
 	name = "Rice pudding"
 	reqs = list(
@@ -322,22 +171,3 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/salad/ricepudding
 	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/riceball
-	name = "Onigiri"
-	reqs = list(
-		/datum/reagent/consumable/soysauce = 1,
-		/obj/item/reagent_containers/food/snacks/grown/kudzupod = 1,
-		/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/riceball
-	subcategory = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/chocolatestrawberry
-	name = "Chocolate Strawberry"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
-		/obj/item/reagent_containers/food/snacks/grown/strawberry  = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry
-	subcategory = CAT_MISCFOOD

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

@@ -1,259 +1,108 @@
 // see code/module/crafting/table.dm
 
-////////////////////////////////////////////////DONUTS////////////////////////////////////////////////
+////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
 
-/datum/crafting_recipe/food/donut
+/datum/crafting_recipe/food/muffin
 	time = 15
-	name = "Donut"
+	name = "Muffin"
 	reqs = list(
-		/datum/reagent/consumable/sugar = 1,
+		/datum/reagent/consumable/milk = 5,
 		/obj/item/reagent_containers/food/snacks/pastrybase = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/plain
+	result = /obj/item/reagent_containers/food/snacks/muffin
 	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/donut/chaos
-	name = "Chaos donut"
+/datum/crafting_recipe/food/berrymuffin
+	name = "Berry muffin"
 	reqs = list(
-		/datum/reagent/consumable/frostoil = 5,
-		/datum/reagent/consumable/capsaicin = 5,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1
+		/datum/reagent/consumable/milk = 5,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/obj/item/reagent_containers/food/snacks/grown/berries = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/chaos
-
-datum/crafting_recipe/food/donut/meat
-	time = 15
-	name = "Meat donut"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/meat/slab = 1,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/donut/meat
-
-/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/plain
-
-/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/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
+	result = /obj/item/reagent_containers/food/snacks/muffin/berry
 	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/donut/berry
-	name = "Berry Donut"
+/datum/crafting_recipe/food/booberrymuffin
+	name = "Booberry muffin"
 	reqs = list(
-		/datum/reagent/consumable/berryjuice = 3,
-		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+		/datum/reagent/consumable/milk = 5,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/obj/item/reagent_containers/food/snacks/grown/berries = 1,
+		/obj/item/ectoplasm = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/berry
+	result = /obj/item/reagent_containers/food/snacks/muffin/booberry
+	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/donut/trumpet
-	name = "Spaceman's Donut"
+/datum/crafting_recipe/food/poppymuffin
+	name = "Poppy muffin"
 	reqs = list(
-		/datum/reagent/medicine/polypyr = 3,
-		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+		/datum/reagent/consumable/milk = 5,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1,
+		/obj/item/seeds/poppy = 1
 	)
+	result = /obj/item/reagent_containers/food/snacks/muffin/poppy
+	subcategory = CAT_PASTRY
 
-	result = /obj/item/reagent_containers/food/snacks/donut/trumpet
+////////////////////////////////////////////CUPCAKES////////////////////////////////////////////
 
-/datum/crafting_recipe/food/donut/apple
-	name = "Apple Donut"
+/datum/crafting_recipe/food/cherrycupcake
+	name = "Cherry cupcake"
 	reqs = list(
-		/datum/reagent/consumable/applejuice = 3,
-		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cherries = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/apple
+	result = /obj/item/reagent_containers/food/snacks/cherrycupcake
+	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/donut/caramel
-	name = "Caramel Donut"
+/datum/crafting_recipe/food/bluecherrycupcake
+	name = "Blue cherry cupcake"
 	reqs = list(
-		/datum/reagent/consumable/caramel = 3,
-		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/obj/item/reagent_containers/food/snacks/grown/bluecherries = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/caramel
+	result = /obj/item/reagent_containers/food/snacks/bluecherrycupcake
+	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/donut/choco
-	name = "Chocolate Donut"
+/datum/crafting_recipe/food/strawberrycupcake
+	name = "Strawberry cherry cupcake"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
-		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/obj/item/reagent_containers/food/snacks/grown/strawberry  = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/choco
+	result = /obj/item/reagent_containers/food/snacks/strawberrycupcake
+	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/donut/blumpkin
-	name = "Blumpkin Donut"
+////////////////////////////////////////////COOKIES////////////////////////////////////////////
+
+/datum/crafting_recipe/food/raisincookie
+	name = "Raisin cookie"
 	reqs = list(
-		/datum/reagent/consumable/blumpkinjuice = 3,
-		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+		/obj/item/reagent_containers/food/snacks/no_raisin = 1,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/obj/item/reagent_containers/food/snacks/grown/oat = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/blumpkin
+	result = /obj/item/reagent_containers/food/snacks/raisincookie
+	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/donut/bungo
-	name = "Bungo Donut"
+/datum/crafting_recipe/food/oatmealcookie
+	name = "Oatmeal cookie"
 	reqs = list(
-		/datum/reagent/consumable/bungojuice = 3,
-		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/obj/item/reagent_containers/food/snacks/grown/oat = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/donut/bungo
+	result = /obj/item/reagent_containers/food/snacks/oatmealcookie
+	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/donut/matcha
-	name = "Matcha Donut"
+/datum/crafting_recipe/food/sugarcookie
+	time = 15
+	name = "Sugar cookie"
 	reqs = list(
-		/datum/reagent/toxin/teapowder = 3,
-		/obj/item/reagent_containers/food/snacks/donut/plain = 1
+		/datum/reagent/consumable/sugar = 5,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 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(
-		/datum/reagent/consumable/bungojuice = 3,
-		/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(
-		/datum/reagent/consumable/bungojuice = 3,
-		/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
+	result = /obj/item/reagent_containers/food/snacks/sugarcookie
+	subcategory = CAT_PASTRY
 
 ////////////////////////////////////////////////WAFFLES AND PANCAKES////////////////////////////////////////////////
 
@@ -321,7 +170,6 @@ datum/crafting_recipe/food/donut/meat
 	result = /obj/item/reagent_containers/food/snacks/pancakes/chocolatechip
 	subcategory = CAT_PASTRY
 
-
 ////////////////////////////////////////////////DONKPOCCKETS////////////////////////////////////////////////
 
 /datum/crafting_recipe/food/donkpocket
@@ -344,92 +192,26 @@ datum/crafting_recipe/food/donut/meat
 	result = /obj/item/reagent_containers/food/snacks/dankpocket
 	subcategory = CAT_PASTRY
 
-////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
-
-/datum/crafting_recipe/food/muffin
-	time = 15
-	name = "Muffin"
-	reqs = list(
-		/datum/reagent/consumable/milk = 5,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/muffin
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/berrymuffin
-	name = "Berry muffin"
-	reqs = list(
-		/datum/reagent/consumable/milk = 5,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-		/obj/item/reagent_containers/food/snacks/grown/berries = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/muffin/berry
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/booberrymuffin
-	name = "Booberry muffin"
-	reqs = list(
-		/datum/reagent/consumable/milk = 5,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-		/obj/item/reagent_containers/food/snacks/grown/berries = 1,
-		/obj/item/ectoplasm = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/muffin/booberry
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/poppymuffin
-	name = "Poppy muffin"
-	reqs = list(
-		/datum/reagent/consumable/milk = 5,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-		/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1,
-		/obj/item/seeds/poppy = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/muffin/poppy
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/chawanmushi
-	name = "Chawanmushi"
-	reqs = list(
-		/datum/reagent/water = 5,
-		/datum/reagent/consumable/soysauce = 5,
-		/obj/item/reagent_containers/food/snacks/boiledegg = 2,
-		/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/chawanmushi
-	subcategory = CAT_PASTRY
-
 ////////////////////////////////////////////OTHER////////////////////////////////////////////
 
-/datum/crafting_recipe/food/meatbun
-	name = "Meat bun"
+/datum/crafting_recipe/food/chococornet
+	name = "Choco cornet"
 	reqs = list(
-		/datum/reagent/consumable/soysauce = 5,
-		/obj/item/reagent_containers/food/snacks/bun = 1,
-		/obj/item/reagent_containers/food/snacks/faggot = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
+		/datum/reagent/consumable/sodiumchloride = 1,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/meatbun
+	result = /obj/item/reagent_containers/food/snacks/chococornet
 	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/khachapuri
-	name = "Khachapuri"
-	reqs = list(
-		/datum/reagent/consumable/eggyolk = 5,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/khachapuri
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/sugarcookie
+/datum/crafting_recipe/food/cracker
 	time = 15
-	name = "Sugar cookie"
+	name = "Cracker"
 	reqs = list(
-		/datum/reagent/consumable/sugar = 5,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1
+		/datum/reagent/consumable/sodiumchloride = 1,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
 	)
-	result = /obj/item/reagent_containers/food/snacks/sugarcookie
+	result = /obj/item/reagent_containers/food/snacks/cracker
 	subcategory = CAT_PASTRY
 
 /datum/crafting_recipe/food/fortunecookie
@@ -445,6 +227,34 @@ datum/crafting_recipe/food/donut/meat
 	result = /obj/item/reagent_containers/food/snacks/fortunecookie
 	subcategory = CAT_PASTRY
 
+/datum/crafting_recipe/food/honeybun
+	name = "Honey bun"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/datum/reagent/consumable/honey = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/honeybun
+	subcategory = CAT_PASTRY
+
+/datum/crafting_recipe/food/hotcrossbun
+	name = "Hot-Cross Bun"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+		/datum/reagent/consumable/sugar = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/hotcrossbun
+	subcategory = CAT_PASTRY
+
+/datum/crafting_recipe/food/mammi
+	name = "Mammi"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+		/datum/reagent/consumable/milk = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/mammi
+	subcategory = CAT_PASTRY
+
 /datum/crafting_recipe/food/poppypretzel
 	time = 15
 	name = "Poppy pretzel"
@@ -465,78 +275,3 @@ datum/crafting_recipe/food/donut/meat
 	result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
 	subcategory = CAT_PASTRY
 
-/datum/crafting_recipe/food/cracker
-	time = 15
-	name = "Cracker"
-	reqs = list(
-		/datum/reagent/consumable/sodiumchloride = 1,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-	)
-	result = /obj/item/reagent_containers/food/snacks/cracker
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/chococornet
-	name = "Choco cornet"
-	reqs = list(
-		/datum/reagent/consumable/sodiumchloride = 1,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-		/obj/item/reagent_containers/food/snacks/chocolatebar = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/chococornet
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/oatmealcookie
-	name = "Oatmeal cookie"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-		/obj/item/reagent_containers/food/snacks/grown/oat = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/oatmealcookie
-	subcategory = CAT_PASTRY
-
-
-/datum/crafting_recipe/food/raisincookie
-	name = "Raisin cookie"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/no_raisin = 1,
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-		/obj/item/reagent_containers/food/snacks/grown/oat = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/raisincookie
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/cherrycupcake
-	name = "Cherry cupcake"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cherries = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/cherrycupcake
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/bluecherrycupcake
-	name = "Blue cherry cupcake"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-		/obj/item/reagent_containers/food/snacks/grown/bluecherries = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/bluecherrycupcake
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/strawberrycupcake
-	name = "Strawberry cherry cupcake"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-		/obj/item/reagent_containers/food/snacks/grown/strawberry  = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/strawberrycupcake
-	subcategory = CAT_PASTRY
-
-/datum/crafting_recipe/food/honeybun
-	name = "Honey bun"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
-		/datum/reagent/consumable/honey = 5
-	)
-	result = /obj/item/reagent_containers/food/snacks/honeybun
-	subcategory = CAT_PASTRY

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

@@ -1,7 +1,16 @@
 
 // see code/module/crafting/table.dm
 
-////////////////////////////////////////////////PIES////////////////////////////////////////////////
+//////////////////////////////////FRUITS/////////////////////////////////////////
+
+/datum/crafting_recipe/food/applepie
+	name = "Apple pie"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/apple = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pie/applepie
+	subcategory = CAT_PIE
 
 /datum/crafting_recipe/food/bananacreampie
 	name = "Banana cream pie"
@@ -13,33 +22,13 @@
 	result = /obj/item/reagent_containers/food/snacks/pie/cream
 	subcategory = CAT_PIE
 
-/datum/crafting_recipe/food/meatpie
-	name = "Meat pie"
-	reqs = list(
-		/datum/reagent/consumable/blackpepper = 1,
-		/datum/reagent/consumable/sodiumchloride = 1,
-		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/meat/steak/plain = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pie/meatpie
-	subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/tofupie
-	name = "Tofu pie"
+/datum/crafting_recipe/food/berryclafoutis
+	name = "Berry clafoutis"
 	reqs = list(
 		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/tofu = 1
+		/obj/item/reagent_containers/food/snacks/grown/berries = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/pie/tofupie
-	subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/xenopie
-	name = "Xeno pie"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pie/xemeatpie
+	result = /obj/item/reagent_containers/food/snacks/pie/berryclafoutis
 	subcategory = CAT_PIE
 
 /datum/crafting_recipe/food/cherrypie
@@ -51,13 +40,53 @@
 	result = /obj/item/reagent_containers/food/snacks/pie/cherrypie
 	subcategory = CAT_PIE
 
-/datum/crafting_recipe/food/berryclafoutis
-	name = "Berry clafoutis"
+/datum/crafting_recipe/food/frostypie
+	name = "Frosty pie"
 	reqs = list(
 		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/berries = 1
+		/obj/item/reagent_containers/food/snacks/grown/bluecherries = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/pie/berryclafoutis
+	result = /obj/item/reagent_containers/food/snacks/pie/frostypie
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/grapetart
+	name = "Grape tart"
+	reqs = list(
+			/datum/reagent/consumable/milk = 5,
+			/datum/reagent/consumable/sugar = 5,
+			/obj/item/reagent_containers/food/snacks/pie/plain = 1,
+			/obj/item/reagent_containers/food/snacks/grown/grapes = 3
+			)
+	result = /obj/item/reagent_containers/food/snacks/pie/grapetart
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/peachpie
+	name = "Peach Pie"
+	reqs = list(
+			/obj/item/reagent_containers/food/snacks/pie/plain = 1,
+			/obj/item/reagent_containers/food/snacks/grown/peach = 3
+			)
+	result = /obj/item/reagent_containers/food/snacks/pie/peachpie
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/strawberrypie
+	name = "Strawberry pie"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/strawberry  = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pie/strawberrypie
+	subcategory = CAT_PIE
+
+//////////OTHER PIES/////////
+
+/datum/crafting_recipe/food/amanitapie
+	name = "Amanita pie"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pie/amanita_pie
 	subcategory = CAT_PIE
 
 /datum/crafting_recipe/food/bearypie
@@ -70,64 +99,14 @@
 	result = /obj/item/reagent_containers/food/snacks/pie/bearypie
 	subcategory = CAT_PIE
 
-/datum/crafting_recipe/food/amanitapie
-	name = "Amanita pie"
+/datum/crafting_recipe/food/baklava
+	name = "Baklava pie"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 1
+		/obj/item/reagent_containers/food/snacks/butter = 1,
+		/obj/item/reagent_containers/food/snacks/tortilla = 4,	//Layers
+		/obj/item/seeds/wheat/oat = 3
 	)
-	result = /obj/item/reagent_containers/food/snacks/pie/amanita_pie
-	subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/plumppie
-	name = "Plump pie"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pie/plump_pie
-	subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/applepie
-	name = "Apple pie"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/apple = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pie/applepie
-	subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/pumpkinpie
-	name = "Pumpkin pie"
-	reqs = list(
-		/datum/reagent/consumable/milk = 5,
-		/datum/reagent/consumable/sugar = 5,
-		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/pumpkin = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pie/pumpkinpie
-	subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/goldenappletart
-	name = "Golden apple tart"
-	reqs = list(
-		/datum/reagent/consumable/milk = 5,
-		/datum/reagent/consumable/sugar = 5,
-		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/apple/gold = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pie/appletart
-	subcategory = CAT_PIE
-
-/datum/crafting_recipe/food/grapetart
-	name = "Grape tart"
-	reqs = list(
-			/datum/reagent/consumable/milk = 5,
-			/datum/reagent/consumable/sugar = 5,
-			/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-			/obj/item/reagent_containers/food/snacks/grown/grapes = 3
-			)
-	result = /obj/item/reagent_containers/food/snacks/pie/grapetart
+	result = /obj/item/reagent_containers/food/snacks/pie/baklava
 	subcategory = CAT_PIE
 
 /datum/crafting_recipe/food/blumpkinpie
@@ -151,32 +130,66 @@
 	result = /obj/item/reagent_containers/food/snacks/pie/dulcedebatata
 	subcategory = CAT_PIE
 
-/datum/crafting_recipe/food/frostypie
-	name = "Frosty pie"
+/datum/crafting_recipe/food/meatpie
+	name = "Meat pie"
 	reqs = list(
+		/datum/reagent/consumable/blackpepper = 1,
+		/datum/reagent/consumable/sodiumchloride = 1,
 		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/bluecherries = 1
+		/obj/item/reagent_containers/food/snacks/meat/steak/plain = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/pie/frostypie
+	result = /obj/item/reagent_containers/food/snacks/pie/meatpie
 	subcategory = CAT_PIE
 
-/datum/crafting_recipe/food/strawberrypie
-	name = "Strawberry pie"
+/datum/crafting_recipe/food/plumppie
+	name = "Plump pie"
 	reqs = list(
 		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-		/obj/item/reagent_containers/food/snacks/grown/strawberry  = 1
+		/obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/pie/strawberrypie
+	result = /obj/item/reagent_containers/food/snacks/pie/plump_pie
 	subcategory = CAT_PIE
 
-/datum/crafting_recipe/food/baklava
-	name = "Baklava pie"
+/datum/crafting_recipe/food/pumpkinpie
+	name = "Pumpkin pie"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/butter = 1,
-		/obj/item/reagent_containers/food/snacks/tortilla = 4,	//Layers
-		/obj/item/seeds/wheat/oat = 3
+		/datum/reagent/consumable/milk = 5,
+		/datum/reagent/consumable/sugar = 5,
+		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/pumpkin = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/pie/baklava
+	result = /obj/item/reagent_containers/food/snacks/pie/pumpkinpie
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/tofupie
+	name = "Tofu pie"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
+		/obj/item/reagent_containers/food/snacks/tofu = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pie/tofupie
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/xenopie
+	name = "Xeno pie"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pie/xemeatpie
+	subcategory = CAT_PIE
+
+//////////////TARTS//////////////
+
+/datum/crafting_recipe/food/goldenappletart
+	name = "Golden apple tart"
+	reqs = list(
+		/datum/reagent/consumable/milk = 5,
+		/datum/reagent/consumable/sugar = 5,
+		/obj/item/reagent_containers/food/snacks/pie/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/apple/gold = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pie/appletart
 	subcategory = CAT_PIE
 
 /datum/crafting_recipe/food/mimetart
@@ -216,11 +229,77 @@
 	result = /obj/item/reagent_containers/food/snacks/pie/cocolavatart
 	subcategory = CAT_PIE
 
-/datum/crafting_recipe/food/peachpie
-	name = "Peach Pie"
+////////////////////////////////////////////SWEETS////////////////////////////////////////////
+
+/datum/crafting_recipe/food/candiedapple
+	name = "Candied apple"
+	reqs = list(/datum/reagent/water = 5,
+		/datum/reagent/consumable/sugar = 5,
+		/obj/item/reagent_containers/food/snacks/grown/apple = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/candiedapple
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/chococoin
+	name = "Choco coin"
 	reqs = list(
-			/obj/item/reagent_containers/food/snacks/pie/plain = 1,
-			/obj/item/reagent_containers/food/snacks/grown/peach = 3
-			)
-	result = /obj/item/reagent_containers/food/snacks/pie/peachpie
+		/obj/item/coin = 1,
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/chococoin
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/chocoorange
+	name = "Choco orange"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/chocoorange
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/chocolatebunny
+	name = "Chocolate bunny"
+	reqs = list(
+		/datum/reagent/consumable/sugar = 2,
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/chocolatebunny
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/chocolatestrawberry
+	name = "Chocolate Strawberry"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+		/obj/item/reagent_containers/food/snacks/grown/strawberry  = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/fudgedice
+	name = "Fudge dice"
+	reqs = list(
+		/obj/item/dice = 1,
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/fudgedice
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/honeybar
+	name = "Honey nut bar"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/grown/oat = 1,
+		/datum/reagent/consumable/honey = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/honeybar
+	subcategory = CAT_PIE
+
+/datum/crafting_recipe/food/spiderlollipop
+	name = "Spider Lollipop"
+	reqs = list(/obj/item/stack/rods = 1,
+		/datum/reagent/consumable/sugar = 5,
+		/datum/reagent/water = 5,
+		/obj/item/reagent_containers/food/snacks/spiderling = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/spiderlollipop
 	subcategory = CAT_PIE

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

@@ -3,6 +3,40 @@
 
 ////////////////////////////////////////////////PIZZA!!!////////////////////////////////////////////////
 
+/datum/crafting_recipe/food/dankpizza
+	name = "Dank pizza"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pizzabread = 1,
+		/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pizza/dank
+	subcategory = CAT_PIZZA
+
+/datum/crafting_recipe/food/donkpocketpizza
+	name = "Donkpocket pizza"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pizzabread = 1,
+		/obj/item/reagent_containers/food/snacks/donkpocket/warm = 3,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pizza/donkpocket
+	subcategory = CAT_PIZZA
+
+/datum/crafting_recipe/food/pineapplepizza
+	name = "Hawaiian pizza"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pizzabread = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+		/obj/item/reagent_containers/food/snacks/pineappleslice = 3,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pizza/pineapple
+	subcategory = CAT_PIZZA
+
 /datum/crafting_recipe/food/margheritapizza
 	name = "Margherita pizza"
 	reqs = list(
@@ -24,18 +58,6 @@
 	result = /obj/item/reagent_containers/food/snacks/pizza/meat
 	subcategory = CAT_PIZZA
 
-/datum/crafting_recipe/food/arnold
-	name = "Arnold pizza"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pizzabread = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet = 3,
-		/obj/item/ammo_casing/c9mm = 8,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pizza/arnold
-	subcategory = CAT_PIZZA
-
 /datum/crafting_recipe/food/mushroompizza
 	name = "Mushroom pizza"
 	reqs = list(
@@ -45,6 +67,17 @@
 	result = /obj/item/reagent_containers/food/snacks/pizza/mushroom
 	subcategory = CAT_PIZZA
 
+/datum/crafting_recipe/food/sassysagepizza
+	name = "Sassysage pizza"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pizzabread = 1,
+		/obj/item/reagent_containers/food/snacks/faggot = 3,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pizza/sassysage
+	subcategory = CAT_PIZZA
+
 /datum/crafting_recipe/food/vegetablepizza
 	name = "Vegetable pizza"
 	reqs = list(
@@ -57,50 +90,7 @@
 	result = /obj/item/reagent_containers/food/snacks/pizza/vegetable
 	subcategory = CAT_PIZZA
 
-/datum/crafting_recipe/food/donkpocketpizza
-	name = "Donkpocket pizza"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pizzabread = 1,
-		/obj/item/reagent_containers/food/snacks/donkpocket/warm = 3,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pizza/donkpocket
-	subcategory = CAT_PIZZA
-
-/datum/crafting_recipe/food/dankpizza
-	name = "Dank pizza"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pizzabread = 1,
-		/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pizza/dank
-	subcategory = CAT_PIZZA
-
-/datum/crafting_recipe/food/sassysagepizza
-	name = "Sassysage pizza"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pizzabread = 1,
-		/obj/item/reagent_containers/food/snacks/faggot = 3,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pizza/sassysage
-	subcategory = CAT_PIZZA
-
-/datum/crafting_recipe/food/pineapplepizza
-	name = "Hawaiian pizza"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/pizzabread = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
-		/obj/item/reagent_containers/food/snacks/pineappleslice = 3,
-		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/pizza/pineapple
-	subcategory = CAT_PIZZA
+//////Special Pizzas/////
 
 /datum/crafting_recipe/food/pineapplepizza/anomaly
 	name = "Anomaly Hawaiian pizza"
@@ -120,3 +110,15 @@
 	tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
 	result = /obj/item/pizzabox/infinite
 	subcategory = CAT_PIZZA
+
+/datum/crafting_recipe/food/arnold
+	name = "Arnold pizza"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/pizzabread = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 3,
+		/obj/item/ammo_casing/c9mm = 8,
+		/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pizza/arnold
+	subcategory = CAT_PIZZA

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

@@ -3,16 +3,6 @@
 
 ////////////////////////////////////////////////SALADS////////////////////////////////////////////////
 
-/datum/crafting_recipe/food/herbsalad
-	name = "Herb salad"
-	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
-		/obj/item/reagent_containers/food/snacks/grown/apple = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/salad/herbsalad
-	subcategory = CAT_SALAD
-
 /datum/crafting_recipe/food/aesirsalad
 	name = "Aesir salad"
 	reqs = list(
@@ -23,38 +13,16 @@
 	result = /obj/item/reagent_containers/food/snacks/salad/aesirsalad
 	subcategory = CAT_SALAD
 
-/datum/crafting_recipe/food/validsalad
-	name = "Valid salad"
+/datum/crafting_recipe/food/citrusdelight
+	name = "Citrus delight"
 	reqs = list(
 		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
-		/obj/item/reagent_containers/food/snacks/grown/potato = 1,
-		/obj/item/reagent_containers/food/snacks/faggot = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/salad/validsalad
-	subcategory = CAT_SALAD
+		/obj/item/reagent_containers/food/snacks/grown/citrus/lime = 1,
+		/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1,
+		/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1
 
-/datum/crafting_recipe/food/monkeysdelight
-	name = "Monkeys delight"
-	reqs = list(
-		/datum/reagent/consumable/flour = 5,
-		/datum/reagent/consumable/sodiumchloride = 1,
-		/datum/reagent/consumable/blackpepper = 1,
-		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/monkeycube = 1,
-		/obj/item/reagent_containers/food/snacks/grown/banana = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/soup/monkeysdelight
-	subcategory = CAT_SALAD
-
-/datum/crafting_recipe/food/oatmeal
-	name = "Oatmeal"
-	reqs = list(
-		/datum/reagent/consumable/milk = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/oat = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/salad/oatmeal
+	result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight
 	subcategory = CAT_SALAD
 
 /datum/crafting_recipe/food/fruitsalad
@@ -70,6 +38,16 @@
 	result = /obj/item/reagent_containers/food/snacks/salad/fruit
 	subcategory = CAT_SALAD
 
+/datum/crafting_recipe/food/herbsalad
+	name = "Herb salad"
+	reqs = list(
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
+		/obj/item/reagent_containers/food/snacks/grown/apple = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/salad/herbsalad
+	subcategory = CAT_SALAD
+
 /datum/crafting_recipe/food/junglesalad
 	name = "Jungle salad"
 	reqs = list(
@@ -83,14 +61,26 @@
 	result = /obj/item/reagent_containers/food/snacks/salad/jungle
 	subcategory = CAT_SALAD
 
-/datum/crafting_recipe/food/citrusdelight
-	name = "Citrus delight"
+/datum/crafting_recipe/food/monkeysdelight
+	name = "Monkeys delight"
+	reqs = list(
+		/datum/reagent/consumable/flour = 5,
+		/datum/reagent/consumable/sodiumchloride = 1,
+		/datum/reagent/consumable/blackpepper = 1,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/monkeycube = 1,
+		/obj/item/reagent_containers/food/snacks/grown/banana = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/monkeysdelight
+	subcategory = CAT_SALAD
+
+/datum/crafting_recipe/food/validsalad
+	name = "Valid salad"
 	reqs = list(
 		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/citrus/lime = 1,
-		/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1,
-		/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1
-
+		/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
+		/obj/item/reagent_containers/food/snacks/grown/potato = 1,
+		/obj/item/reagent_containers/food/snacks/faggot = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight
+	result = /obj/item/reagent_containers/food/snacks/salad/validsalad
 	subcategory = CAT_SALAD

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

@@ -84,7 +84,6 @@
 	result = /obj/item/reagent_containers/food/snacks/peanutbutter_sandwich
 	subcategory = CAT_SANDWICH
 
-
 /datum/crafting_recipe/food/notasandwich
 	name = "Not a sandwich"
 	reqs = list(
@@ -113,4 +112,4 @@
 		/obj/item/reagent_containers/food/snacks/sausage = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/hotdog
-	subcategory = CAT_SANDWICH
+	subcategory = CAT_SANDWICH //I don't agree with this.

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

@@ -1,4 +1,6 @@
-//////////////////////////Sushi Components///////////////////////
+// see code/module/crafting/table.dm
+
+///////////////////////Sushi Components///////////////////////////
 
 /datum/crafting_recipe/food/sushi_rice
 	name = "Sushi Rice"
@@ -7,7 +9,7 @@
 		/datum/reagent/consumable/rice = 10
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_rice
-	subcategory = CAT_FISH
+	subcategory = CAT_SEAFOOD
 
 /datum/crafting_recipe/food/sea_weed
 	name = "Sea Weed Sheet"
@@ -17,17 +19,7 @@
 		/obj/item/reagent_containers/food/snacks/grown/kudzupod = 1,
 	)
 	result = /obj/item/reagent_containers/food/snacks/sea_weed
-	subcategory = CAT_FISH
-
-/datum/crafting_recipe/food/tuna_can
-	name = "Can of Tuna"
-	reqs = list(
-		/datum/reagent/consumable/sodiumchloride = 15,
-		/datum/reagent/consumable/cooking_oil = 5,
-		/obj/item/reagent_containers/food/snacks/carpmeat = 1,
-	)
-	result = /obj/item/reagent_containers/food/snacks/tuna
-	subcategory = CAT_FISH
+	subcategory = CAT_SEAFOOD
 
 //////////////////////////Sushi/////////////////////////////////
 
@@ -39,7 +31,7 @@
 		/obj/item/reagent_containers/food/snacks/carpmeat = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/sashimi
-	subcategory = CAT_FISH
+	subcategory = CAT_SEAFOOD
 
 /datum/crafting_recipe/food/riceball
 	name = "Onigiri"
@@ -49,7 +41,7 @@
 		/obj/item/reagent_containers/food/snacks/sushi_rice = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/riceball
-	subcategory = CAT_FISH
+	subcategory = CAT_SEAFOOD
 
 /datum/crafting_recipe/food/sushie_egg
 	name = "Tobiko"
@@ -59,7 +51,7 @@
 		/obj/item/reagent_containers/food/snacks/sea_weed = 2,
 	)
 	result = /obj/item/reagent_containers/food/snacks/tobiko
-	subcategory = CAT_FISH
+	subcategory = CAT_SEAFOOD
 
 /datum/crafting_recipe/food/sushie_basic
 	name = "Funa Hosomaki"
@@ -70,7 +62,7 @@
 		/obj/item/reagent_containers/food/snacks/sea_weed = 3,
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushie_basic
-	subcategory = CAT_FISH
+	subcategory = CAT_SEAFOOD
 
 /datum/crafting_recipe/food/sushie_adv
 	name = "Funa Nigiri"
@@ -80,7 +72,7 @@
 		/obj/item/reagent_containers/food/snacks/carpmeat = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushie_adv
-	subcategory = CAT_FISH
+	subcategory = CAT_SEAFOOD
 
 /datum/crafting_recipe/food/sushie_pro
 	name = "Well made Funa Nigiri"
@@ -91,19 +83,19 @@
 		/obj/item/reagent_containers/food/snacks/sea_weed = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushie_pro
-	subcategory = CAT_FISH
+	subcategory = CAT_SEAFOOD
 
-///////////////Gaijin junk/////////////////////////////////////
+//////////////////////////////////////////////FISH///////////////////////////////////////////
 
-/datum/crafting_recipe/food/fishfingers
-	name = "Fish fingers"
+/datum/crafting_recipe/food/tuna_can
+	name = "Can of Tuna"
 	reqs = list(
-		/datum/reagent/consumable/flour = 5,
-		/obj/item/reagent_containers/food/snacks/bun = 1,
-		/obj/item/reagent_containers/food/snacks/carpmeat = 1
+		/datum/reagent/consumable/sodiumchloride = 15,
+		/datum/reagent/consumable/cooking_oil = 5,
+		/obj/item/reagent_containers/food/snacks/carpmeat = 1,
 	)
-	result = /obj/item/reagent_containers/food/snacks/fishfingers
-	subcategory = CAT_FISH
+	result = /obj/item/reagent_containers/food/snacks/tuna
+	subcategory = CAT_SEAFOOD
 
 /datum/crafting_recipe/food/cubancarp
 	name = "Cuban carp"
@@ -113,7 +105,17 @@
 		/obj/item/reagent_containers/food/snacks/carpmeat = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/cubancarp
-	subcategory = CAT_FISH
+	subcategory = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/fishfingers
+	name = "Fish fingers"
+	reqs = list(
+		/datum/reagent/consumable/flour = 5,
+		/obj/item/reagent_containers/food/snacks/bun = 1,
+		/obj/item/reagent_containers/food/snacks/carpmeat = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/fishfingers
+	subcategory = CAT_SEAFOOD
 
 /datum/crafting_recipe/food/fishandchips
 	name = "Fish and chips"
@@ -122,4 +124,4 @@
 		/obj/item/reagent_containers/food/snacks/carpmeat = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/fishandchips
-	subcategory = CAT_FISH
+	subcategory = CAT_SEAFOOD

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

@@ -3,71 +3,46 @@
 
 ////////////////////////////////////////////////SOUP////////////////////////////////////////////////
 
-/datum/crafting_recipe/food/meatballsoup
-	name = "Meatball soup"
+/datum/crafting_recipe/food/amanitajelly
+	name = "Amanita jelly"
+	reqs = list(
+		/datum/reagent/consumable/ethanol/vodka = 5,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 3
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly
+	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/beetsoup
+	name = "Beet soup"
 	reqs = list(
 		/datum/reagent/water = 10,
 		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/faggot = 1,
-		/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
-		/obj/item/reagent_containers/food/snacks/grown/potato = 1
+		/obj/item/reagent_containers/food/snacks/grown/whitebeet = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
 	)
-	result = /obj/item/reagent_containers/food/snacks/soup/meatball
+	result = /obj/item/reagent_containers/food/snacks/soup/beet
 	subcategory = CAT_SOUP
 
-/datum/crafting_recipe/food/vegetablesoup
-	name = "Vegetable soup"
+/datum/crafting_recipe/food/bloodsoup
+	name = "Blood soup"
+	reqs = list(
+		/datum/reagent/blood = 10,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/grown/tomato/blood = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/blood
+	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/clownstears
+	name = "Clowns tears"
 	reqs = list(
 		/datum/reagent/water = 10,
 		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
-		/obj/item/reagent_containers/food/snacks/grown/corn = 1,
-		/obj/item/reagent_containers/food/snacks/grown/eggplant = 1,
-		/obj/item/reagent_containers/food/snacks/grown/potato = 1
+		/obj/item/reagent_containers/food/snacks/grown/banana = 1,
+		/obj/item/stack/ore/bananium = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/soup/vegetable
-	subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/nettlesoup
-	name = "Nettle soup"
-	reqs = list(
-		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/nettle = 1,
-		/obj/item/reagent_containers/food/snacks/grown/potato = 1,
-		/obj/item/reagent_containers/food/snacks/boiledegg = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/soup/nettle
-	subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/wingfangchu
-	name = "Wingfangchu"
-	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
-		/datum/reagent/consumable/soysauce = 5,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/soup/wingfangchu
-	subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/wishsoup
-	name = "Wish soup"
-	reqs = list(
-		/datum/reagent/water = 20,
-		/obj/item/reagent_containers/glass/bowl = 1
-	)
-	result= /obj/item/reagent_containers/food/snacks/soup/wish
-	subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/hotchili
-	name = "Hot chili"
-	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
-		/obj/item/reagent_containers/food/snacks/grown/chili = 1,
-		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/soup/hotchili
+	result = /obj/item/reagent_containers/food/snacks/soup/clownstears
 	subcategory = CAT_SOUP
 
 /datum/crafting_recipe/food/coldchili
@@ -81,16 +56,6 @@
 	result = /obj/item/reagent_containers/food/snacks/soup/coldchili
 	subcategory = CAT_SOUP
 
-/datum/crafting_recipe/food/tomatosoup
-	name = "Tomato soup"
-	reqs = list(
-		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/tomato = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/soup/tomato
-	subcategory = CAT_SOUP
-
 /datum/crafting_recipe/food/eyeballsoup
 	name = "Eyeball soup"
 	reqs = list(
@@ -102,6 +67,28 @@
 	result = /obj/item/reagent_containers/food/snacks/soup/tomato/eyeball
 	subcategory = CAT_SOUP
 
+/datum/crafting_recipe/food/hotchili
+	name = "Hot chili"
+	reqs = list(
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
+		/obj/item/reagent_containers/food/snacks/grown/chili = 1,
+		/obj/item/reagent_containers/food/snacks/grown/tomato = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/hotchili
+	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/meatballsoup
+	name = "Meatball soup"
+	reqs = list(
+		/datum/reagent/water = 10,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/faggot = 1,
+		/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
+		/obj/item/reagent_containers/food/snacks/grown/potato = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/meatball
+	subcategory = CAT_SOUP
 
 /datum/crafting_recipe/food/milosoup
 	name = "Milo soup"
@@ -114,35 +101,15 @@
 	result = /obj/item/reagent_containers/food/snacks/soup/milo
 	subcategory = CAT_SOUP
 
-/datum/crafting_recipe/food/bloodsoup
-	name = "Blood soup"
+/datum/crafting_recipe/food/mushroomsoup
+	name = "Mushroom soup"
 	reqs = list(
-		/datum/reagent/blood = 10,
+		/datum/reagent/consumable/milk = 5,
+		/datum/reagent/water = 5,
 		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/tomato/blood = 2
+		/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/soup/blood
-	subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/slimesoup
-	name = "Slime soup"
-	reqs = list(
-			/datum/reagent/water = 10,
-			/datum/reagent/toxin/slimejelly = 5,
-			/obj/item/reagent_containers/glass/bowl = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/soup/slime
-	subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/clownstears
-	name = "Clowns tears"
-	reqs = list(
-		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/banana = 1,
-		/obj/item/stack/ore/bananium = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/soup/clownstears
+	result = /obj/item/reagent_containers/food/snacks/soup/mushroom
 	subcategory = CAT_SOUP
 
 /datum/crafting_recipe/food/mysterysoup
@@ -158,26 +125,37 @@
 	result = /obj/item/reagent_containers/food/snacks/soup/mystery
 	subcategory = CAT_SOUP
 
-/datum/crafting_recipe/food/mushroomsoup
-	name = "Mushroom soup"
-	reqs = list(
-		/datum/reagent/consumable/milk = 5,
-		/datum/reagent/water = 5,
-		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/soup/mushroom
-	subcategory = CAT_SOUP
-
-/datum/crafting_recipe/food/beetsoup
-	name = "Beet soup"
+/datum/crafting_recipe/food/nettlesoup
+	name = "Nettle soup"
 	reqs = list(
 		/datum/reagent/water = 10,
 		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/whitebeet = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
+		/obj/item/reagent_containers/food/snacks/grown/nettle = 1,
+		/obj/item/reagent_containers/food/snacks/grown/potato = 1,
+		/obj/item/reagent_containers/food/snacks/boiledegg = 1
 	)
-	result = /obj/item/reagent_containers/food/snacks/soup/beet
+	result = /obj/item/reagent_containers/food/snacks/soup/nettle
+	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/redbeetsoup
+	name = "Red beet soup"
+	reqs = list(
+		/datum/reagent/water = 10,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/grown/redbeet = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/beet/red
+	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/slimesoup
+	name = "Slime soup"
+	reqs = list(
+			/datum/reagent/water = 10,
+			/datum/reagent/toxin/slimejelly = 5,
+			/obj/item/reagent_containers/glass/bowl = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/slime
 	subcategory = CAT_SOUP
 
 /datum/crafting_recipe/food/stew
@@ -205,16 +183,6 @@
 	result = /obj/item/reagent_containers/food/snacks/soup/spacylibertyduff
 	subcategory = CAT_SOUP
 
-/datum/crafting_recipe/food/amanitajelly
-	name = "Amanita jelly"
-	reqs = list(
-		/datum/reagent/consumable/ethanol/vodka = 5,
-		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 3
-	)
-	result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly
-	subcategory = CAT_SOUP
-
 /datum/crafting_recipe/food/sweetpotatosoup
 	name = "Sweet potato soup"
 	reqs = list(
@@ -226,13 +194,44 @@
 	result = /obj/item/reagent_containers/food/snacks/soup/sweetpotato
 	subcategory = CAT_SOUP
 
-/datum/crafting_recipe/food/redbeetsoup
-	name = "Red beet soup"
+/datum/crafting_recipe/food/tomatosoup
+	name = "Tomato soup"
 	reqs = list(
 		/datum/reagent/water = 10,
 		/obj/item/reagent_containers/glass/bowl = 1,
-		/obj/item/reagent_containers/food/snacks/grown/redbeet = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
+		/obj/item/reagent_containers/food/snacks/grown/tomato = 2
 	)
-	result = /obj/item/reagent_containers/food/snacks/soup/beet/red
+	result = /obj/item/reagent_containers/food/snacks/soup/tomato
 	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/vegetablesoup
+	name = "Vegetable soup"
+	reqs = list(
+		/datum/reagent/water = 10,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
+		/obj/item/reagent_containers/food/snacks/grown/corn = 1,
+		/obj/item/reagent_containers/food/snacks/grown/eggplant = 1,
+		/obj/item/reagent_containers/food/snacks/grown/potato = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/vegetable
+	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/wingfangchu
+	name = "Wingfangchu"
+	reqs = list(
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/datum/reagent/consumable/soysauce = 5,
+		/obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/wingfangchu
+	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/wishsoup
+	name = "Wish soup"
+	reqs = list(
+		/datum/reagent/water = 20,
+		/obj/item/reagent_containers/glass/bowl = 1
+	)
+	result= /obj/item/reagent_containers/food/snacks/soup/wish
+	subcategory = CAT_SOUP

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

@@ -3,15 +3,6 @@
 
 ////////////////////////////////////////////////SPAGHETTI////////////////////////////////////////////////
 
-/datum/crafting_recipe/food/tomatopasta
-	name = "Tomato pasta"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/boiledspaghetti = 1,
-		/obj/item/reagent_containers/food/snacks/grown/tomato = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/pastatomato
-	subcategory = CAT_SPAGHETTI
-
 /datum/crafting_recipe/food/copypasta
 	name = "Copypasta"
 	reqs = list(
@@ -38,6 +29,17 @@
 	result = /obj/item/reagent_containers/food/snacks/spesslaw
 	subcategory = CAT_SPAGHETTI
 
+/datum/crafting_recipe/food/tomatopasta
+	name = "Tomato pasta"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledspaghetti = 1,
+		/obj/item/reagent_containers/food/snacks/grown/tomato = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/pastatomato
+	subcategory = CAT_SPAGHETTI
+
+////////////NOODLES///////////
+
 /datum/crafting_recipe/food/beefnoodle
 	name = "Beef noodle"
 	reqs = list(

code/modules/holiday/easter.dm

@@ -140,96 +140,8 @@
 		containsPrize = FALSE
 		qdel(src)
 
-//Easter Recipes + food
-/obj/item/reagent_containers/food/snacks/hotcrossbun
-	bitesize = 2
-	name = "hot-cross bun"
-	desc = "The Cross represents the Assistants that died for your sins."
-	icon_state = "hotcrossbun"
-
-/datum/crafting_recipe/food/hotcrossbun
-	name = "Hot-Cross Bun"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
-		/datum/reagent/consumable/sugar = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/hotcrossbun
-	category = CAT_MISCFOOD
-
-
-/obj/item/reagent_containers/food/snacks/store/cake/brioche
-	name = "brioche cake"
-	desc = "A ring of sweet, glazed buns."
-	icon_state = "briochecake"
-	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche
-	slices_num = 6
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
-
-/obj/item/reagent_containers/food/snacks/cakeslice/brioche
-	name = "brioche cake slice"
-	desc = "Delicious sweet-bread. Who needs anything else?"
-	icon_state = "briochecake_slice"
-	filling_color = "#FFD700"
-
-/datum/crafting_recipe/food/briochecake
-	name = "Brioche cake"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
-		/datum/reagent/consumable/sugar = 2
-	)
-	result = /obj/item/reagent_containers/food/snacks/store/cake/brioche
-	category = CAT_MISCFOOD
-
-/obj/item/reagent_containers/food/snacks/scotchegg
-	name = "scotch egg"
-	desc = "A boiled egg wrapped in a delicious, seasoned meatball."
-	icon_state = "scotchegg"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
-	bitesize = 3
-	filling_color = "#FFFFF0"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
-
-/datum/crafting_recipe/food/scotchegg
-	name = "Scotch egg"
-	reqs = list(
-		/datum/reagent/consumable/sodiumchloride = 1,
-		/datum/reagent/consumable/blackpepper = 1,
-		/obj/item/reagent_containers/food/snacks/boiledegg = 1,
-		/obj/item/reagent_containers/food/snacks/faggot = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/scotchegg
-	category = CAT_MISCFOOD
-
-/obj/item/reagent_containers/food/snacks/soup/mammi
-	name = "Mammi"
-	desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement."
-	icon_state = "mammi"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
-
-/datum/crafting_recipe/food/mammi
-	name = "Mammi"
-	reqs = list(
-		/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
-		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
-		/datum/reagent/consumable/milk = 5
-	)
-	result = /obj/item/reagent_containers/food/snacks/soup/mammi
-	category = CAT_MISCFOOD
-
-/obj/item/reagent_containers/food/snacks/chocolatebunny
-	name = "chocolate bunny"
-	desc = "Contains less than 10% real rabbit!"
-	icon_state = "chocolatebunny"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
-	filling_color = "#A0522D"
-
-/datum/crafting_recipe/food/chocolatebunny
-	name = "Chocolate bunny"
-	reqs = list(
-		/datum/reagent/consumable/sugar = 2,
-		/obj/item/reagent_containers/food/snacks/chocolatebar = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/chocolatebunny
-	category = CAT_MISCFOOD
+/*
+Easter Recipes + Food moved to appropriate files.
+\code\modules\food_and_drinks\
+\code\modules\food_and_drinks\recipes\
+*/

code/modules/jobs/access.dm

@@ -357,7 +357,7 @@
 /proc/get_all_jobs()
 	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician",
 				"Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
-				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
+				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic",
 				"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
 
 /proc/get_all_job_icons() //For all existing HUD icons

code/modules/jobs/job_types/paramedic.dm

@@ -0,0 +1,45 @@
+/datum/job/paramedic
+	title = "Paramedic"
+	flag = PARAMEDIC
+	department_head = list("Chief Medical Officer")
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 3
+	spawn_positions = 2
+	supervisors = "the chief medical officer"
+	selection_color = "#74b5e0"
+
+	outfit = /datum/outfit/job/paramedic
+
+	access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS)
+	minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS)
+
+	display_order = JOB_DISPLAY_ORDER_PARAMEDIC
+
+/datum/outfit/job/paramedic
+	name = "Paramedic"
+	jobtype = /datum/job/paramedic
+
+	ears = /obj/item/radio/headset/headset_med
+	gloves = /obj/item/clothing/gloves/color/latex/nitrile
+	uniform = /obj/item/clothing/under/rank/medical/paramedic
+	mask = /obj/item/clothing/mask/surgical
+	shoes = /obj/item/clothing/shoes/jackboots
+	head = /obj/item/clothing/head/soft/emt
+	suit =  /obj/item/clothing/suit/toggle/labcoat/emt
+	belt = /obj/item/storage/belt/medical
+	l_hand = /obj/item/storage/firstaid/regular
+	suit_store = /obj/item/flashlight/pen
+	id = /obj/item/card/id
+	r_pocket = /obj/item/pinpointer/crew
+	l_pocket = /obj/item/pda/medical
+	backpack_contents = list(/obj/item/roller=1)
+	pda_slot = ITEM_SLOT_POCKET
+
+	backpack = /obj/item/storage/backpack/medic
+	satchel = /obj/item/storage/backpack/satchel/med
+	duffelbag = /obj/item/storage/backpack/duffelbag/med
+
+	backpack_contents = list(/obj/item/storage/hypospraykit/regular)
+
+	chameleon_extras = /obj/item/gun/syringe

code/modules/jobs/jobs.dm

@@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(medical_positions, list(
 	"Medical Doctor",
 	"Geneticist",
 	"Virologist",
+	"Paramedic",
 	"Chemist"))
 
 

code/modules/mob/dead/observer/observer.dm

@@ -289,7 +289,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES
 	if(world.time < roundstart_quit_limit)
 		penalty += roundstart_quit_limit - world.time
-	if(penalty + world.realtime - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
+	var/maximumRoundEnd = SSautotransfer.starttime + SSautotransfer.voteinterval * SSautotransfer.maxvotes	
+	if(penalty - SSshuttle.realtimeofstart > maximumRoundEnd + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
 		penalty = CANT_REENTER_ROUND
 
 	if(SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, (stat == DEAD) ? TRUE : FALSE, FALSE, (stat == DEAD)? penalty : 0, (stat == DEAD)? TRUE : FALSE) & COMPONENT_BLOCK_GHOSTING)
@@ -323,7 +324,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES
 	if(world.time < roundstart_quit_limit)
 		penalty += roundstart_quit_limit - world.time
-	if(penalty + world.realtime - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
+	var/maximumRoundEnd = SSautotransfer.starttime + SSautotransfer.voteinterval * SSautotransfer.maxvotes
+	if(penalty - SSshuttle.realtimeofstart > maximumRoundEnd + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
 		penalty = CANT_REENTER_ROUND
 
 	var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst alive you won't be able to re-enter this round [penalty ? "or play ghost roles [penalty == CANT_REENTER_ROUND ? "until the round is over" : "for the next [DisplayTimeText(penalty)]"]" : ""]! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")

code/modules/mob/living/carbon/human/species_types/ipc.dm

@@ -13,7 +13,13 @@
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
 	gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless)
 	mutanttongue = /obj/item/organ/tongue/robot/ipc
+//Just robo looking parts.
 	mutant_heart = /obj/item/organ/heart/ipc
+	mutantlungs = /obj/item/organ/lungs/ipc
+	mutantliver = /obj/item/organ/liver/ipc
+	mutantstomach = /obj/item/organ/stomach/ipc
+	mutanteyes = /obj/item/organ/eyes/ipc
+
 	exotic_bloodtype = "HF"
 
 	var/datum/action/innate/monitor_change/screen

code/modules/mob/living/silicon/ai/ai.dm

@@ -146,7 +146,7 @@
 	aiPDA.name = name + " (" + aiPDA.ownjob + ")"
 
 	aiMulti = new(src)
-	radio = new /obj/item/radio/headset/ai(src)
+	radio = new /obj/item/radio/headset/silicon/ai(src)
 	aicamera = new/obj/item/camera/siliconcam/ai_camera(src)
 
 	deploy_action.Grant(src)

code/modules/mob/living/silicon/pai/pai.dm

@@ -10,6 +10,7 @@
 	health = 500
 	maxHealth = 500
 	layer = BELOW_MOB_LAYER
+	var/obj/item/instrument/piano_synth/internal_instrument
 	silicon_privileges = PRIVILEDGES_PAI
 	var/datum/element/mob_holder/current_mob_holder //because only a few of their chassis can be actually held.
 
@@ -27,6 +28,7 @@
 	var/speakDoubleExclamation = "alarms"
 	var/speakQuery = "queries"
 
+	var/obj/item/radio/headset			// The pAI's headset
 	var/obj/item/pai_cable/cable		// The cable we produce and use when door or camera jacking
 
 	var/master				// Name of the one who commands us
@@ -54,6 +56,7 @@
 
 	var/obj/item/integrated_signaler/signaler // AI's signaller
 
+	var/encryptmod = FALSE
 	var/holoform = FALSE
 	var/canholo = TRUE
 	var/obj/item/card/id/access_card = null
@@ -84,6 +87,7 @@
 	var/icon/custom_holoform_icon
 
 /mob/living/silicon/pai/Destroy()
+	QDEL_NULL(internal_instrument)
 	if (loc != card)
 		card.forceMove(drop_location())
 	card.pai = null
@@ -106,7 +110,7 @@
 	card = P
 	signaler = new(src)
 	if(!radio)
-		radio = new /obj/item/radio(src)
+		radio = new /obj/item/radio/headset/silicon/pai(src)
 
 	//PDA
 	pda = new(src)
@@ -296,6 +300,17 @@
 /mob/living/silicon/pai/process()
 	emitterhealth = CLAMP((emitterhealth + emitterregen), -50, emittermaxhealth)
 
+/obj/item/paicard/attackby(obj/item/W, mob/user, params)
+	..()
+	user.set_machine(src)
+	if(pai.encryptmod == TRUE)
+		if(W.tool_behaviour == TOOL_SCREWDRIVER)
+			pai.radio.attackby(W, user, params)
+		else if(istype(W, /obj/item/encryptionkey))
+			pai.radio.attackby(W, user, params)
+	else
+		to_chat(user, "Encryption Key ports not configured.")
+
 /mob/living/silicon/pai/proc/short_radio()
 	if(radio_short_timerid)
 		deltimer(radio_short_timerid)

code/modules/mob/living/silicon/pai/software.dm

@@ -20,6 +20,8 @@
 															"universal translator" = 35,
 															//"projection array" = 15
 															"remote signaller" = 5,
+															"loudness booster" = 25,
+															"encryption keys" = 20
 															)
 
 /mob/living/silicon/pai/proc/paiInterface()
@@ -50,6 +52,8 @@
 				left_part = softwareMedicalRecord()
 			if("securityrecord")
 				left_part = softwareSecurityRecord()
+			if("encryptionkeys")
+				left_part = softwareEncryptionKeys()
 			if("translator")
 				left_part = softwareTranslator()
 			if("atmosensor")
@@ -64,6 +68,8 @@
 				left_part = softwareCamera()
 			if("signaller")
 				left_part = softwareSignal()
+			if("loudness")
+				left_part = softwareLoudness()
 
 	//usr << browse_rsc('windowbak.png')		// This has been moved to the mob's Login() proc
 
@@ -256,6 +262,9 @@
 				else
 					var/datum/atom_hud/med = GLOB.huds[med_hud]
 					med.remove_hud_from(src)
+		if("encryptionkeys")
+			if(href_list["toggle"])
+				encryptmod = TRUE
 		if("translator")
 			if(href_list["toggle"])
 				grant_all_languages(TRUE)
@@ -271,6 +280,12 @@
 				var/turf/T = get_turf(loc)
 				cable = new /obj/item/pai_cable(T)
 				T.visible_message("<span class='warning'>A port on [src] opens to reveal [cable], which promptly falls to the floor.</span>", "<span class='italics'>You hear the soft click of something light and hard falling to the ground.</span>")
+		if("loudness")
+			if(subscreen == 1) // Open Instrument
+				internal_instrument.interact(src)
+			if(subscreen == 2) // Change Instrument type
+				internal_instrument.selectInstrument()
+
 	//updateUsrDialog()		We only need to account for the single mob this is intended for, and he will *always* be able to call this window
 	paiInterface()		 // So we'll just call the update directly rather than doing some default checks
 	return
@@ -306,6 +321,8 @@
 			dat += "<a href='byond://?src=[REF(src)];software=[s]'>Camera Jack</a> <br>"
 		if(s == "remote signaller")
 			dat += "<a href='byond://?src=[REF(src)];software=signaller;sub=0'>Remote Signaller</a> <br>"
+		if(s == "loudness booster")
+			dat += "<a href='byond://?src=[REF(src)];software=loudness;sub=0'>Loudness Booster</a> <br>"
 	dat += "<br>"
 
 	// Advanced
@@ -319,6 +336,8 @@
 			dat += "<a href='byond://?src=[REF(src)];software=securityhud;sub=0'>Facial Recognition Suite</a>[(secHUD) ? "<font color=#55FF55> On</font>" : "<font color=#FF5555> Off</font>"] <br>"
 		if(s == "medical HUD")
 			dat += "<a href='byond://?src=[REF(src)];software=medicalhud;sub=0'>Medical Analysis Suite</a>[(medHUD) ? "<font color=#55FF55> On</font>" : "<font color=#FF5555> Off</font>"] <br>"
+		if(s == "encryption keys")
+			dat += "<a href='byond://?src=[REF(src)];software=encryptionkeys;sub=0'>Channel Encryption Firmware</a>[(encryptmod) ? "<font color=#55FF55> On</font>" : "<font color=#FF5555> Off</font>"] <br>"
 		if(s == "universal translator")
 			var/datum/language_holder/H = get_language_holder()
 			dat += "<a href='byond://?src=[REF(src)];software=translator;sub=0'>Universal Translator</a>[H.omnitongue ? "<font color=#55FF55> On</font>" : "<font color=#FF5555> Off</font>"] <br>"
@@ -469,6 +488,14 @@
 				. += "<pre>Requested security record not found,</pre><BR>"
 			. += "<BR>\n<A href='?src=[REF(src)];software=securityrecord;sub=0'>Back</A><BR>"
 	return .
+// Encryption Keys
+// Encryption kets
+/mob/living/silicon/pai/proc/softwareEncryptionKeys()
+	var/dat = {"<h3>Encryption Key Firmware</h3><br>
+				When enabled, this device will be able to use up to two (2) encryption keys for departmental channel access.<br><br>
+				The device is currently [encryptmod ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled.</font><br>[encryptmod ? "" : "<a href='byond://?src=[REF(src)];software=encryptionkeys;sub=0;toggle=1'>Activate Encryption Key Ports</a><br>"]"}
+	return dat
+
 
 // Universal Translator
 /mob/living/silicon/pai/proc/softwareTranslator()
@@ -630,3 +657,12 @@
 	dat += "<br><br>"
 	dat += "Messages: <hr> [pda.tnote]"
 	return dat
+
+// Loudness Booster
+/mob/living/silicon/pai/proc/softwareLoudness()
+	if(!internal_instrument)
+		internal_instrument = new(src)
+	var/dat = "<h3>Sound Synthetizer</h3>"
+	dat += "<a href='byond://?src=[REF(src)];software=loudness;sub=1'>Open Synthesizer Interface</a><br>"
+	dat += "<a href='byond://?src=[REF(src)];software=loudness;sub=2'>Choose Instrument Type</a>"
+	return dat	

code/modules/paperwork/pen.dm

@@ -139,6 +139,7 @@
 				O.name = input
 				to_chat(user, "\The [oldname] has been successfully been renamed to \the [input].")
 				O.renamedByPlayer = TRUE
+				log_game("[user] [key_name(user)] has renamed [O] to [input]")
 
 		if(penchoice == "Change description")
 			var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 100)
@@ -146,6 +147,7 @@
 				return
 			O.desc = input
 			to_chat(user, "You have successfully changed \the [O.name]'s description.")
+			log_game("[user] [key_name(user)] has changed [O]'s description to to [input]")
 
 /*
  * Sleepypens

code/modules/power/supermatter/supermatter.dm

@@ -345,9 +345,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	else
 		// Pass all the gas related code an empty gas container
 		removed = new()
-
-	damage = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage) // hardcap any direct damage taken before doing atmos damage
-	damage_archived = damage
+	damage_archived = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage)
+	matter_power += damage - damage_archived
+	damage = damage_archived
 	if(!removed || !removed.total_moles() || isspaceturf(T)) //we're in space or there is no gas to process
 		if(takes_damage)
 			damage += max((power / 1000) * DAMAGE_INCREASE_MULTIPLIER, 0.1) // always does at least some damage

code/modules/projectiles/ammunition/caseless/arrow.dm

@@ -9,18 +9,18 @@
 
 /obj/item/ammo_casing/caseless/arrow/ashen
 	name = "ashen arrow"
-	desc = "Fire harderned wooden arrow."
+	desc = "An arrow made of wood, hardened by fire."
 	icon_state = "ashenarrow"
 	projectile_type = /obj/item/projectile/bullet/reusable/arrow/ashen
 
 /obj/item/ammo_casing/caseless/arrow/bone
 	name = "bone arrow"
-	desc = "Arrow made of bone and sinew. The tip is sharp enough to pierce into a goliath plate."
+	desc = "An arrow made of bone and sinew. The tip is sharp enough to pierce through a goliath plate."
 	icon_state = "bonearrow"
 	projectile_type = /obj/item/projectile/bullet/reusable/arrow/bone
 
 /obj/item/ammo_casing/caseless/arrow/bronze
 	name = "bronze arrow"
-	desc = "Bronze tipped arrow."
+	desc = "An arrow made of wood, tipped with bronze. The tip is dense enough to provide some armor penetration."
 	icon_state = "bronzearrow"
 	projectile_type = /obj/item/projectile/bullet/reusable/arrow/bronze

code/modules/surgery/organs/eyes.dm

@@ -377,3 +377,7 @@
 	name = "insect eyes"
 	desc = "These eyes seem to have increased sensitivity to bright light, with no improvement to low light vision."
 	flash_protect = -1
+
+/obj/item/organ/eyes/ipc
+	name = "ipc eyes"
+	icon_state = "cybernetic_eyeballs"

code/modules/surgery/organs/heart.dm

@@ -222,9 +222,8 @@ obj/item/organ/heart/cybernetic/upgraded/on_life()
 
 /obj/item/organ/heart/ipc
 	name = "IPC heart"
-	desc = "An electronic pump that regulates hydraulic functions, they have an auto-restart after EMPs."
+	desc = "An electronic pump that regulates hydraulic functions, the electronics have EMP shielding."
 	icon_state = "heart-c"
-	organ_flags = ORGAN_SYNTHETIC
 
 /obj/item/organ/heart/freedom
 	name = "heart of freedom"

code/modules/surgery/organs/liver.dm

@@ -95,6 +95,10 @@
 	icon_state = "liver-p"
 	desc = "A large crystal that is somehow capable of metabolizing chemicals, these are found in plasmamen."
 
+/obj/item/organ/liver/ipc
+	name = "reagent processing liver"
+	icon_state = "liver-c"
+
 /obj/item/organ/liver/cybernetic
 	name = "cybernetic liver"
 	icon_state = "liver-c"

code/modules/surgery/organs/lungs.dm

@@ -2,6 +2,7 @@
 
 /obj/item/organ/lungs
 	name = "lungs"
+	desc = "Looking at them makes you start manual breathing."
 	icon_state = "lungs"
 	zone = BODY_ZONE_CHEST
 	slot = ORGAN_SLOT_LUNGS
@@ -462,6 +463,10 @@
 	S.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 5)
 	return S
 
+/obj/item/organ/lungs/ipc
+	name = "ipc lungs"
+	icon_state = "lungs-c"
+
 /obj/item/organ/lungs/plasmaman
 	name = "plasma filter"
 	desc = "A spongy rib-shaped mass for filtering plasma from the air."
@@ -543,4 +548,4 @@
 
 /obj/item/organ/lungs/yamerol/on_life()
 	..()
-	damage += 2 //Yamerol lungs are temporary
+	damage += 2 //Yamerol lungs are temporary

code/modules/surgery/organs/stomach.dm

@@ -96,3 +96,7 @@
 	name = "digestive crystal"
 	icon_state = "stomach-p"
 	desc = "A strange crystal that is responsible for metabolizing the unseen energy force that feeds plasmamen."
+
+/obj/item/organ/stomach/ipc
+	name = "ipc stomach"
+	icon_state = "stomach-ipc"

config/config.txt

@@ -184,6 +184,15 @@ VOTE_DELAY 6000
 ## time period (deciseconds) which voting session will last (default 1 minute)
 VOTE_PERIOD 600
 
+## autovote initial delay (deciseconds) before first automatic transfer vote call (default 120 minutes)
+VOTE_AUTOTRANSFER_INITIAL 72000
+
+## autovote delay (deciseconds) before sequential automatic transfer votes are called (default 30 minutes)
+VOTE_AUTOTRANSFER_INTERVAL 18000
+
+## autovote maximum votes until automatic transfer call (default 4)
+VOTE_AUTOTRANSFER_MAXIMUM 4
+
 ## prevents dead players from voting or starting votes
 # NO_DEAD_VOTE
 

config/jobs.txt

@@ -31,6 +31,7 @@ Station Engineer=5,5
 Atmospheric Technician=3,2
 
 Medical Doctor=5,3
+Paramedic=2,2
 Chemist=2,2
 Geneticist=2,2
 Virologist=1,1
@@ -43,4 +44,4 @@ Detective=1,1
 Security Officer=5,5
 
 AI=0,1
-Cyborg=0,1
+Cyborg=0,1

html/changelogs/AutoChangeLog-pr-11110.yml

@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - rscadd: "Extend votes! Ported from Hyper, ported from AUstation."

html/changelogs/AutoChangeLog-pr-11129.yml

@@ -0,0 +1,10 @@
+author: "Owai-Seek"
+delete-after: True
+changes: 
+  - tweak: "Reorganized all food recipes, (hopefully) making things easier to find."
+  - balance: "Trays now have a whitelist, allowing them to pick up normal sized foods, bowls, glassware, booze, ect."
+  - bugfix: "Easter foods are no longer their own Misc Food Category on the top of the menu."
+  - spellcheck: "fixed a few typos/capitalization consistency."
+  - tweak: "Mexican Foods are their own Subcategory."
+  - tweak: "Donuts are their own Subcategory"
+  - tweak: "Moved Sweets from Misc Food in with Pies. Renamed to Pies & Sweets"

html/changelogs/AutoChangeLog-pr-11167.yml

@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - tweak: "hand teles use a less atrocious beam"

html/changelogs/AutoChangeLog-pr-11183.yml

@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - balance: "Engi/Sec Trek suit no longer has 10% melee protection"

html/changelogs/AutoChangeLog-pr-11184.yml

@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - bugfix: "IPC hearts are now made of robomeat and roboblood thats emp proof. Heals and is all and all just like an normal heart"

html/changelogs/AutoChangeLog-pr-11185.yml

@@ -0,0 +1,5 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - imageadd: "All robotic organs now have an animation."
+  - imageadd: "IPC's now organs now look like robotic ones, even tho thats not the case game wise"

html/changelogs/AutoChangeLog-pr-11188.yml

@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - imageadd: "Makes plywood chair not look as bad."

html/changelogs/AutoChangeLog-pr-11192.yml

@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - balance: "Shooting the supermatter now adds to the supermatter's power. CO2 setups beware!"

html/changelogs/AutoChangeLog-pr-11199.yml

@@ -0,0 +1,5 @@
+author: "Detective-Google"
+delete-after: True
+changes: 
+  - rscadd: "Loudness Booster pAI program"
+  - rscadd: "Encryption Key pAI program"

html/changelogs/AutoChangeLog-pr-11201.yml

@@ -0,0 +1,8 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - rscadd: "The Ash Walkers' nest on Lavaland now starts with three bowyery slabs."
+  - rscadd: "You can now welder-harden arrows. It might take longer."
+  - balance: "Silkstring's costs adjusted for bows and whatnot."
+  - spellcheck: "Grammar adjusted on a lot of things relating to bows."
+  - bugfix: "Pipe bows' bowstring doesn't look like it replicated itself upon draw."

html/changelogs/AutoChangeLog-pr-11214.yml

@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Fixed pAI radios inability to be toggled on/off."

html/changelogs/AutoChangeLog-pr-11216.yml

@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - rscadd: "Logging for renaming"

strings/ion_laws.json

@@ -331,7 +331,8 @@
         "BOTANISTS",
         "RESEARCH DIRECTORS",
         "CHIEF MEDICAL OFFICERS",
-        "MEDICAL DOCTORS",
+		"MEDICAL DOCTORS",
+		"PARAMEDICS",
         "CHEMISTS",
         "GENETICISTS",
         "VIROLOGISTS",

tgstation.dme

@@ -245,6 +245,7 @@
 #include "code\controllers\subsystem\assets.dm"
 #include "code\controllers\subsystem\atoms.dm"
 #include "code\controllers\subsystem\augury.dm"
+#include "code\controllers\subsystem\autotransfer.dm"
 #include "code\controllers\subsystem\blackbox.dm"
 #include "code\controllers\subsystem\chat.dm"
 #include "code\controllers\subsystem\communications.dm"
@@ -1846,18 +1847,20 @@
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_bread.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_burger.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_cake.dm"
+#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_donut.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_egg.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_frozen.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm"
+#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_mexican.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_misc.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pastry.dm"
-#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pie.dm"
+#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pies_sweets.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_salad.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sandwich.dm"
+#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm"
-#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sushi.dm"
 #include "code\modules\games\cas.dm"
 #include "code\modules\goonchat\browserOutput.dm"
 #include "code\modules\holiday\easter.dm"
@@ -1986,6 +1989,7 @@
 #include "code\modules\jobs\job_types\lawyer.dm"
 #include "code\modules\jobs\job_types\medical_doctor.dm"
 #include "code\modules\jobs\job_types\mime.dm"
+#include "code\modules\jobs\job_types\paramedic.dm"
 #include "code\modules\jobs\job_types\quartermaster.dm"
 #include "code\modules\jobs\job_types\research_director.dm"
 #include "code\modules\jobs\job_types\roboticist.dm"