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

code/modules/NTNet/relays.dm

@@ -35,7 +35,7 @@
 		return FALSE
 	return TRUE
 
-/obj/machinery/ntnet_relay/update_icon()
+/obj/machinery/ntnet_relay/update_icon_state()
 	if(is_operational())
 		icon_state = "bus"
 	else

code/modules/admin/admin_verbs.dm

@@ -714,7 +714,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 
 	AI_Interact = !AI_Interact
 	if(mob && IsAdminGhost(mob))
-		mob.has_unlimited_silicon_privilege = AI_Interact
+		mob.silicon_privileges = AI_Interact ? ALL : NONE
 
 	log_admin("[key_name(usr)] has [AI_Interact ? "activated" : "deactivated"] Admin AI Interact")
 	message_admins("[key_name_admin(usr)] has [AI_Interact ? "activated" : "deactivated"] their AI interaction")

code/modules/antagonists/_common/antag_datum.dm

@@ -14,7 +14,8 @@ GLOBAL_LIST_EMPTY(antagonists)
 	var/list/objectives = list()
 	var/antag_memory = ""//These will be removed with antag datum
 	var/antag_moodlet //typepath of moodlet that the mob will gain with their status
-	var/can_hijack = HIJACK_NEUTRAL //If these antags are alone on shuttle hijack happens.
+	/// If above 0, this is the multiplier for the speed at which we hijack the shuttle. Do not directly read, use hijack_speed().
+	var/hijack_speed = 0
 
 	//Antag panel properties
 	var/show_in_antagpanel = TRUE	//This will hide adding this antag type in antag panel, use only for internal subtypes that shouldn't be added directly but still show if possessed by mind
@@ -229,6 +230,13 @@ GLOBAL_LIST_EMPTY(antagonists)
 		return
 	antag_memory = new_memo
 
+/// Gets how fast we can hijack the shuttle, return 0 for can not hijack. Defaults to hijack_speed var, override for custom stuff like buffing hijack speed for hijack objectives or something.
+/datum/antagonist/proc/hijack_speed()
+	var/datum/objective/hijack/H = locate() in objectives
+	if(!isnull(H?.hijack_speed_override))
+		return H.hijack_speed_override
+	return hijack_speed
+
 //This one is created by admin tools for custom objectives
 /datum/antagonist/custom
 	antagpanel_category = "Custom"

code/modules/antagonists/blob/blob/overmind.dm

@@ -24,7 +24,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 	hud_type = /datum/hud/blob_overmind
 	var/obj/structure/blob/core/blob_core = null // The blob overmind's core
 	var/blob_points = 0
-	var/max_blob_points = 100
+	var/max_blob_points = 250
 	var/last_attack = 0
 	var/datum/reagent/blob/blob_reagent_datum = new/datum/reagent/blob()
 	var/list/blob_mobs = list()

code/modules/antagonists/blob/blob/powers.dm

@@ -321,7 +321,7 @@
 	set category = "Blob"
 	set name = "Blob Broadcast"
 	set desc = "Speak with your blob spores and blobbernauts as your mouthpieces."
-	var/speak_text = input(src, "What would you like to say with your minions?", "Blob Broadcast", null) as text
+	var/speak_text = stripped_input(src, "What would you like to say with your minions?", "Blob Broadcast", null)
 	if(!speak_text)
 		return
 	else

code/modules/antagonists/bloodsucker/bloodsucker_objectives.dm

@@ -208,7 +208,7 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
+/*
 // Destroy the Solar Arrays
 /datum/objective/bloodsucker/solars
 
@@ -228,7 +228,7 @@
 		if (SC && SC.lastgen > 0 && SC.connected_panels.len > 0 && SC.connected_tracker)
 			return FALSE
 	return TRUE
-
+*/ 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

code/modules/antagonists/bloodsucker/datum_bloodsucker.dm

@@ -286,10 +286,10 @@
 	var/mob/living/L = owner.current
 	level_bloodcost = maxBloodVolume * 0.2
 	//If the blood volume of the bloodsucker is lower than the cost to level up, return and inform the bloodsucker
-	
+
 	//TODO: Make this into a radial, or perhaps a tgui next UI
 		// Purchase Power Prompt
-	var/list/options = list() 
+	var/list/options = list()
 	for(var/pickedpower in typesof(/datum/action/bloodsucker))
 		var/datum/action/bloodsucker/power = pickedpower
 		// If I don't own it, and I'm allowed to buy it.
@@ -379,20 +379,21 @@
 	protege_objective.generate_objective()
 	add_objective(protege_objective)
 
-	if (rand(0,1) == 0)
+	//if (rand(0,1) == 0)
 		// Heart Thief Objective
-		var/datum/objective/bloodsucker/heartthief/heartthief_objective = new
-		heartthief_objective.owner = owner
-		heartthief_objective.generate_objective()
-		add_objective(heartthief_objective)
-
+	var/datum/objective/bloodsucker/heartthief/heartthief_objective = new
+	heartthief_objective.owner = owner
+	heartthief_objective.generate_objective()
+	add_objective(heartthief_objective)
+	/*
 	else
-		// Solars Objective
+	
+		// Solars Objective, doesnt work due to TG updates.
 		var/datum/objective/bloodsucker/solars/solars_objective = new
 		solars_objective.owner = owner
 		solars_objective.generate_objective()
 		add_objective(solars_objective)
-
+*/
 	// Survive Objective
 	var/datum/objective/bloodsucker/survive/survive_objective = new
 	survive_objective.owner = owner

code/modules/antagonists/bloodsucker/powers/cloak.dm

@@ -2,40 +2,56 @@
 
 /datum/action/bloodsucker/cloak
 	name = "Cloak of Darkness"
-	desc = "Blend into the shadows and become invisible to the untrained eye."
+	desc = "Blend into the shadows and become invisible to the untrained eye. Movement is slowed in brightly lit areas."
 	button_icon_state = "power_cloak"
 	bloodcost = 5
 	cooldown = 50
 	bloodsucker_can_buy = TRUE
 	amToggle = TRUE
 	warn_constant_cost = TRUE
-	var/was_running
-
-	var/light_min = 0.2  	// If lum is above this, no good.
+	var/moveintent_was_run
+	var/walk_threshold = 0.4 // arbitrary number, to be changed. edit in last commit: this is fine after testing on box station for a bit
+	var/lum
 
 /datum/action/bloodsucker/cloak/CheckCanUse(display_error)
 	. = ..()
 	if(!.)
 		return
-	// Must be Dark
-	var/turf/T = owner.loc
-	if(istype(T) && T.get_lumcount() > light_min)
-		to_chat(owner, "<span class='warning'>This area is not dark enough to blend in</span>")
-		return FALSE
+	
+	// must have nobody around to see the cloak
+	var/watchers = viewers(9,get_turf(owner))
+	for(var/mob/living/M in watchers)
+		if(M != owner)
+			to_chat(owner, "<span class='warning'>You may only vanish into the shadows unseen.</span>")
+			return FALSE
+
 	return TRUE
 
 /datum/action/bloodsucker/cloak/ActivatePower()
 	var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
 	var/mob/living/user = owner
-	was_running = (user.m_intent == MOVE_INTENT_RUN)
-	if(was_running)
-		user.toggle_move_intent()
-	ADD_TRAIT(user, TRAIT_NORUNNING, "cloak of darkness")
+
 	while(bloodsuckerdatum && ContinueActive(user))
 		// Pay Blood Toll (if awake)
-		owner.alpha = max(20, owner.alpha - min(75, 10 + 5 * level_current))
+		owner.alpha = max(35, owner.alpha - min(75, 10 + 5 * level_current))
 		bloodsuckerdatum.AddBloodVolume(-0.2)
-		sleep(5) // Check every few ticks that we haven't disabled this power
+		
+		moveintent_was_run = (user.m_intent == MOVE_INTENT_RUN)
+		var/turf/T = get_turf(user)
+		lum = T.get_lumcount()
+
+		if(istype(owner.loc))
+			if(lum > walk_threshold)
+				if(moveintent_was_run)
+					user.toggle_move_intent()
+					ADD_TRAIT(user, TRAIT_NORUNNING, "cloak of darkness")
+
+			if(lum < walk_threshold)
+				if(!moveintent_was_run)
+					user.toggle_move_intent()
+					REMOVE_TRAIT(user, TRAIT_NORUNNING, "cloak of darkness")
+		
+		sleep(5) // Check every few ticks
 
 /datum/action/bloodsucker/cloak/ContinueActive(mob/living/user, mob/living/target)
 	if (!..())
@@ -43,15 +59,11 @@
 	if(user.stat == !CONSCIOUS) // Must be CONSCIOUS
 		to_chat(owner, "<span class='warning'>Your cloak failed due to you falling unconcious! </span>")
 		return FALSE
-	var/turf/T = owner.loc // Must be DARK
-	if(istype(T) && T.get_lumcount() > light_min)
-		to_chat(owner, "<span class='warning'>Your cloak failed due to there being too much light!</span>")
-		return FALSE
 	return TRUE
 
 /datum/action/bloodsucker/cloak/DeactivatePower(mob/living/user = owner, mob/living/target)
 	..()
 	REMOVE_TRAIT(user, TRAIT_NORUNNING, "cloak of darkness")
 	user.alpha = 255
-	if(was_running && user.m_intent != MOVE_INTENT_RUN)
+	if(!moveintent_was_run)
 		user.toggle_move_intent()

code/modules/antagonists/bloodsucker/powers/feed.dm

@@ -170,7 +170,7 @@
 		// Warn Feeder about Witnesses...
 		var/was_unnoticed = TRUE
 		for(var/mob/living/M in viewers(notice_range, owner))
-			if(M != owner && M != target && iscarbon(M) && M.mind && !M.has_unlimited_silicon_privilege && !M.eye_blind && !M.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER))
+			if(M != owner && M != target && iscarbon(M) && M.mind && !M.silicon_privileges && !M.eye_blind && !M.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER))
 				was_unnoticed = FALSE
 				break
 		if(was_unnoticed)

code/modules/antagonists/bloodsucker/powers/go_home.dm

@@ -28,9 +28,9 @@
 			to_chat(owner, "<span class='warning'>Your coffin has been destroyed!</span>")
 		return FALSE
 	return TRUE
-	
+
 /datum/action/bloodsucker/gohome/proc/flicker_lights(var/flicker_range, var/beat_volume)
-	for(var/obj/machinery/light/L in view(flicker_range, get_turf(owner)))	
+	for(var/obj/machinery/light/L in view(flicker_range, get_turf(owner)))
 	playsound(get_turf(owner), 'sound/effects/singlebeat.ogg', beat_volume, 1)
 
 
@@ -45,7 +45,7 @@
 	flicker_lights(4, 40)
 	sleep(50)
 	flicker_lights(4, 60)
-	for(var/obj/machinery/light/L in view(6, get_turf(owner)))		
+	for(var/obj/machinery/light/L in view(6, get_turf(owner)))
 		L.flicker(5)
 	playsound(get_turf(owner), 'sound/effects/singlebeat.ogg', 60, 1)
 	// ( STEP TWO: Lights OFF? )
@@ -56,7 +56,7 @@
 	if(!owner)
 		return
 	// SEEN?: (effects ONLY if there are witnesses! Otherwise you just POOF)
-	
+
 	var/am_seen = FALSE		// Do Effects (seen by anyone)
 	var/drop_item = FALSE	// Drop Stuff (seen by non-vamp)
 	if(isturf(owner.loc)) // Only check if I'm not in a Locker or something.
@@ -65,7 +65,7 @@
 		if(T && T.lighting_object && T.get_lumcount()>= 0.1)
 			// B) Check for Viewers
 			for(var/mob/living/M in viewers(get_turf(owner)))
-				if(M != owner && isliving(M) && M.mind && !M.has_unlimited_silicon_privilege && !M.eye_blind) // M.client <--- add this in after testing!
+				if(M != owner && isliving(M) && M.mind && !M.silicon_privileges && !M.eye_blind) // M.client <--- add this in after testing!
 					am_seen = TRUE
 					if (!M.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER))
 						drop_item = TRUE
@@ -95,12 +95,12 @@
 		puff.effect_type = /obj/effect/particle_effect/smoke/vampsmoke
 		puff.set_up(3, 0, get_turf(owner))
 		puff.start()
-	
+
 	//STEP FIVE: Create animal at prev location
 	var/mob/living/simple_animal/SA = pick(/mob/living/simple_animal/mouse,/mob/living/simple_animal/mouse,/mob/living/simple_animal/mouse, /mob/living/simple_animal/hostile/retaliate/bat) //prob(300) /mob/living/simple_animal/mouse,
 	new SA (owner.loc)
 	// TELEPORT: Move to Coffin & Close it!
-	do_teleport(owner, bloodsuckerdatum.coffin, no_effects = TRUE, forced = TRUE, channel = TELEPORT_CHANNEL_QUANTUM) 
+	do_teleport(owner, bloodsuckerdatum.coffin, no_effects = TRUE, forced = TRUE, channel = TELEPORT_CHANNEL_QUANTUM)
 	user.resting = TRUE
 	user.Stun(30,1)
 	// CLOSE LID: If fail, force me in.
@@ -112,4 +112,4 @@
 		bloodsuckerdatum.coffin.update_icon()
 		// Lock Coffin
 		bloodsuckerdatum.coffin.LockMe(owner)
-	
+

code/modules/antagonists/bloodsucker/powers/haste.dm

@@ -14,6 +14,9 @@
 	message_Trigger = ""//"Whom will you subvert to your will?"
 	bloodsucker_can_buy = TRUE
 	must_be_capacitated = TRUE
+	var/list/hit			//current hit, set while power is in use as we can't pass the list as an extra calling argument in registersignal.
+	/// If set, uses this speed in deciseconds instead of world.tick_lag
+	var/speed_override
 
 /datum/action/bloodsucker/targeted/haste/CheckCanUse(display_error)
 	. = ..()
@@ -43,43 +46,46 @@
 	return TRUE
 
 /datum/action/bloodsucker/targeted/haste/FireTargetedPower(atom/A)
-	// set waitfor = FALSE   <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done.
+	// This is a non-async proc to make sure the power is "locked" until this finishes.
+	hit = list()
+	RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move)
 	var/mob/living/user = owner
 	var/turf/T = isturf(A) ? A : get_turf(A)
 	// Pulled? Not anymore.
-	owner.pulledby = null
-	// Step One: Heatseek toward Target's Turf
-	walk_to(owner, T, 0, 0.01, 20) // NOTE: this runs in the background! to cancel it, you need to use walk(owner.current,0), or give them a new path.
+	user.pulledby?.stop_pulling()
+	// Go to target turf
+	// DO NOT USE WALK TO.
 	playsound(get_turf(owner), 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-	var/safety = 20
-	while(get_turf(owner) != T && safety > 0 && !(isliving(target) && target.Adjacent(owner)))
-		user.canmove = FALSE //Dont move while doing the thing, or itll break
-		safety --
-		// Did I get knocked down?
-		if(owner && owner.incapacitated(ignore_restraints=TRUE, ignore_grab=TRUE))// owner.incapacitated())
-			// We're gonna cancel. But am I on the ground? Spin me!
-			if(user.resting)
-				var/send_dir = get_dir(owner, T)
-				new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE)
-				owner.spin(10)
+	var/safety = get_dist(user, T) * 3 + 1
+	var/consequetive_failures = 0
+	var/speed = isnull(speed_override)? world.tick_lag : speed_override
+	while(--safety && (get_turf(user) != T))
+		var/success = step_towards(user, T)		//This does not try to go around obstacles.
+		if(!success)
+			success = step_to(user, T)			//this does
+		if(!success)
+			if(++consequetive_failures >= 3)		//if 3 steps don't work
+				break			//just stop
+		else
+			consequetive_failures = 0
+		if(user.resting)
+			user.setDir(turn(user.dir, 90))		//down? spin2win :^)
+		if(user.incapacitated(ignore_restraints = TRUE, ignore_grab = TRUE))		//actually down? stop.
 			break
-		// Spin/Stun people we pass.
-		//var/mob/living/newtarget = locate(/mob/living) in oview(1, owner)
-		var/list/mob/living/foundtargets = list()
-		for(var/mob/living/newtarget in oview(1, owner))
-			if (newtarget && newtarget != target && !(newtarget in foundtargets))//!newtarget.IsKnockdown())
-				if (rand(0, 5) < level_current)
-					playsound(get_turf(newtarget), "sound/weapons/punch[rand(1,4)].ogg", 15, 1, -1)
-					newtarget.Knockdown(10 + level_current * 5)
-				if(newtarget.IsStun())
-					newtarget.spin(10,1)
-					if (rand(0,4))
-						newtarget.drop_all_held_items()
-				foundtargets += newtarget
-		sleep(1)
-	if(user)
-		user.update_canmove() //Let the poor guy move again
+		if(success)		//don't sleep if we failed to move.
+			sleep(speed)
+	UnregisterSignal(owner, COMSIG_MOVABLE_MOVED)
+	hit = null
+	user.update_canmove()
 
 /datum/action/bloodsucker/targeted/haste/DeactivatePower(mob/living/user = owner, mob/living/target)
 	..() // activate = FALSE
 	user.update_canmove()
+
+/datum/action/bloodsucker/targeted/haste/proc/on_move()
+	for(var/mob/living/L in dview(1, get_turf(owner)))
+		if(!hit[L] && (L != owner))
+			hit[L] = TRUE
+			playsound(L, "sound/weapons/punch[rand(1,4)].ogg", 15, 1, -1)
+			L.Knockdown(10 + level_current * 5, override_hardstun = 0.1)
+			L.spin(10, 1)

code/modules/antagonists/bloodsucker/powers/lunge.dm

@@ -7,9 +7,9 @@
 	button_icon_state = "power_lunge"
 	bloodcost = 10
 	cooldown = 120
-	target_range = 3
+	target_range = 5
 	power_activates_immediately = TRUE
-	message_Trigger = ""//"Whom will you subvert to your will?"
+	message_Trigger = "Whom will you ensnare within your grasp?"
 	must_be_capacitated = TRUE
 	bloodsucker_can_buy = TRUE
 
@@ -58,25 +58,29 @@
 	var/do_knockdown = !is_A_facing_B(target,owner) || owner.alpha <= 0 || istype(owner.loc, /obj/structure/closet)
 	// CAUSES: Target has their back to me, I'm invisible, or I'm in a Closet
 	// Step One: Heatseek toward Target's Turf
-
-	walk_towards(owner, T, 0.1, 10) // NOTE: this runs in the background! to cancel it, you need to use walk(owner.current,0), or give them a new path.
 	addtimer(CALLBACK(owner, .proc/_walk, 0), 2 SECONDS)
-	if(get_turf(owner) != T && !(isliving(target) && target.Adjacent(owner)) && owner.incapacitated() && owner.resting)
-		var/send_dir = get_dir(owner, T)
-		new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE)
-		owner.spin(10)
-		 // Step Two: Check if I'm at/adjectent to Target's CURRENT turf (not original...that was just a destination)
-	sleep(1)
-	if(target.Adjacent(owner))
-		// LEVEL 2: If behind target, mute or unconscious!
-		if(do_knockdown) // && level_current >= 1)
-			target.Knockdown(15 + 10 * level_current,1)
-			target.adjustStaminaLoss(40 + 10 * level_current)
-		// Cancel Walk (we were close enough to contact them)
-		walk(owner, 0)
-		target.Stun(10,1) //Without this the victim can just walk away
-		target.grabbedby(owner) 										// Taken from mutations.dm under changelings
-		target.grippedby(owner, instant = TRUE) //instant aggro grab
+	target.playsound_local(get_turf(owner), 'sound/bloodsucker/lunge_warn.ogg', 60, FALSE, pressure_affected = FALSE) // target-only telegraphing
+	owner.playsound_local(owner, 'sound/bloodsucker/lunge_warn.ogg', 60, FALSE, pressure_affected = FALSE) // audio feedback to the user
+	if(do_mob(owner, owner, 6, TRUE, TRUE))
+		walk_towards(owner, T, 0.1, 10) // yes i know i shouldn't use this but i don't know how to work in anything better
+		if(get_turf(owner) != T && !(isliving(target) && target.Adjacent(owner)) && owner.incapacitated() && owner.resting)
+			var/send_dir = get_dir(owner, T)
+			new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE)
+			owner.spin(10)
+			// Step Two: Check if I'm at/adjectent to Target's CURRENT turf (not original...that was just a destination)
+		for(var/i in 1 to 6)
+			if (target.Adjacent(owner))
+				// LEVEL 2: If behind target, mute or unconscious!
+				if(do_knockdown) // && level_current >= 1)
+					target.Knockdown(15 + 10 * level_current,1)
+					target.adjustStaminaLoss(40 + 10 * level_current)
+				// Cancel Walk (we were close enough to contact them)
+				walk(owner, 0)
+				target.Stun(10,1) //Without this the victim can just walk away
+				target.grabbedby(owner) // Taken from mutations.dm under changelings
+				target.grippedby(owner, instant = TRUE) //instant aggro grab
+				break
+			sleep(i*3)
 
 /datum/action/bloodsucker/targeted/lunge/DeactivatePower(mob/living/user = owner, mob/living/target)
 	..() // activate = FALSE

code/modules/antagonists/bloodsucker/powers/masquerade.dm

@@ -54,8 +54,8 @@
 	REMOVE_TRAIT(user, TRAIT_VIRUSIMMUNE, "bloodsucker")
 	var/obj/item/organ/heart/vampheart/H = user.getorganslot(ORGAN_SLOT_HEART)
 	var/obj/item/organ/eyes/vassal/bloodsucker/E = user.getorganslot(ORGAN_SLOT_EYES)
-	E.flash_protect = 0 
-	
+	E.flash_protect = 0
+
 	// WE ARE ALIVE! //
 	bloodsuckerdatum.poweron_masquerade = TRUE
 	while(bloodsuckerdatum && ContinueActive(user))

code/modules/antagonists/bloodsucker/powers/mesmerize.dm

@@ -11,24 +11,25 @@
 	button_icon_state = "power_mez"
 	bloodcost = 30
 	cooldown = 300
-	target_range = 1
-	power_activates_immediately = FALSE
+	target_range = 3
+	power_activates_immediately = TRUE
 	message_Trigger = "Whom will you subvert to your will?"
 	must_be_capacitated = TRUE
 	bloodsucker_can_buy = TRUE
+	var/success
 
 /datum/action/bloodsucker/targeted/mesmerize/CheckCanUse(display_error)
 	. = ..()
 	if(!.)
 		return
-	if (!owner.getorganslot(ORGAN_SLOT_EYES))
+	if(!owner.getorganslot(ORGAN_SLOT_EYES))
 		if (display_error)
 			to_chat(owner, "<span class='warning'>You have no eyes with which to mesmerize.</span>")
 		return FALSE
 	// Check: Eyes covered?
 	var/mob/living/L = owner
-	if (istype(L) && L.is_eyes_covered() || !isturf(owner.loc))
-		if (display_error)
+	if(istype(L) && L.is_eyes_covered() || !isturf(owner.loc))
+		if(display_error)
 			to_chat(owner, "<span class='warning'>Your eyes are concealed from sight.</span>")
 		return FALSE
 	return TRUE
@@ -38,46 +39,51 @@
 
 /datum/action/bloodsucker/targeted/mesmerize/CheckCanTarget(atom/A,display_error)
 	// Check: Self
-	if (A == owner)
+	if(A == owner)
 		return FALSE
 	var/mob/living/carbon/target = A // We already know it's carbon due to CheckValidTarget()
+
 	// Bloodsucker
-	if (target.mind && target.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER))
+	if(target.mind && target.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER))
 		if (display_error)
 			to_chat(owner, "<span class='warning'>Bloodsuckers are immune to [src].</span>")
 		return FALSE
 	// Dead/Unconscious
-	if (target.stat > CONSCIOUS)
+	if(target.stat > CONSCIOUS)
 		if (display_error)
 			to_chat(owner, "<span class='warning'>Your victim is not [(target.stat == DEAD || HAS_TRAIT(target, TRAIT_FAKEDEATH))?"alive":"conscious"].</span>")
 		return FALSE
 	// Check: Target has eyes?
-	if (!target.getorganslot(ORGAN_SLOT_EYES))
+	if(!target.getorganslot(ORGAN_SLOT_EYES))
 		if (display_error)
 			to_chat(owner, "<span class='warning'>They have no eyes!</span>")
 		return FALSE
 	// Check: Target blind?
-	if (target.eye_blind > 0)
+	if(target.eye_blind > 0)
 		if (display_error)
 			to_chat(owner, "<span class='warning'>Your victim's eyes are glazed over. They cannot perceive you.</span>")
 		return FALSE
 	// Check: Target See Me? (behind wall)
-	if (!(owner in view(target_range, get_turf(target))))
+	if(!(target in view(target_range, get_turf(owner))))
 		// Sub-Check: GET CLOSER
 		//if (!(owner in range(target_range, get_turf(target)))
 		//	if (display_error)
 		//		to_chat(owner, "<span class='warning'>You're too far from your victim.</span>")
-		if (display_error)
+		if(display_error)
 			to_chat(owner, "<span class='warning'>You're too far outside your victim's view.</span>")
 		return FALSE
+
+	if(target.has_status_effect(STATUS_EFFECT_MESMERIZE)) // ?
+		return TRUE
+
 	// Check: Facing target?
-	if (!is_A_facing_B(owner,target))	// in unsorted.dm
+	if(!is_A_facing_B(owner,target))	// in unsorted.dm
 		if (display_error)
 			to_chat(owner, "<span class='warning'>You must be facing your victim.</span>")
 		return FALSE
 	// Check: Target facing me?
-	if (!target.resting && !is_A_facing_B(target,owner))
-		if (display_error)
+	if(!target.resting && !is_A_facing_B(target,owner))
+		if(display_error)
 			to_chat(owner, "<span class='warning'>Your victim must be facing you to see into your eyes.</span>")
 		return FALSE
 	return TRUE
@@ -88,19 +94,28 @@
 	var/mob/living/user = owner
 
 	if(istype(target))
-		target.Stun(40) //Utterly useless without this, its okay since there are so many checks to go through
-		target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 45) //So you cant rotate with combat mode, plus fancy status alert
+		var/power_time = 138 + level_current * 12
+		target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 30)
+		user.apply_status_effect(STATUS_EFFECT_MESMERIZE, 30)
+		if(do_mob(user, target, 30, TRUE, TRUE)) // 3 seconds windup
+			success = CheckCanTarget(target)
+			if(success) // target just has to be out of view when it is fully charged in order to avoid
+				PowerActivatedSuccessfully() // blood & cooldown only altered if power activated successfully - less "fuck you"-y
+				target.face_atom(user)
+				target.apply_status_effect(STATUS_EFFECT_MESMERIZE, power_time) // pretty much purely cosmetic
+				target.Stun(power_time)
+				to_chat(user, "<span class='notice'>[target] is fixed in place by your hypnotic gaze.</span>")
+				target.next_move = world.time + power_time // <--- Use direct change instead. We want an unmodified delay to their next move //    target.changeNext_move(power_time) // check click.dm
+				target.notransform = TRUE // <--- Fuck it. We tried using next_move, but they could STILL resist. We're just doing a hard freeze.
+			else
+				to_chat(user, "<span class='warning'>[target] has escaped your gaze!</span>")
+				DeactivatePower()
+				DeactivateRangedAbility()
+				StartCooldown()
+				// oops! if they knew how they could just spam stun the victim and themselves.
 
-	if(do_mob(user, target, 40, 0, TRUE, extra_checks = CALLBACK(src, .proc/ContinueActive, user, target)))
-		PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN!
-		var/power_time = 90 + level_current * 12
-		target.apply_status_effect(STATUS_EFFECT_MESMERIZE, power_time + 80)
-		to_chat(user, "<span class='notice'>[target] is fixed in place by your hypnotic gaze.</span>")
-		target.Stun(power_time)
-		target.next_move = world.time + power_time // <--- Use direct change instead. We want an unmodified delay to their next move //    target.changeNext_move(power_time) // check click.dm
-		target.notransform = TRUE // <--- Fuck it. We tried using next_move, but they could STILL resist. We're just doing a hard freeze.
 		spawn(power_time)
-			if(istype(target))
+			if(istype(target) && success)
 				target.notransform = FALSE
 				// They Woke Up! (Notice if within view)
 				if(istype(user) && target.stat == CONSCIOUS && (target in view(10, get_turf(user)))  )

code/modules/antagonists/brother/brother.dm

@@ -5,7 +5,6 @@
 	var/special_role = ROLE_BROTHER
 	var/datum/team/brother_team/team
 	antag_moodlet = /datum/mood_event/focused
-	can_hijack = HIJACK_HIJACKER
 
 /datum/antagonist/brother/create_team(datum/team/brother_team/new_team)
 	if(!new_team)

code/modules/antagonists/clockcult/clockcult.dm

@@ -120,7 +120,7 @@
 	hierophant_network.Grant(current)
 	current.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump)
 	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
-	if(G.active && ishuman(current))
+	if(G && G.active && ishuman(current))
 		current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER))
 
 /datum/antagonist/clockcult/remove_innate_effects(mob/living/mob_override)
@@ -174,9 +174,12 @@
 	log_admin("[key_name(admin)] has made [new_owner.current] into a servant of Ratvar.")
 
 /datum/antagonist/clockcult/admin_remove(mob/user)
-	remove_servant_of_ratvar(owner.current, TRUE)
-	message_admins("[key_name_admin(user)] has removed clockwork servant status from [owner.current].")
-	log_admin("[key_name(user)] has removed clockwork servant status from [owner.current].")
+	var/mob/target = owner.current
+	if(!target)
+		return
+	remove_servant_of_ratvar(target, TRUE)
+	message_admins("[key_name_admin(user)] has removed clockwork servant status from [target].")
+	log_admin("[key_name(user)] has removed clockwork servant status from [target].")
 
 /datum/antagonist/clockcult/get_admin_commands()
 	. = ..()

code/modules/antagonists/disease/disease_abilities.dm

@@ -5,49 +5,49 @@ is currently following.
 */
 
 GLOBAL_LIST_INIT(disease_ability_singletons, list(
-	new /datum/disease_ability/action/cough,
-	new /datum/disease_ability/action/sneeze,
-	new /datum/disease_ability/action/infect,
-	new /datum/disease_ability/symptom/mild/cough,
-	new /datum/disease_ability/symptom/mild/sneeze,
-	new /datum/disease_ability/symptom/medium/shedding,
-	new /datum/disease_ability/symptom/medium/beard,
-	new /datum/disease_ability/symptom/medium/hallucigen,
-	new /datum/disease_ability/symptom/medium/choking,
-	new /datum/disease_ability/symptom/medium/confusion,
-	new /datum/disease_ability/symptom/medium/vomit,
-	new /datum/disease_ability/symptom/medium/voice_change,
-	new /datum/disease_ability/symptom/medium/visionloss,
-	new /datum/disease_ability/symptom/medium/deafness,
-	new /datum/disease_ability/symptom/powerful/narcolepsy,
-	new /datum/disease_ability/symptom/medium/fever,
-	new /datum/disease_ability/symptom/medium/shivering,
-	new /datum/disease_ability/symptom/medium/headache,
-	new /datum/disease_ability/symptom/medium/nano_boost,
-	new /datum/disease_ability/symptom/medium/nano_destroy,
-	new /datum/disease_ability/symptom/medium/viraladaptation,
-	new /datum/disease_ability/symptom/medium/viralevolution,
-	new /datum/disease_ability/symptom/medium/vitiligo,
-	new /datum/disease_ability/symptom/medium/revitiligo,
-	new /datum/disease_ability/symptom/medium/itching,
-	new /datum/disease_ability/symptom/medium/heal/weight_loss,
-	new /datum/disease_ability/symptom/medium/heal/sensory_restoration,
-	new /datum/disease_ability/symptom/medium/heal/mind_restoration,
-	new /datum/disease_ability/symptom/powerful/fire,
-	new /datum/disease_ability/symptom/powerful/flesh_eating,
-//	new /datum/disease_ability/symptom/powerful/genetic_mutation,
-	new /datum/disease_ability/symptom/powerful/inorganic_adaptation,
-	new /datum/disease_ability/symptom/powerful/heal/starlight,
-	new /datum/disease_ability/symptom/powerful/heal/oxygen,
-	new /datum/disease_ability/symptom/powerful/heal/chem,
-	new /datum/disease_ability/symptom/powerful/heal/metabolism,
-	new /datum/disease_ability/symptom/powerful/heal/dark,
-	new /datum/disease_ability/symptom/powerful/heal/water,
-	new /datum/disease_ability/symptom/powerful/heal/plasma,
-	new /datum/disease_ability/symptom/powerful/heal/radiation,
-	new /datum/disease_ability/symptom/powerful/heal/coma,
-	new /datum/disease_ability/symptom/powerful/youth
-	))
+new /datum/disease_ability/action/cough,
+new /datum/disease_ability/action/sneeze,
+new /datum/disease_ability/action/infect,
+new /datum/disease_ability/symptom/mild/cough,
+new /datum/disease_ability/symptom/mild/sneeze,
+new /datum/disease_ability/symptom/medium/shedding,
+new /datum/disease_ability/symptom/medium/beard,
+new /datum/disease_ability/symptom/medium/hallucigen,
+new /datum/disease_ability/symptom/medium/choking,
+new /datum/disease_ability/symptom/medium/confusion,
+new /datum/disease_ability/symptom/medium/vomit,
+new /datum/disease_ability/symptom/medium/voice_change,
+new /datum/disease_ability/symptom/medium/visionloss,
+new /datum/disease_ability/symptom/medium/deafness,
+new /datum/disease_ability/symptom/powerful/narcolepsy,
+new /datum/disease_ability/symptom/medium/fever,
+new /datum/disease_ability/symptom/medium/shivering,
+new /datum/disease_ability/symptom/medium/headache,
+new /datum/disease_ability/symptom/medium/nano_boost,
+new /datum/disease_ability/symptom/medium/nano_destroy,
+new /datum/disease_ability/symptom/medium/viraladaptation,
+new /datum/disease_ability/symptom/medium/viralevolution,
+new /datum/disease_ability/symptom/medium/disfiguration,
+new /datum/disease_ability/symptom/medium/polyvitiligo,
+new /datum/disease_ability/symptom/medium/itching,
+new /datum/disease_ability/symptom/medium/heal/weight_loss,
+new /datum/disease_ability/symptom/medium/heal/sensory_restoration,
+new /datum/disease_ability/symptom/medium/heal/mind_restoration,
+new /datum/disease_ability/symptom/powerful/fire,
+new /datum/disease_ability/symptom/powerful/flesh_eating,
+new /datum/disease_ability/symptom/powerful/genetic_mutation,
+new /datum/disease_ability/symptom/powerful/inorganic_adaptation,
+new /datum/disease_ability/symptom/powerful/heal/starlight,
+new /datum/disease_ability/symptom/powerful/heal/oxygen,
+new /datum/disease_ability/symptom/powerful/heal/chem,
+new /datum/disease_ability/symptom/powerful/heal/metabolism,
+new /datum/disease_ability/symptom/powerful/heal/dark,
+new /datum/disease_ability/symptom/powerful/heal/water,
+new /datum/disease_ability/symptom/powerful/heal/plasma,
+new /datum/disease_ability/symptom/powerful/heal/radiation,
+new /datum/disease_ability/symptom/powerful/heal/coma,
+new /datum/disease_ability/symptom/powerful/youth
+))
 
 /datum/disease_ability
 	var/name
@@ -57,7 +57,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	var/short_desc = ""
 	var/long_desc = ""
 	var/stat_block = ""
-	var/threshold_block = list()
+	var/threshold_block = ""
 	var/category = ""
 
 	var/list/symptoms
@@ -76,7 +76,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 			resistance += initial(S.resistance)
 			stage_speed += initial(S.stage_speed)
 			transmittable += initial(S.transmittable)
-			threshold_block += initial(S.threshold_desc) 
+			threshold_block += "<br><br>[initial(S.threshold_desc)]"
 			stat_block = "Resistance: [resistance]<br>Stealth: [stealth]<br>Stage Speed: [stage_speed]<br>Transmissibility: [transmittable]<br><br>"
 			if(symptoms.len == 1) //lazy boy's dream
 				name = initial(S.name)
@@ -106,10 +106,8 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 			for(var/T in symptoms)
 				var/datum/symptom/S = new T()
 				SD.symptoms += S
-				S.OnAdd(SD)
 				if(SD.processing)
-					if(S.Start(SD))
-						S.next_activation = world.time + rand(S.symptom_delay_min * 10, S.symptom_delay_max * 10)
+					S.Start(SD)
 			SD.Refresh()
 	for(var/T in actions)
 		var/datum/action/A = new T()
@@ -136,7 +134,6 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 				var/datum/symptom/S = locate(T) in SD.symptoms
 				if(S)
 					SD.symptoms -= S
-					S.OnRemove(SD)
 					if(SD.processing)
 						S.End(SD)
 					qdel(S)
@@ -296,7 +293,6 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	cost = 8
 	category = "Symptom (Strong+)"
 
-
 /******MILD******/
 
 /datum/disease_ability/symptom/mild/cough
@@ -377,11 +373,11 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 /datum/disease_ability/symptom/medium/viralevolution
 	symptoms = list(/datum/symptom/viralevolution)
 
-/datum/disease_ability/symptom/medium/vitiligo
-	symptoms = list(/datum/symptom/vitiligo)
+/datum/disease_ability/symptom/medium/polyvitiligo
+	symptoms = list(/datum/symptom/polyvitiligo)
 
-/datum/disease_ability/symptom/medium/revitiligo
-	symptoms = list(/datum/symptom/revitiligo)
+/datum/disease_ability/symptom/medium/disfiguration
+	symptoms = list(/datum/symptom/disfiguration)
 
 /datum/disease_ability/symptom/medium/itching
 	symptoms = list(/datum/symptom/itching)
@@ -409,11 +405,9 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 /datum/disease_ability/symptom/powerful/flesh_eating
 	symptoms = list(/datum/symptom/flesh_eating)
 
-/*
 /datum/disease_ability/symptom/powerful/genetic_mutation
 	symptoms = list(/datum/symptom/genetic_mutation)
 	cost = 8
-*/
 
 /datum/disease_ability/symptom/powerful/inorganic_adaptation
 	symptoms = list(/datum/symptom/inorganic_adaptation)
@@ -457,4 +451,4 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 /datum/disease_ability/symptom/powerful/heal/coma
 	symptoms = list(/datum/symptom/heal/coma)
 	short_desc = "Cause victims to fall into a healing coma when hurt."
-	long_desc = "Cause victims to fall into a healing coma when hurt."
+	long_desc = "Cause victims to fall into a healing coma when hurt."

code/modules/antagonists/ert/ert.dm

@@ -12,7 +12,6 @@
 	var/list/name_source
 	show_in_antagpanel = FALSE
 	antag_moodlet = /datum/mood_event/focused
-	can_hijack = HIJACK_PREVENT
 
 /datum/antagonist/ert/on_gain()
 	update_name()

code/modules/antagonists/highlander/highlander.dm

@@ -3,7 +3,7 @@
 	var/obj/item/claymore/highlander/sword
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE
-	can_hijack = HIJACK_HIJACKER
+	hijack_speed = 2					//if you kill everyone and actually haev a hand to hijack with, you win??
 
 /datum/antagonist/highlander/apply_innate_effects(mob/living/mob_override)
 	var/mob/living/L = owner.current || mob_override

code/modules/antagonists/ninja/ninja.dm

@@ -8,11 +8,6 @@
 	var/give_objectives = TRUE
 	var/give_equipment = TRUE
 
-/datum/antagonist/ninja/New()
-	if(helping_station)
-		can_hijack = HIJACK_PREVENT
-	. = ..()
-
 /datum/antagonist/ninja/apply_innate_effects(mob/living/mob_override)
 	var/mob/living/M = mob_override || owner.current
 	update_ninja_icons_added(M)
@@ -135,8 +130,6 @@
 			adj = "objectiveless"
 		else
 			return
-	if(helping_station)
-		can_hijack = HIJACK_PREVENT
 	new_owner.assigned_role = ROLE_NINJA
 	new_owner.special_role = ROLE_NINJA
 	new_owner.add_antag_datum(src)

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -178,23 +178,22 @@
 	else
 		return NUKE_OFF_UNLOCKED
 
-/obj/machinery/nuclearbomb/update_icon()
-	if(deconstruction_state == NUKESTATE_INTACT)
-		switch(get_nuke_state())
-			if(NUKE_OFF_LOCKED, NUKE_OFF_UNLOCKED)
-				icon_state = "nuclearbomb_base"
-				update_icon_interior()
-				update_icon_lights()
-			if(NUKE_ON_TIMING)
-				cut_overlays()
-				icon_state = "nuclearbomb_timing"
-			if(NUKE_ON_EXPLODING)
-				cut_overlays()
-				icon_state = "nuclearbomb_exploding"
-	else
+/obj/machinery/nuclearbomb/update_icon_state()
+	if(deconstruction_state != NUKESTATE_INTACT)
 		icon_state = "nuclearbomb_base"
-		update_icon_interior()
-		update_icon_lights()
+		return
+	switch(get_nuke_state())
+		if(NUKE_OFF_LOCKED, NUKE_OFF_UNLOCKED)
+			icon_state = "nuclearbomb_base"
+		if(NUKE_ON_TIMING)
+			icon_state = "nuclearbomb_timing"
+		if(NUKE_ON_EXPLODING)
+			icon_state = "nuclearbomb_exploding"
+
+/obj/machinery/nuclearbomb/update_overlays()
+	. = ..()
+	update_icon_interior()
+	update_icon_lights()
 
 /obj/machinery/nuclearbomb/proc/update_icon_interior()
 	cut_overlay(interior)

code/modules/antagonists/nukeop/nukeop.dm

@@ -8,7 +8,6 @@
 	var/always_new_team = FALSE //If not assigned a team by default ops will try to join existing ones, set this to TRUE to always create new team.
 	var/send_to_spawnpoint = TRUE //Should the user be moved to default spawnpoint.
 	var/nukeop_outfit = /datum/outfit/syndicate
-	can_hijack = HIJACK_HIJACKER //Alternative way to wipe out the station.
 
 /datum/antagonist/nukeop/proc/update_synd_icons_added(mob/living/M)
 	var/datum/atom_hud/antag/opshud = GLOB.huds[ANTAG_HUD_OPS]

code/modules/antagonists/official/official.dm

@@ -4,7 +4,6 @@
 	show_in_antagpanel = FALSE
 	var/datum/objective/mission
 	var/datum/team/ert/ert_team
-	can_hijack = HIJACK_PREVENT
 
 /datum/antagonist/official/greet()
 	to_chat(owner, "<B><font size=3 color=red>You are a CentCom Official.</font></B>")

code/modules/antagonists/overthrow/overthrow_converter.dm

@@ -9,7 +9,7 @@
 	throw_speed = 3
 	throw_range = 5
 	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_METAL=600, MAT_GLASS=200)
+	custom_materials = list(/datum/material/iron=600, /datum/material/glass=200)
 	var/uses = 2
 
 /obj/item/overthrow_converter/proc/convert(mob/living/carbon/human/target, mob/living/carbon/human/user) // Should probably also delete any mindshield implant. Not sure.

code/modules/antagonists/swarmer/swarmer.dm

@@ -4,7 +4,7 @@
 	desc = "A shell of swarmer that was completely powered down. It can no longer activate itself."
 	icon = 'icons/mob/swarmer.dmi'
 	icon_state = "swarmer_unactivated"
-	materials = list(MAT_METAL=10000, MAT_GLASS=4000)
+	custom_materials = list(/datum/material/iron=10000, /datum/material/glass=4000)
 
 /obj/effect/mob_spawn/swarmer
 	name = "unactivated swarmer"
@@ -191,7 +191,7 @@
 	return 0
 
 /obj/item/IntegrateAmount() //returns the amount of resources gained when eating this item
-	if(materials[MAT_METAL] || materials[MAT_GLASS])
+	if(custom_materials[getmaterialref(/datum/material/iron)] || custom_materials[getmaterialref(/datum/material/glass)])
 		return 1
 	return ..()
 

code/modules/antagonists/traitor/datum_traitor.dm

@@ -10,7 +10,9 @@
 	var/should_give_codewords = TRUE
 	var/should_equip = TRUE
 	var/datum/traitor_class/traitor_kind
+	var/traitor_kind = TRAITOR_HUMAN //Set on initial assignment
 	can_hijack = HIJACK_HIJACKER
+	hijack_speed = 0.5				//10 seconds per hijack stage by default
 
 /datum/antagonist/traitor/New()
 	..()
@@ -82,6 +84,7 @@
 	message = GLOB.syndicate_code_response_regex.Replace(message, "<span class='red'>$1</span>")
 	hearing_args[HEARING_RAW_MESSAGE] = message
 
+// needs to be refactored to base /datum/antagonist sometime..
 /datum/antagonist/traitor/proc/add_objective(datum/objective/O)
 	objectives += O
 

code/modules/antagonists/wishgranter/wishgranter.dm

@@ -2,7 +2,6 @@
 	name = "Wishgranter Avatar"
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE
-	can_hijack = HIJACK_HIJACKER
 
 /datum/antagonist/wishgranter/proc/forge_objectives()
 	var/datum/objective/hijack/hijack = new

code/modules/antagonists/wizard/wizard.dm

@@ -12,7 +12,6 @@
 	var/move_to_lair = TRUE
 	var/outfit_type = /datum/outfit/wizard
 	var/wiz_age = WIZARD_AGE_MIN /* Wizards by nature cannot be too young. */
-	can_hijack = HIJACK_HIJACKER
 
 /datum/antagonist/wizard/on_gain()
 	register()

code/modules/assembly/assembly.dm

@@ -12,7 +12,7 @@
 	icon_state = ""
 	flags_1 = CONDUCT_1
 	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_METAL=100)
+	custom_materials = list(/datum/material/iron=100)
 	throwforce = 2
 	throw_speed = 3
 	throw_range = 7

code/modules/assembly/flash.dm

@@ -8,7 +8,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
 	throwforce = 0
 	w_class = WEIGHT_CLASS_TINY
-	materials = list(MAT_METAL = 300, MAT_GLASS = 300)
+	custom_materials = list(/datum/material/iron = 300, /datum/material/glass = 300)
 	crit_fail = FALSE     //Is the flash burnt out?
 	light_color = LIGHT_COLOR_WHITE
 	light_power = FLASH_LIGHT_POWER
@@ -267,7 +267,7 @@
 	throw_speed = 2
 	throw_range = 3
 	w_class = WEIGHT_CLASS_BULKY
-	materials = list(MAT_GLASS=7500, MAT_METAL=1000)
+	custom_materials = list(/datum/material/glass=7500, /datum/material/iron=1000)
 	attack_verb = list("shoved", "bashed")
 	block_chance = 50
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)

code/modules/assembly/health.dm

@@ -2,7 +2,7 @@
 	name = "health sensor"
 	desc = "Used for scanning and monitoring health."
 	icon_state = "health"
-	materials = list(MAT_METAL=800, MAT_GLASS=200)
+	custom_materials = list(/datum/material/iron=800, /datum/material/glass=200)
 	attachable = TRUE
 	secured = FALSE
 

code/modules/assembly/igniter.dm

@@ -2,7 +2,7 @@
 	name = "igniter"
 	desc = "A small electronic device able to ignite combustible substances."
 	icon_state = "igniter"
-	materials = list(MAT_METAL=500, MAT_GLASS=50)
+	custom_materials = list(/datum/material/iron=500, /datum/material/glass=50)
 	var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
 	heat = 1000
 

code/modules/assembly/infrared.dm

@@ -2,7 +2,7 @@
 	name = "infrared emitter"
 	desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted."
 	icon_state = "infrared"
-	materials = list(MAT_METAL=1000, MAT_GLASS=500)
+	custom_materials = list(/datum/material/iron=1000, /datum/material/glass=500)
 	is_position_sensitive = TRUE
 
 	var/on = FALSE

code/modules/assembly/mousetrap.dm

@@ -3,7 +3,7 @@
 	desc = "A handy little spring-loaded trap for catching pesty rodents."
 	icon_state = "mousetrap"
 	item_state = "mousetrap"
-	materials = list(MAT_METAL=100)
+	custom_materials = list(/datum/material/iron=100)
 	attachable = TRUE
 	var/armed = FALSE
 

code/modules/assembly/playback.dm

@@ -2,7 +2,7 @@
 	name = "playback device"
 	desc = "A small electronic device able to record a voice sample, and repeat that sample when it receive a signal."
 	icon_state = "radio"
-	materials = list(MAT_METAL=500, MAT_GLASS=50)
+	custom_materials = list(/datum/material/iron = 500, /datum/material/glass = 50)
 	flags_1 = HEAR_1
 	attachable = TRUE
 	verb_say = "beeps"

code/modules/assembly/proximity.dm

@@ -2,7 +2,7 @@
 	name = "proximity sensor"
 	desc = "Used for scanning and alerting when someone enters a certain proximity."
 	icon_state = "prox"
-	materials = list(MAT_METAL=800, MAT_GLASS=200)
+	custom_materials = list(/datum/material/iron=800, /datum/material/glass=200)
 	attachable = TRUE
 
 	var/scanning = FALSE

code/modules/assembly/signaler.dm

@@ -5,7 +5,7 @@
 	item_state = "signaler"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	materials = list(MAT_METAL=400, MAT_GLASS=120)
+	custom_materials = list(/datum/material/iron=400, /datum/material/glass=120)
 	wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
 	attachable = TRUE
 

code/modules/assembly/timer.dm

@@ -2,7 +2,7 @@
 	name = "timer"
 	desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
 	icon_state = "timer"
-	materials = list(MAT_METAL=500, MAT_GLASS=50)
+	custom_materials = list(/datum/material/iron=500, /datum/material/glass=50)
 	attachable = TRUE
 
 	var/timing = FALSE

code/modules/assembly/voice.dm

@@ -7,7 +7,7 @@
 	name = "voice analyzer"
 	desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated."
 	icon_state = "voice"
-	materials = list(MAT_METAL=500, MAT_GLASS=50)
+	custom_materials = list(/datum/material/iron=500, /datum/material/glass=50)
 	flags_1 = HEAR_1
 	attachable = TRUE
 	verb_say = "beeps"

code/modules/atmospherics/machinery/airalarm.dm

@@ -72,7 +72,7 @@
 	power_channel = ENVIRON
 	req_access = list(ACCESS_ATMOSPHERICS)
 	max_integrity = 250
-	integrity_failure = 80
+	integrity_failure = 0.33
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
 	resistance_flags = FIRE_PROOF
 
@@ -229,7 +229,7 @@
 			. += "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"] the interface.</span>"
 
 /obj/machinery/airalarm/ui_status(mob/user)
-	if(user.has_unlimited_silicon_privilege && aidisabled)
+	if(hasSiliconAccessInArea(user) && aidisabled)
 		to_chat(user, "AI control has been disabled.")
 	else if(!shorted)
 		return ..()
@@ -245,7 +245,7 @@
 /obj/machinery/airalarm/ui_data(mob/user)
 	var/data = list(
 		"locked" = locked,
-		"siliconUser" = user.has_unlimited_silicon_privilege || hasSiliconAccessInArea(user),
+		"siliconUser" = hasSiliconAccessInArea(user),
 		"emagged" = (obj_flags & EMAGGED ? 1 : 0),
 		"danger_level" = danger_level,
 	)
@@ -288,7 +288,7 @@
 								"danger_level" = cur_tlv.get_danger_level(environment.gases[gas_id] * partial_pressure)
 		))
 
-	if(!locked || user.has_unlimited_silicon_privilege || hasSiliconAccessInArea(user))
+	if(!locked || hasSiliconAccessInArea(user, PRIVILEDGES_SILICON|PRIVILEDGES_DRONE))
 		data["vents"] = list()
 		for(var/id_tag in A.air_vent_names)
 			var/long_name = A.air_vent_names[id_tag]
@@ -368,12 +368,14 @@
 /obj/machinery/airalarm/ui_act(action, params)
 	if(..() || buildstage != 2)
 		return
-	if((locked && !usr.has_unlimited_silicon_privilege && !hasSiliconAccessInArea(usr)) || (usr.has_unlimited_silicon_privilege && aidisabled))
+	var/silicon_access = hasSiliconAccessInArea(usr)
+	var/bot_priviledges = silicon_access || (usr.silicon_privileges & PRIVILEDGES_DRONE)
+	if((locked && !bot_priviledges) || (silicon_access && aidisabled))
 		return
 	var/device_id = params["id_tag"]
 	switch(action)
 		if("lock")
-			if(usr.has_unlimited_silicon_privilege && !wires.is_cut(WIRE_IDSCAN))
+			if(bot_priviledges && !wires.is_cut(WIRE_IDSCAN))
 				locked = !locked
 				. = TRUE
 		if("power", "toggle_filter", "widenet", "scrubbing")

code/modules/atmospherics/machinery/portable/canister.dm

@@ -19,7 +19,7 @@
 
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 50)
 	max_integrity = 250
-	integrity_failure = 100
+	integrity_failure = 0.4
 	pressure_resistance = 7 * ONE_ATMOSPHERE
 	var/temperature_resistance = 1000 + T0C
 	var/starter_temp

code/modules/awaymissions/super_secret_room.dm

@@ -122,7 +122,7 @@
 	icon = 'icons/obj/economy.dmi'
 	icon_state = "rupee"
 	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_GLASS = 500)
+	custom_materials = list(/datum/material/glass = 500)
 
 /obj/item/rupee/New()
 	var/newcolor = color2hex(pick(10;"green", 5;"blue", 3;"red", 1;"purple"))

code/modules/cargo/exports/large_objects.dm

@@ -24,13 +24,13 @@
 	export_types = list(/obj/structure/ore_box)
 
 /datum/export/large/crate/wood
-	cost = 140 //
+	cost = 140
 	unit_name = "wooden crate"
 	export_types = list(/obj/structure/closet/crate/wooden)
 	exclude_types = list()
 
 /datum/export/large/barrel
-	cost = 500 //150 to make meaning proffit of 350
+	cost = 300 //double the wooden cost of a coffin.
 	unit_name = "wooden barrel"
 	export_types = list(/obj/structure/fermenting_barrel)
 
@@ -40,19 +40,11 @@
 	export_types = list(/obj/structure/closet/crate/coffin)
 
 /datum/export/large/reagent_dispenser
-	cost = 100 // +0-400 depending on amount of reagents left
-	var/contents_cost = 400
-
-/datum/export/large/reagent_dispenser/get_cost(obj/O)
-	var/obj/structure/reagent_dispensers/D = O
-	var/ratio = D.reagents.total_volume / D.reagents.maximum_volume
-
-	return ..() + round(contents_cost * ratio)
+	cost = 100
 
 /datum/export/large/reagent_dispenser/water
 	unit_name = "watertank"
 	export_types = list(/obj/structure/reagent_dispensers/watertank)
-	contents_cost = 200
 
 /datum/export/large/reagent_dispenser/fuel
 	unit_name = "fueltank"
@@ -60,7 +52,6 @@
 
 /datum/export/large/reagent_dispenser/beer
 	unit_name = "beer keg"
-	contents_cost = 700
 	export_types = list(/obj/structure/reagent_dispensers/beerkeg)
 
 /datum/export/large/pipedispenser

code/modules/cargo/exports/materials.dm

@@ -15,16 +15,13 @@
 	if(!isitem(O))
 		return 0
 	var/obj/item/I = O
-	if(!(material_id in I.materials))
+	if(!(getmaterialref(material_id) in I.custom_materials))
 		return 0
 
-	var/amount = I.materials[material_id]
+	var/amount = I.custom_materials[getmaterialref(material_id)]
 
-	if(istype(I, /obj/item/stack))
-		var/obj/item/stack/S = I
-		amount *= S.amount
-		if(istype(I, /obj/item/stack/ore))
-			amount *= 0.8 // Station's ore redemption equipment is really goddamn good.
+	if(istype(I, /obj/item/stack/ore))
+		amount *= 0.8 // Station's ore redemption equipment is really goddamn good.
 
 	return round(amount/MINERAL_MATERIAL_AMOUNT)
 
@@ -32,53 +29,48 @@
 
 /datum/export/material/bananium
 	cost = 500
-	material_id = MAT_BANANIUM
+	material_id = /datum/material/bananium
 	message = "cm3 of bananium"
 
 /datum/export/material/diamond
 	cost = 250
-	material_id = MAT_DIAMOND
+	material_id = /datum/material/diamond
 	message = "cm3 of diamonds"
 
 /datum/export/material/plasma
 	cost = 100
-	material_id = MAT_PLASMA
+	material_id = /datum/material/plasma
 	message = "cm3 of plasma"
 
 /datum/export/material/uranium
 	cost = 50
-	material_id = MAT_URANIUM
+	material_id = /datum/material/uranium
 	message = "cm3 of uranium"
 
 /datum/export/material/gold
 	cost = 60
-	material_id = MAT_GOLD
+	material_id = /datum/material/gold
 	message = "cm3 of gold"
 
 /datum/export/material/silver
 	cost = 25
-	material_id = MAT_SILVER
+	material_id = /datum/material/silver
 	message = "cm3 of silver"
 
 /datum/export/material/titanium
 	cost = 60
-	material_id = MAT_TITANIUM
+	material_id = /datum/material/titanium
 	message = "cm3 of titanium"
 
-/datum/export/material/plastitanium
-	cost = 165 // plasma + titanium costs
-	material_id = MAT_TITANIUM // code can only check for one material_id; plastitanium is half plasma, half titanium
-	message = "cm3 of plastitanium"
-
 /datum/export/material/plastic
 	cost = 5
-	material_id = MAT_PLASTIC
+	material_id = /datum/material/plastic
 	message = "cm3 of plastic"
 
 /datum/export/material/metal
 	cost = 3
 	message = "cm3 of metal"
-	material_id = MAT_METAL
+	material_id = /datum/material/iron
 	export_types = list(
 		/obj/item/stack/sheet/metal, /obj/item/stack/tile/plasteel,
 		/obj/item/stack/rods, /obj/item/stack/ore, /obj/item/coin)
@@ -86,6 +78,26 @@
 /datum/export/material/glass
 	cost = 3
 	message = "cm3 of glass"
-	material_id = MAT_GLASS
+	material_id = /datum/material/glass
 	export_types = list(/obj/item/stack/sheet/glass, /obj/item/stack/ore,
 		/obj/item/shard)
+
+/datum/export/material/adamantine
+	cost = 300
+	material_id = /datum/material/adamantine
+	message = "cm3 of adamantine"
+
+/datum/export/material/mythril
+	cost = 1000
+	material_id = /datum/material/mythril
+	message = "cm3 of mythril"
+
+/datum/export/material/bscrystal
+	cost = 150
+	message = "cm3 of bluespace crystals"
+	material_id = /datum/material/bluespace
+
+/datum/export/material/runite
+	cost = 300
+	message = "cm3 of runite"
+	material_id = /datum/material/runite

code/modules/cargo/exports/sheets.dm

@@ -67,16 +67,26 @@
 	message = "of plasteel"
 	export_types = list(/obj/item/stack/sheet/plasteel)
 
+/datum/export/material/plastitanium
+	cost = 165 // plasma + titanium costs
+	export_types = list(/obj/item/stack/sheet/mineral/plastitanium)
+	message = "of plastitanium"
+
+/datum/export/material/plastitanium_glass
+	cost = 168 // plasma + titanium + glass costs
+	export_types = list(/obj/item/stack/sheet/plastitaniumglass)
+	message = "of plastitanium glass"
+
 // 1 glass + 0.5 metal, cost is rounded up.
 /datum/export/stack/rglass
 	cost = 6
 	message = "of reinforced glass"
 	export_types = list(/obj/item/stack/sheet/rglass)
 
-/datum/export/stack/bscrystal
-	cost = 150
-	message = "of bluespace crystals"
-	export_types = list(/obj/item/stack/sheet/bluespace_crystal)
+/datum/export/stack/plastitanium
+	cost = 165 // plasma + titanium costs
+	message = "of plastitanium"
+	export_types = list(/obj/item/stack/sheet/mineral/plastitanium)
 
 /datum/export/stack/wood
 	cost = 15
@@ -129,12 +139,6 @@
 	message = "of alien alloy"
 	export_types = list(/obj/item/stack/sheet/mineral/abductor)
 
-/datum/export/stack/adamantine
-	unit_name = "bar"
-	cost = 250
-	message = "of adamantine"
-	export_types = list(/obj/item/stack/sheet/mineral/adamantine)
-
 /datum/export/stack/bone
 	cost = 20
 	message = "of bones"

code/modules/cargo/exports/weapons.dm

@@ -199,6 +199,31 @@
 	unit_name = "advanced shotgun shell"
 	export_types = list(/obj/item/ammo_casing/shotgun/dragonsbreath, /obj/item/ammo_casing/shotgun/meteorslug, /obj/item/ammo_casing/shotgun/pulseslug, /obj/item/ammo_casing/shotgun/frag12, /obj/item/ammo_casing/shotgun/ion, /obj/item/ammo_casing/shotgun/laserslug)
 
+/////////////////////////
+//Bow and Arrows/////////
+/////////////////////////
+
+/datum/export/weapon/bows
+	cost = 450
+	unit_name = "bow"
+	export_types = list(/obj/item/gun/ballistic/bow)
+
+/datum/export/weapon/arrows
+	cost = 150
+	unit_name = "arrow"
+	export_types = list(/obj/item/ammo_casing/caseless/arrow, /obj/item/ammo_casing/caseless/arrow/bone, /obj/item/ammo_casing/caseless/arrow/ashen)
+
+/datum/export/weapon/bow_teaching
+	cost = 500
+	unit_name = "stone tablets"
+	export_types = list(/obj/item/book/granter/crafting_recipe/bone_bow)
+
+/datum/export/weapon/quiver
+	cost = 100
+	unit_name = "quiver"
+	export_types = list(/obj/item/storage/belt/quiver)
+
+
 /////////////////////////
 //The Traitor Sell Outs//
 /////////////////////////

code/modules/cargo/expressconsole.dm

@@ -97,7 +97,7 @@
 	var/canBeacon = beacon && (isturf(beacon.loc) || ismob(beacon.loc))//is the beacon in a valid location?
 	var/list/data = list()
 	data["locked"] = locked//swipe an ID to unlock
-	data["siliconUser"] = user.has_unlimited_silicon_privilege
+	data["siliconUser"] = hasSiliconAccessInArea(user)
 	data["beaconzone"] = beacon ? get_area(beacon) : ""//where is the beacon located? outputs in the tgui
 	data["usingBeacon"] = usingBeacon //is the mode set to deliver to the beacon or the cargobay?
 	data["canBeacon"] = !usingBeacon || canBeacon //is the mode set to beacon delivery, and is the beacon in a valid location?

code/modules/cargo/packs.dm

@@ -2,7 +2,7 @@
 	var/name = "Crate"
 	var/group = ""
 	var/hidden = FALSE //Aka emag only
-	var/contraband = FALSE //Hacking the console with a multitool
+	var/contraband = FALSE //Requires a hacked console UNLESS DropPodOnly = TRUE, in which case it requires an emag
 	var/cost = 700 // Minimum cost, or infinite points are possible.
 	var/access = FALSE //What access does the Crate itself need?
 	var/access_any = FALSE //Do we care about access?

code/modules/cargo/packs/armory.dm

@@ -178,7 +178,7 @@
 /datum/supply_pack/security/armory/russian
 	name = "Russian Surplus Crate"
 	desc = "Hello Comrade, we have the most modern russian military equipment the black market can offer, for the right price of course. Sadly we couldnt remove the lock so it requires Armory access to open."
-	cost = 5000
+	cost = 7500
 	contraband = TRUE
 	contains = list(/obj/item/reagent_containers/food/snacks/rationpack,
 					/obj/item/ammo_box/a762,
@@ -192,12 +192,11 @@
 					/obj/item/clothing/mask/russian_balaclava,
 					/obj/item/clothing/head/helmet/rus_ushanka,
 					/obj/item/clothing/suit/armor/vest/russian_coat,
-					/obj/item/gun/ballistic/shotgun/boltaction,
 					/obj/item/gun/ballistic/shotgun/boltaction)
 	crate_name = "surplus military crate"
 
 /datum/supply_pack/security/armory/russian/fill(obj/structure/closet/crate/C)
-	for(var/i in 1 to 10)
+	for(var/i in 1 to 5)
 		var/item = pick(contains)
 		new item(C)
 
@@ -218,7 +217,7 @@
 	crate_name = "swat crate"
 
 /datum/supply_pack/security/armory/swattasers //Lesser AEG tbh
-	name = "SWAT tatical tasers Crate"
+	name = "SWAT tactical tasers Crate"
 	desc = "Contains two tactical energy gun, these guns are able to tase, disable and lethal as well as hold a seclight. Requires Armory access to open."
 	cost = 7000
 	contains = list(/obj/item/gun/energy/e_gun/stun,

code/modules/cargo/packs/costumes_toys.dm

@@ -63,6 +63,7 @@
 					/obj/item/toy/cards/deck/syndicate,
 					/obj/item/reagent_containers/food/drinks/bottle/absinthe,
 					/obj/item/clothing/under/syndicate/tacticool,
+					/obj/item/clothing/under/syndicate/skirt,
 					/obj/item/clothing/under/syndicate,
 					/obj/item/suppressor,
 					/obj/item/storage/fancy/cigarettes/cigpack_syndicate,

code/modules/cargo/packs/emergency.dm

@@ -130,7 +130,7 @@
 
 /datum/supply_pack/emergency/bomb
 	name = "Explosive Emergency Crate"
-	desc = "Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (Time not included.)"
+	desc = "Science gone bonkers? Beeping behind the airlock? Buy now and become the hero the station des... I mean needs! Time not included, but a full bomb suit and hood, as well as a mask and defusal kit are! Non-Nuclear ordnances only."
 	cost = 1500
 	contains = list(/obj/item/clothing/head/bomb_hood,
 					/obj/item/clothing/suit/bomb_suit,

code/modules/cargo/packs/medical.dm

@@ -88,6 +88,7 @@
 					/obj/item/clothing/mask/gas,
 					/obj/item/clothing/suit/space/hardsuit/medical)
 	crate_name = "medical hardsuit"
+	crate_type = /obj/structure/closet/crate/secure/medical
 
 /datum/supply_pack/medical/supplies
 	name = "Medical Supplies Crate"
@@ -125,7 +126,7 @@
 					/obj/item/reagent_containers/medspray/synthflesh,
 					/obj/item/reagent_containers/medspray/sterilizine)
 	crate_name = "medco surgery tools"
-	crate_type = /obj/structure/closet/crate/medical
+	crate_type = /obj/structure/closet/crate/secure/medical
 
 /datum/supply_pack/medical/surgery
 	name = "Surgical Supplies Crate"

code/modules/cargo/packs/organic.dm

@@ -193,6 +193,7 @@
 					/obj/item/reagent_containers/food/snacks/meat/slab/bear,
 					/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
 					/obj/item/reagent_containers/food/snacks/meat/slab/spider,
+					/obj/item/reagent_containers/food/snacks/meat/rawcrab,
 					/obj/item/reagent_containers/food/snacks/meat/rawbacon,
 					/obj/item/reagent_containers/food/snacks/spiderleg,
 					/obj/item/reagent_containers/food/snacks/carpmeat,
@@ -327,7 +328,7 @@
 
 /datum/supply_pack/organic/seeds
 	name = "Seeds Crate"
-	desc = "Big things have small beginnings. Contains thirteen different seeds."
+	desc = "Big things have small beginnings. Contains fourteen different seeds."
 	cost = 1250
 	contains = list(/obj/item/seeds/chili,
 					/obj/item/seeds/berry,

code/modules/cargo/packs/science.dm

@@ -84,7 +84,7 @@
 
 /datum/supply_pack/science/glasswork
 	name = "Glass Blower Kit Crate"
-	desc = "Learn and make glassworks of usefull things for a profit! Contains glassworking tools and blowing rods. Glass not included."
+	desc = "Learn and make glassworks of useful things for a profit! Contains glassworking tools and blowing rods. Glass not included."
 	cost = 1000
 	contains = list(/obj/item/glasswork/glasskit,
 					/obj/item/glasswork/glasskit,
@@ -111,9 +111,9 @@
 /datum/supply_pack/science/nuke_b_gone
 	name = "Nuke Defusal Kit"
 	desc = "Contains set of tools to defuse a nuke."
-	cost = 7500 //Usefull for traitors/nukies that fucked up
+	cost = 7500 //Useful for traitors/nukies that fucked up
 	dangerous = TRUE
-	DropPodOnly = TRUE
+	hidden = TRUE
 	contains = list(/obj/item/nuke_core_container/nt,
 					/obj/item/screwdriver/nuke/nt,
 					/obj/item/paper/guides/nt/nuke_instructions)
@@ -194,7 +194,7 @@
 /datum/supply_pack/science/supermater
 	name = "Supermatter Extraction Tools Crate"
 	desc = "Contains a set of tools to extract a sliver of supermatter. Consult your CE today!"
-	cost = 7500 //Usefull for traitors that fucked up
+	cost = 7500 //Useful for traitors that fucked up
 	hidden = TRUE
 	contains = list(/obj/item/nuke_core_container/supermatter,
 					/obj/item/scalpel/supermatter,

code/modules/cargo/packs/security.dm

@@ -103,7 +103,7 @@
 	desc = "An old russian Minutemen crate, comes with a full russian outfit, a mosin and a stripper clip."
 	contraband = TRUE
 	access = FALSE
-	cost = 5500 //
+	cost = 6500 //
 	contains = list(/obj/item/clothing/suit/armor/navyblue/russian,
 					/obj/item/clothing/shoes/combat,
 					/obj/item/clothing/head/ushanka,

code/modules/client/client_procs.dm

@@ -737,13 +737,13 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 			message_admins("<span class='adminnotice'>Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN.</span>")
 		ip_intel = res.intel
 
-/client/Click(atom/object, atom/location, control, params)
+/client/Click(atom/object, atom/location, control, params, ignore_spam = FALSE)
 	var/ab = FALSE
 	var/list/L = params2list(params)
 	if (object && object == middragatom && L["left"])
 		ab = max(0, 5 SECONDS-(world.time-middragtime)*0.1)
 	var/mcl = CONFIG_GET(number/minute_click_limit)
-	if (!holder && mcl)
+	if (!holder && !ignore_spam && mcl)
 		var/minute = round(world.time, 600)
 		if (!clicklimiter)
 			clicklimiter = new(LIMITER_SIZE)
@@ -768,7 +768,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 			return
 
 	var/scl = CONFIG_GET(number/second_click_limit)
-	if (!holder && scl)
+	if (!holder && !ignore_spam && scl)
 		var/second = round(world.time, 10)
 		if (!clicklimiter)
 			clicklimiter = new(LIMITER_SIZE)

code/modules/client/preferences.dm

@@ -1474,8 +1474,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 				if("flavor_text")
 					var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", features["flavor_text"], MAX_FAVOR_LEN, TRUE)
-					if(msg)
-						features["flavor_text"] = msg
+					if(!isnull(msg))
+						features["flavor_text"] = html_decode(msg)
 
 				if("hair")
 					var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference","#"+hair_color) as color|null

code/modules/clothing/clothing.dm

@@ -2,7 +2,7 @@
 	name = "clothing"
 	resistance_flags = FLAMMABLE
 	max_integrity = 200
-	integrity_failure = 80
+	integrity_failure = 0.4
 	var/damaged_clothes = 0 //similar to machine's BROKEN stat and structure's broken var
 	var/flash_protect = 0		//What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS
 	var/tint = 0				//Sets the item's level of visual impairment tint, normally set to the same as flash_protect

code/modules/clothing/glasses/_glasses.dm

@@ -8,7 +8,7 @@
 	strip_delay = 20
 	equip_delay_other = 25
 	resistance_flags = NONE
-	materials = list(MAT_GLASS = 250)
+	custom_materials = list(/datum/material/glass = 250)
 	var/vision_flags = 0
 	var/darkness_view = 2//Base human is 2
 	var/invis_view = SEE_INVISIBLE_LIVING	//admin only for now
@@ -286,7 +286,7 @@
 	icon_state = "welding-g"
 	item_state = "welding-g"
 	actions_types = list(/datum/action/item_action/toggle)
-	materials = list(MAT_METAL = 250)
+	custom_materials = list(/datum/material/iron = 250)
 	flash_protect = 2
 	tint = 2
 	visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT

code/modules/clothing/head/helmet.dm

@@ -237,6 +237,14 @@
 	icon_state = "knight_red"
 	item_state = "knight_red"
 
+/obj/item/clothing/head/helmet/knight/greyscale
+	name = "knight helmet"
+	desc = "A classic medieval helmet, if you hold it upside down you could see that it's actually a bucket."
+	icon_state = "knight_greyscale"
+	item_state = "knight_greyscale"
+	armor = list("melee" = 35, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 10, "rad" = 10, "fire" = 40, "acid" = 40)
+	material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR //Can change color and add prefix
+
 /obj/item/clothing/head/helmet/skull
 	name = "skull helmet"
 	desc = "An intimidating tribal helmet, it doesn't look very comfortable."

code/modules/clothing/head/misc_special.dm

@@ -19,7 +19,7 @@
 	icon_state = "welding"
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	item_state = "welding"
-	materials = list(MAT_METAL=1750, MAT_GLASS=400)
+	custom_materials = list(/datum/material/iron=1750, /datum/material/glass=400)
 	flash_protect = 2
 	tint = 2
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 60)

code/modules/clothing/masks/gasmask.dm

@@ -25,7 +25,7 @@
 	name = "welding mask"
 	desc = "A gas mask with built-in welding goggles and a face shield. Looks like a skull - clearly designed by a nerd."
 	icon_state = "weldingmask"
-	materials = list(MAT_METAL=4000, MAT_GLASS=2000)
+	custom_materials = list(/datum/material/iron=4000, /datum/material/glass=2000)
 	flash_protect = 2
 	tint = 2
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 55)

code/modules/clothing/shoes/bananashoes.dm

@@ -10,7 +10,7 @@
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize()
 	. = ..()
-	AddComponent(/datum/component/material_container, list(MAT_BANANIUM), 200000, TRUE, /obj/item/stack)
+	AddComponent(/datum/component/material_container, list(/datum/material/bananium), 200000, TRUE, /obj/item/stack)
 	AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75)
 	if(always_noslip)
 		clothing_flags |= NOSLIP
@@ -19,7 +19,7 @@
 	. = ..()
 	var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
 	if(on)
-		if(bananium.amount(MAT_BANANIUM) < 100)
+		if(bananium.get_material_amount(/datum/material/bananium) < 100)
 			on = !on
 			if(!always_noslip)
 				clothing_flags &= ~NOSLIP
@@ -27,7 +27,7 @@
 			to_chat(loc, "<span class='warning'>You ran out of bananium!</span>")
 		else
 			new /obj/item/grown/bananapeel/specialpeel(get_step(src,turn(usr.dir, 180))) //honk
-			bananium.use_amount_type(100, MAT_BANANIUM)
+			bananium.use_amount_mat(100, /datum/material/bananium)
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/attack_self(mob/user)
 	var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
@@ -43,7 +43,7 @@
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click(mob/user)
 	var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
-	if(bananium.amount(MAT_BANANIUM))
+	if(bananium.get_material_amount(/datum/material/bananium))
 		on = !on
 		update_icon()
 		to_chat(user, "<span class='notice'>You [on ? "activate" : "deactivate"] the prototype shoes.</span>")

code/modules/clothing/suits/armor.dm

@@ -261,6 +261,14 @@
 	icon_state = "knight_red"
 	item_state = "knight_red"
 
+/obj/item/clothing/suit/armor/riot/knight/greyscale
+	name = "knight armour"
+	desc = "A classic suit of armour, able to be made from many different materials."
+	icon_state = "knight_greyscale"
+	item_state = "knight_greyscale"
+	armor = list("melee" = 35, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 10, "rad" = 10, "fire" = 40, "acid" = 40)
+	material_flags = MATERIAL_ADD_PREFIX //Can change color and add prefix
+
 /obj/item/clothing/suit/armor/vest/durathread
 	name = "makeshift vest"
 	desc = "A vest made of durathread with strips of leather acting as trauma plates."

code/modules/clothing/under/accessories.dm

@@ -105,7 +105,7 @@
 	desc = "A bronze medal."
 	icon_state = "bronze"
 	item_color = "bronze"
-	materials = list(MAT_METAL=1000)
+	custom_materials = list(/datum/material/iron=1000)
 	resistance_flags = FIRE_PROOF
 	var/medaltype = "medal" //Sprite used for medalbox
 	var/commended = FALSE
@@ -190,7 +190,7 @@
 	icon_state = "silver"
 	item_color = "silver"
 	medaltype = "medal-silver"
-	materials = list(MAT_SILVER=1000)
+	custom_materials = list(/datum/material/silver=1000)
 
 /obj/item/clothing/accessory/medal/silver/valor
 	name = "medal of valor"
@@ -206,7 +206,7 @@
 	icon_state = "gold"
 	item_color = "gold"
 	medaltype = "medal-gold"
-	materials = list(MAT_GOLD=1000)
+	custom_materials = list(/datum/material/gold=1000)
 
 /obj/item/clothing/accessory/medal/gold/captain
 	name = "medal of captaincy"
@@ -217,7 +217,7 @@
 	name = "old medal of captaincy"
 	desc = "A rustic badge pure gold, has been through hell and back by the looks, the syndcate have been after these by the looks of it for generations..."
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 10) //Pure gold
-	materials = list(MAT_GOLD=2000)
+	custom_materials = list(/datum/material/gold=2000)
 
 /obj/item/clothing/accessory/medal/gold/heroism
 	name = "medal of exceptional heroism"
@@ -230,7 +230,7 @@
 	item_color = "plasma"
 	medaltype = "medal-plasma"
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = -10, "acid" = 0) //It's made of plasma. Of course it's flammable.
-	materials = list(MAT_PLASMA=1000)
+	custom_materials = list(/datum/material/plasma=1000)
 
 /obj/item/clothing/accessory/medal/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)

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/sentience.dm

@@ -24,7 +24,7 @@
 
 /datum/round_event/ghost_role/sentience/spawn_role()
 	var/list/mob/dead/observer/candidates
-	candidates = get_candidates(ROLE_ALIEN, null, ROLE_ALIEN)
+	candidates = get_candidates(ROLE_SENTIENCE, null, ROLE_SENTIENCE)
 
 	// find our chosen mob to breathe life into
 	// Mobs have to be simple animals, mindless and on station

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/drinks/drinks.dm

@@ -202,7 +202,7 @@
 	force = 1
 	throwforce = 1
 	amount_per_transfer_from_this = 5
-	materials = list(MAT_METAL=100)
+	custom_materials = list(/datum/material/iron=100)
 	possible_transfer_amounts = list()
 	volume = 5
 	flags_1 = CONDUCT_1
@@ -218,7 +218,7 @@
 	force = 14
 	throwforce = 10
 	amount_per_transfer_from_this = 20
-	materials = list(MAT_GOLD=1000)
+	custom_materials = list(/datum/material/gold=1000)
 	volume = 150
 
 /obj/item/reagent_containers/food/drinks/trophy/silver_cup
@@ -229,7 +229,7 @@
 	force = 10
 	throwforce = 8
 	amount_per_transfer_from_this = 15
-	materials = list(MAT_SILVER=800)
+	custom_materials = list(/datum/material/silver=800)
 	volume = 100
 
 /obj/item/reagent_containers/food/drinks/trophy/bronze_cup
@@ -240,7 +240,7 @@
 	force = 5
 	throwforce = 4
 	amount_per_transfer_from_this = 10
-	materials = list(MAT_METAL=400)
+	custom_materials = list(/datum/material/iron=400)
 	volume = 25
 
 ///////////////////////////////////////////////Drinks/////////////////////////////////////////
@@ -400,7 +400,7 @@
 	name = "shaker"
 	desc = "A metal shaker to mix drinks in."
 	icon_state = "shaker"
-	materials = list(MAT_METAL=1500)
+	custom_materials = list(/datum/material/iron=1500)
 	amount_per_transfer_from_this = 10
 	volume = 100
 	isGlass = FALSE
@@ -409,7 +409,7 @@
 	name = "flask"
 	desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
 	icon_state = "flask"
-	materials = list(MAT_METAL=250)
+	custom_materials = list(/datum/material/iron=250)
 	volume = 60
 	isGlass = FALSE
 
@@ -417,7 +417,7 @@
 	name = "captain's flask"
 	desc = "A gold flask belonging to the captain."
 	icon_state = "flask_gold"
-	materials = list(MAT_GOLD=500)
+	custom_materials = list(/datum/material/gold=500)
 
 /obj/item/reagent_containers/food/drinks/flask/det
 	name = "detective's flask"

code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

@@ -6,7 +6,7 @@
 	icon_state = "glass_empty"
 	amount_per_transfer_from_this = 10
 	volume = 50
-	materials = list(MAT_GLASS=500)
+	custom_materials = list(/datum/material/glass=500)
 	max_integrity = 20
 	spillable = TRUE
 	resistance_flags = ACID_PROOF
@@ -45,7 +45,7 @@
 	amount_per_transfer_from_this = 15
 	possible_transfer_amounts = list()
 	volume = 15
-	materials = list(MAT_GLASS=100)
+	custom_materials = list(/datum/material/glass=100)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change(changetype)
 	cut_overlays()

code/modules/food_and_drinks/food/customizables.dm

@@ -293,7 +293,7 @@
 	icon = 'icons/obj/food/soupsalad.dmi'
 	icon_state = "bowl"
 	reagent_flags = OPENCONTAINER
-	materials = list(MAT_GLASS = 500)
+	custom_materials = list(/datum/material/glass = 500)
 	w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/reagent_containers/glass/bowl/attackby(obj/item/I,mob/user, params)

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."
@@ -375,7 +389,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 /obj/item/reagent_containers/food/snacks/cakeslice/peach_slice
 	name = "peach cake slice"
 	desc = "A slice of peach cake."
-	icon_state = "peach_slice"
+	icon_state = "peachcake_slice"
 	filling_color = "#00FFFF"
 	tastes = list("cake" = 1, "sugar" = 1, "peachjuice" = 10)
 	foodtype = GRAIN | SUGAR | DAIRY
@@ -396,4 +410,4 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	icon_state = "trumpetcakeslice"
 	filling_color = "#7A3D80"
 	tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
-	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
+	foodtype = GRAIN | DAIRY | FRUIT | SUGAR

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_meat.dm

@@ -325,7 +325,7 @@
 /obj/item/reagent_containers/food/snacks/corndog
 	name = "corndog plate"
 	desc = "A plate with two small corn dogs, with two dimples of ketchup and mustard to dip them in."
-	icon_state = "dorndog"
+	icon_state = "corndog"
 	trash = /obj/item/trash/plate/alt
 	tastes = list("hotdog" = 2, "mustard and ketchup" = 1, "fryed bread" = 1)
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/mustard = 5, /datum/reagent/consumable/ketchup = 5)
@@ -359,4 +359,4 @@
 	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/bbqsauce = 5)
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("meat" = 3, "smokey sauce" = 1)
-	foodtype = MEAT
+	foodtype = MEAT

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/food/snacks_pie.dm

@@ -53,7 +53,8 @@
 		H.adjust_blurriness(1)
 		H.visible_message("<span class='warning'>[H] is creamed by [src]!</span>", "<span class='userdanger'>You've been creamed by [src]!</span>")
 		playsound(H, "desceration", 50, TRUE)
-		reagents.trans_to(H,15) //Cream pie combat
+		if(!H.is_mouth_covered())	
+			reagents.trans_to(H,15) //Cream pie combat
 		if(!H.creamed) // one layer at a time
 			H.add_overlay(creamoverlay)
 			H.creamed = TRUE

code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm

@@ -319,7 +319,7 @@
 /obj/machinery/icecream_vat/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
 	if(beaker)
 		beaker.forceMove(drop_location())
-		if(user && Adjacent(user) && !issiliconoradminghost(user))
+		if(user && Adjacent(user) && user.can_hold_items())
 			user.put_in_hands(beaker)
 	if(new_beaker)
 		beaker = new_beaker

code/modules/food_and_drinks/kitchen_machinery/microwave.dm

@@ -309,8 +309,8 @@
 	var/metal = 0
 	for(var/obj/item/O in ingredients)
 		O.microwave_act(src)
-		if(O.materials[MAT_METAL])
-			metal += O.materials[MAT_METAL]
+		if(O.custom_materials?.len)
+			metal += O.custom_materials[getmaterialref(/datum/material/iron)]
 
 	if(metal)
 		spark()

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -591,7 +591,7 @@
 	results = list(/datum/reagent/consumable/ethanol/cogchamp = 3)
 	required_reagents = list(/datum/reagent/consumable/ethanol/cognac = 1, /datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol/screwdrivercocktail = 1)
 	mix_message = "You hear faint sounds of gears turning as it mixes."
-	mix_sound = 'sound/effects/clockcult_gateway_closing.ogg'
+	mix_sound = 'sound/machines/clockcult/steam_whoosh.ogg'
 
 /datum/chemical_reaction/quadruplesec
 	name = "Quadruple Sec"

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