fixes merge conflict

code/modules/admin/admin.dm

@@ -784,11 +784,13 @@ var/global/nologevent = 0
 		log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
 		message_admins("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
 		return //alert("Round end delayed", null, null, null, null, null)
-	going = !( going )
-	if(!( going ))
+	if(going)
+		going = FALSE
+		SSticker.delay_end = TRUE
 		to_chat(world, "<b>The game start has been delayed.</b>")
 		log_admin("[key_name(usr)] delayed the game.")
 	else
+		going = TRUE
 		to_chat(world, "<b>The game will start soon.</b>")
 		log_admin("[key_name(usr)] removed the delay.")
 	feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/antagonists/_common/antag_spawner.dm

@@ -210,6 +210,7 @@
 	var/datum/objective/KillDaCrew = new /datum/objective
 	KillDaCrew.owner = S.mind
 	KillDaCrew.explanation_text = "[objective_verb] everyone else while you're at it."
+	KillDaCrew.completed = TRUE
 	S.mind.objectives += KillDaCrew
 	to_chat(S, "<B>Objective #[1]</B>: [KillDaWiz.explanation_text]")
 	to_chat(S, "<B>Objective #[2]</B>: [KillDaCrew.explanation_text]")
@@ -219,7 +220,8 @@
 	desc = "A magically infused bottle of clown love, distilled from \
 		countless hugging attacks. Used in funny rituals to attract \
 		adorable creatures."
-	color = "#FF69B4" // HOT PINK
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "vialtickles"
 	veil_msg = "<span class='warning'>You sense an adorable presence \
 		lurking just beyond the veil...</span>"
 	objective_verb = "Hug and tickle"
@@ -278,6 +280,7 @@
 	var/datum/objective/KillDaCrew = new /datum/objective
 	KillDaCrew.owner = M.mind
 	KillDaCrew.explanation_text = "[objective_verb] everyone and everything else while you're at it."
+	KillDaCrew.completed = TRUE
 	M.mind.objectives += KillDaCrew
 	to_chat(M, "<B>Objective #[1]</B>: [KillDaWiz.explanation_text]")
 	to_chat(M, "<B>Objective #[2]</B>: [KillDaCrew.explanation_text]")

code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm

@@ -104,6 +104,11 @@
 			H.rename_character(null, H.dna.species.get_random_name())
 		else
 			H.rename_character(null, name)
+		if(is_species(H, /datum/species/golem/tranquillite) && H.mind)
+			H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall(null))
+			H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak(null))
+			H.mind.miming = TRUE
+
 	if(has_owner)
 		new_spawn.mind.assigned_role = "Servant Golem"
 	else

code/modules/client/asset_cache.dm

@@ -318,7 +318,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 		for(var/D in cardinal)
 			assets["[state]-[dir2text(D)].png"] = icon('icons/obj/pipe-item.dmi', state, D)
 	for(var/state in icon_states('icons/obj/pipes/disposal.dmi'))
-		if(!(state in list("pipe-c", "pipe-j1", "pipe-s", "pipe-t", "pipe-y", "intake", "outlet"))) //Pipes we want sprites for
+		if(!(state in list("pipe-c", "pipe-j1", "pipe-s", "pipe-t", "pipe-y", "intake", "outlet", "pipe-j1s"))) //Pipes we want sprites for
 			continue
 		for(var/D in cardinal)
 			assets["[state]-[dir2text(D)].png"] = icon('icons/obj/pipes/disposal.dmi', state, D)

code/modules/client/preference/loadout/loadout_cosmetics.dm

@@ -21,12 +21,4 @@
 
 /datum/gear/lipstick/lime
 	display_name = "lipstick, lime"
-	path = /obj/item/lipstick/lime
-
-/datum/gear/monocle
-	display_name = "monocle"
-	path = /obj/item/clothing/glasses/monocle
-
-/datum/gear/sunglasses
-	display_name = "cheap sunglasses"
-	path = /obj/item/clothing/glasses/sunglasses/fake
+	path = /obj/item/lipstick/lime

code/modules/client/preference/loadout/loadout_donor.dm

@@ -18,12 +18,10 @@
 /datum/gear/donor/furcape
 	display_name = "Fur Cape"
 	path = /obj/item/clothing/suit/furcape
-	cost = 2
 
 /datum/gear/donor/furcoat
 	display_name = "Fur Coat"
 	path = /obj/item/clothing/suit/furcoat
-	cost = 2
 
 /datum/gear/donor/kamina
 	display_name = "Spiky Orange-tinted Shades"
@@ -33,10 +31,6 @@
 	display_name = "Spiky Green-tinted Shades"
 	path = /obj/item/clothing/glasses/fluff/kamina/green
 
-/datum/gear/donor/hipster
-	display_name = "Hipster Glasses"
-	path = /obj/item/clothing/glasses/regular/hipster
-
 /datum/gear/donor/threedglasses
 	display_name = "Threed Glasses"
 	path = /obj/item/clothing/glasses/threedglasses

code/modules/client/preference/loadout/loadout_glasses.dm

@@ -0,0 +1,24 @@
+/datum/gear/glasses
+	subtype_path = /datum/gear/glasses
+	slot = slot_glasses
+	sort_category = "Glasses"
+
+/datum/gear/glasses/sunglasses
+	display_name = "cheap sunglasses"
+	path = /obj/item/clothing/glasses/sunglasses_fake
+
+/datum/gear/glasses/eyepatch
+	display_name = "Eyepatch"
+	path = /obj/item/clothing/glasses/eyepatch
+
+/datum/gear/glasses/hipster
+	display_name = "Hipster glasses"
+	path = /obj/item/clothing/glasses/regular/hipster
+
+/datum/gear/glasses/monocle
+	display_name = "Monocle"
+	path = /obj/item/clothing/glasses/monocle
+
+/datum/gear/glasses/prescription
+	display_name = "Prescription glasses"
+	path = /obj/item/clothing/glasses/regular

code/modules/client/preference/loadout/loadout_gloves.dm

@@ -0,0 +1,8 @@
+/datum/gear/gloves
+	subtype_path = /datum/gear/gloves
+	slot = slot_gloves
+	sort_category = "Gloves"
+
+/datum/gear/gloves/fingerless
+	display_name = "Fingerless Gloves"
+	path = /obj/item/clothing/gloves/fingerless

code/modules/client/preference/loadout/loadout_shoes.dm

@@ -27,25 +27,32 @@
 
 /datum/gear/shoes/cowboyboots
 	display_name = "cowboy boots, brown"
-	cost = 1
-	path = /obj/item/clothing/shoes/cowboyboots
+	path = /obj/item/clothing/shoes/cowboy
 
 /datum/gear/shoes/cowboyboots_black
 	display_name = "cowboy boots, black"
-	cost = 1
-	path = /obj/item/clothing/shoes/cowboyboots/black
+	path = /obj/item/clothing/shoes/cowboy/black
 
 /datum/gear/shoes/cowboyboots/white
 	display_name = "cowboy boots, white"
-	cost = 1
-	path = /obj/item/clothing/shoes/cowboyboots/white
+	path = /obj/item/clothing/shoes/cowboy/white
 
 /datum/gear/shoes/cowboyboots/pink
 	display_name = "cowboy boots, pink"
-	cost = 1
-	path = /obj/item/clothing/shoes/cowboyboots/pink
-	
+	path = /obj/item/clothing/shoes/cowboy/pink
+
 /datum/gear/shoes/laceup
 	display_name = "laceup shoes"
-	cost = 1
 	path = /obj/item/clothing/shoes/laceup
+
+/datum/gear/shoes/blackshoes
+	display_name = "Black shoes"
+	path = /obj/item/clothing/shoes/black
+
+/datum/gear/shoes/brownshoes
+	display_name = "Brown shoes"
+	path = /obj/item/clothing/shoes/brown
+
+/datum/gear/shoes/whiteshoes
+	display_name = "White shoes"
+	path = /obj/item/clothing/shoes/white

code/modules/client/preference/loadout/loadout_suit.dm

@@ -1,7 +1,6 @@
 /datum/gear/suit
 	subtype_path = /datum/gear/suit
 	slot = slot_wear_suit
-	cost = 2
 	sort_category = "External Wear"
 
 //WINTER COATS
@@ -105,6 +104,10 @@
 	path = /obj/item/clothing/suit/armor/secjacket
 	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
 
+/datum/gear/suit/ianshirt
+	display_name = "Ian Shirt"
+	path = /obj/item/clothing/suit/ianshirt
+
 /datum/gear/suit/poncho
 	display_name = "poncho, classic"
 	path = /obj/item/clothing/suit/poncho

code/modules/client/preference/loadout/loadout_uniform.dm

@@ -2,7 +2,6 @@
 /datum/gear/uniform
 	subtype_path = /datum/gear/uniform
 	slot = slot_w_uniform
-	cost = 2
 	sort_category = "Uniforms and Casual Dress"
 
 /datum/gear/uniform/skirt

code/modules/client/preference/preferences_toggles.dm

@@ -201,6 +201,19 @@
 		to_chat(src, "You will no longer hear musical instruments.")
 	feedback_add_details("admin_verb","TInstru") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/verb/Toggle_disco() //to toggle off the disco machine locally, in case it gets too annoying
+	set name = "Hear/Silence Dance Machine"
+	set category = "Preferences"
+	set desc = "Toggles hearing and dancing to the radiant dance machine"
+	prefs.sound ^= SOUND_DISCO
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_DISCO)
+		to_chat(src, "You will now hear and dance to the radiant dance machine.")
+	else
+		to_chat(src, "You will no longer hear or dance to the radiant dance machine.")
+		usr.stop_sound_channel(CHANNEL_JUKEBOX)
+	feedback_add_details("admin_verb","Tdd") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /client/verb/setup_character()
 	set name = "Game Preferences"
 	set category = "Preferences"

code/modules/clothing/clothing.dm

@@ -444,7 +444,8 @@ BLIND     // can't see anything
 	slowdown = SHOES_SLOWDOWN
 
 	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		"Vox" = 'icons/mob/species/vox/shoes.dmi',
+		"Drask" = 'icons/mob/species/drask/shoes.dmi'
 		)
 
 /obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
@@ -595,7 +596,7 @@ BLIND     // can't see anything
 	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	heat_protection = HEAD
 	max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 	flash_protect = 2
 	strip_delay = 50
 	put_on_delay = 50
@@ -623,7 +624,7 @@ BLIND     // can't see anything
 	put_on_delay = 80
 	burn_state = FIRE_PROOF
 	hide_tail_by_species = null
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 
 //Under clothing
 /obj/item/clothing/under

code/modules/clothing/glasses/glasses.dm

@@ -265,9 +265,11 @@
 		"Grey" = 'icons/mob/species/grey/eyes.dmi'
 		)
 
-/obj/item/clothing/glasses/sunglasses/fake
+/obj/item/clothing/glasses/sunglasses_fake
 	desc = "Cheap, plastic sunglasses. They don't even have UV protection."
 	name = "cheap sunglasses"
+	icon_state = "sun"
+	item_state = "sunglasses"
 	see_in_dark = 0
 	flash_protect = 0
 	tint = 0

code/modules/clothing/glasses/hud.dm

@@ -38,12 +38,6 @@
 		"Grey" = 'icons/mob/species/grey/eyes.dmi'
 		)
 
-/obj/item/clothing/glasses/hud/health/health_advanced
-	name = "\improper Advanced Health Scanner HUD"
-	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status.  Includes anti-flash filter."
-	icon_state = "advmedhud"
-	flash_protect = 1
-
 /obj/item/clothing/glasses/hud/health/night
 	name = "\improper Night Vision Health Scanner HUD"
 	desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
@@ -54,6 +48,14 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	prescription_upgradable = 0
 
+/obj/item/clothing/glasses/hud/health/sunglasses
+	name = "medical HUDSunglasses"
+	desc = "Sunglasses with a medical HUD."
+	icon_state = "sunhudmed"
+	see_in_dark = 1
+	flash_protect = 1
+	tint = 1
+
 /obj/item/clothing/glasses/hud/diagnostic
 	name = "Diagnostic HUD"
 	desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits."
@@ -77,6 +79,14 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	prescription_upgradable = 0
 
+/obj/item/clothing/glasses/hud/diagnostic/sunglasses
+	name = "diagnostic sunglasses"
+	desc = "Sunglasses with a diagnostic HUD."
+	icon_state = "sunhuddiag"
+	item_state = "glasses"
+	flash_protect = 1
+	tint = 1
+
 /obj/item/clothing/glasses/hud/security
 	name = "\improper Security HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."

code/modules/clothing/gloves/miscellaneous.dm

@@ -152,10 +152,25 @@
 /obj/item/clothing/gloves/fingerless/rapid
 	name = "Gloves of the North Star"
 	desc = "Just looking at these fills you with an urge to beat the shit out of people."
+	var/accepted_intents = list(INTENT_HARM)
+	var/click_speed_modifier = CLICK_CD_RAPID
 
 /obj/item/clothing/gloves/fingerless/rapid/Touch(mob/living/target, proximity = TRUE)
 	var/mob/living/M = loc
 
-	if(M.a_intent == INTENT_HARM)
-		M.changeNext_move(CLICK_CD_RAPID)
-	.= FALSE
+	if(M.a_intent in accepted_intents)
+		M.changeNext_move(click_speed_modifier)
+	.= FALSE
+
+/obj/item/clothing/gloves/fingerless/rapid/admin
+	name = "Advanced Interactive Gloves"
+	desc = "The gloves are covered in indecipherable buttons and dials, your mind warps by merely looking at them."
+	accepted_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
+	click_speed_modifier = 0
+	siemens_coefficient = 0
+
+/obj/item/clothing/gloves/fingerless/rapid/headpat
+	name = "Gloves of Headpats"
+	desc = "You feel the irresistable urge to give headpats by merely glimpsing these."
+	accepted_intents = list(INTENT_HELP)
+	click_speed_modifier = 0 // That's some serious headpatting

code/modules/clothing/head/beanie.dm

@@ -0,0 +1,96 @@
+
+//BeanieStation13 Redux
+
+//Plus a bobble hat, lets be inclusive!!
+
+/obj/item/clothing/head/beanie //Default is white, this is meant to be seen
+	name = "white beanie"
+	desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads."
+	icon_state = "beanie" //Default white
+	item_color = "beanie"
+
+/obj/item/clothing/head/beanie/black
+	name = "black beanie"
+	icon_state = "beanie"
+	color = "#4A4A4B" //Grey but it looks black
+
+/obj/item/clothing/head/beanie/red
+	name = "red beanie"
+	icon_state = "beanie"
+	color = "#D91414" //Red
+
+/obj/item/clothing/head/beanie/green
+	name = "green beanie"
+	icon_state = "beanie"
+	color = "#5C9E54" //Green
+
+/obj/item/clothing/head/beanie/darkblue
+	name = "dark blue beanie"
+	icon_state = "beanie"
+	color = "#1E85BC" //Blue
+
+/obj/item/clothing/head/beanie/purple
+	name = "purple beanie"
+	icon_state = "beanie"
+	color = "#9557C5" //purple
+
+/obj/item/clothing/head/beanie/yellow
+	name = "yellow beanie"
+	icon_state = "beanie"
+	color = "#E0C14F" //Yellow
+
+/obj/item/clothing/head/beanie/orange
+	name = "orange beanie"
+	icon_state = "beanie"
+	color = "#C67A4B" //orange
+
+/obj/item/clothing/head/beanie/cyan
+	name = "cyan beanie"
+	icon_state = "beanie"
+	color = "#54A3CE" //Cyan (Or close to it)
+
+//Striped Beanies have unique sprites
+
+/obj/item/clothing/head/beanie/christmas
+	name = "christmas beanie"
+	icon_state = "beaniechristmas"
+	item_color = "beaniechristmas"
+
+/obj/item/clothing/head/beanie/striped
+	name = "striped beanie"
+	icon_state = "beaniestriped"
+	item_color = "beaniestriped"
+
+/obj/item/clothing/head/beanie/stripedred
+	name = "red striped beanie"
+	icon_state = "beaniestripedred"
+	item_color = "beaniestripedred"
+
+/obj/item/clothing/head/beanie/stripedblue
+	name = "blue striped beanie"
+	icon_state = "beaniestripedblue"
+	item_color = "beaniestripedblue"
+
+/obj/item/clothing/head/beanie/stripedgreen
+	name = "green striped beanie"
+	icon_state = "beaniestripedgreen"
+	item_color = "beaniestripedgreen"
+
+/obj/item/clothing/head/beanie/durathread
+	name = "durathread beanie"
+	desc = "A beanie made from durathread, its resilient fibres provide some protection to the wearer."
+	icon_state = "beaniedurathread"
+	item_color = null
+	armor = list(melee = 15, bullet = 5, laser = 15, energy = 5, bomb = 10, bio = 0, rad = 0)
+
+/obj/item/clothing/head/beanie/waldo
+	name = "red striped bobble hat"
+	desc = "If you're going on a worldwide hike, you'll need some cold protection."
+	icon_state = "waldo_hat"
+	item_color = "waldo_hat"
+
+/obj/item/clothing/head/beanie/rasta
+	name = "rastacap"
+	desc = "Perfect for tucking in those dreadlocks."
+	icon_state = "beanierasta"
+	item_color = "beanierasta"

code/modules/clothing/head/helmet.dm

@@ -227,6 +227,24 @@ obj/item/clothing/head/blob
 	item_state = "knight_templar"
 	armor = list(melee = 20, bullet = 7, laser = 2, energy = 2, bomb = 2, bio = 2, rad = 0)
 
+/obj/item/clothing/head/helmet/skull
+	name = "skull helmet"
+	desc = "An intimidating tribal helmet, it doesn't look very comfortable."
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+	flags_cover = HEADCOVERSEYES
+	armor = list(melee = 25, bullet = 25, laser = 25, energy = 10, bomb = 10, bio = 5, rad = 20)
+	icon_state = "skull"
+	item_state = "skull"
+	strip_delay = 100
+
+/obj/item/clothing/head/helmet/durathread
+	name = "durathread helmet"
+	desc = "A helmet made from durathread and leather."
+	icon_state = "durathread"
+	item_state = "durathread"
+	armor = list(melee = 25, bullet = 10, laser = 20, energy = 10, bomb = 30, bio = 15, rad = 20)
+	strip_delay = 60
+
 //Commander
 /obj/item/clothing/head/helmet/ert/command
 	name = "emergency response team commander helmet"

code/modules/clothing/head/jobs.dm

@@ -39,7 +39,7 @@
 
 
 //Chaplain
-/obj/item/clothing/head/chaplain_hood
+/obj/item/clothing/head/hooded/chaplain_hood
 	name = "chaplain's hood"
 	desc = "It's hood that covers the head. It keeps you warm during the space winters."
 	icon_state = "chaplain_hood"
@@ -47,7 +47,7 @@
 	flags_cover = HEADCOVERSEYES
 
 //Chaplain
-/obj/item/clothing/head/nun_hood
+/obj/item/clothing/head/hooded/nun_hood
 	name = "nun hood"
 	desc = "Maximum piety in this star system."
 	icon_state = "nun_hood"
@@ -55,7 +55,7 @@
 	flags_cover = HEADCOVERSEYES
 
 //Chaplain
-/obj/item/clothing/head/monk_hood
+/obj/item/clothing/head/hooded/monk_hood
 	name = "monk hood"
 	desc = "Wooden board not included."
 	icon_state = "monk_hood"
@@ -82,6 +82,13 @@
 	desc = "A beret, an artists favorite headwear."
 	icon_state = "beret"
 
+/obj/item/clothing/head/beret/durathread
+	name = "durathread beret"
+	desc =  "A beret made from durathread, its resilient fibres provide some protection to the wearer."
+	icon_state = "beretdurathread"
+	item_color = null
+	armor = list(melee = 15, bullet = 5, laser = 15, energy = 5, bomb = 10, bio = 0, rad = 0)
+
 //Security
 /obj/item/clothing/head/HoS
 	name = "head of security cap"

code/modules/clothing/masks/gasmask.dm

@@ -140,11 +140,7 @@
 	flags_inv = HIDEEARS | HIDEEYES
 	magical = TRUE
 
-/obj/item/clothing/mask/gas/virusclown_hat
-	name = "clown wig and mask"
-	desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
-	icon_state = "clown"
-	item_state = "clown_hat"
+/obj/item/clothing/mask/gas/clown_hat/nodrop
 	flags = NODROP
 
 /obj/item/clothing/mask/gas/mime
@@ -154,6 +150,9 @@
 	item_state = "mime"
 	burn_state = FLAMMABLE
 
+/obj/item/clothing/mask/gas/mime/nodrop
+	flags = NODROP
+
 /obj/item/clothing/mask/gas/monkeymask
 	name = "monkey mask"
 	desc = "A mask used when acting as a monkey."

code/modules/clothing/masks/miscellaneous.dm

@@ -483,6 +483,11 @@
 	item_color = "black"
 	desc = "It's a black bandana."
 
+/obj/item/clothing/mask/bandana/durathread
+	name = "durathread bandana"
+	desc =  "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..."
+	icon_state = "banddurathread"
+
 /obj/item/clothing/mask/cursedclown
 	name = "cursed clown mask"
 	desc = "This is a very, very odd looking mask."

code/modules/clothing/shoes/miscellaneous.dm

@@ -88,6 +88,9 @@
 		to_chat(user, "<span class='notice'>You switch on the waddle dampeners!</span>")
 		enabled_waddle = FALSE
 
+/obj/item/clothing/shoes/clown_shoes/nodrop
+	flags = NODROP
+
 /obj/item/clothing/shoes/clown_shoes/magical
 	name = "magical clown shoes"
 	desc = "Standard-issue shoes of the wizarding class clown. Damn they're huge! And powerful! Somehow."
@@ -243,30 +246,55 @@
 	icon_state = "bsing"
 	put_on_delay = 50
 
-/obj/item/clothing/shoes/cowboyboots
+/obj/item/clothing/shoes/cowboy
 	name = "cowboy boots"
 	desc = "A pair a' brown boots."
-	icon_state = "cowboyboots"
-	item_color = "cowboyboots"
+	icon_state = "cowboy_brown"
+	item_color = "cowboy_brown"
 
-/obj/item/clothing/shoes/cowboyboots/black
+/obj/item/clothing/shoes/cowboy/black
 	name = "black cowboy boots"
 	desc = "A pair a' black rustlers' boots"
-	icon_state = "cowboyboots_black"
-	item_color = "cowboyboots_black"
+	icon_state = "cowboy_black"
+	item_color = "cowboy_black"
 
-/obj/item/clothing/shoes/cowboyboots/white
+/obj/item/clothing/shoes/cowboy/white
 	name = "white cowboy boots"
 	desc = "For the rancher in us all."
-	icon_state = "cowboyboots_white"
-	item_color = "cowboyboots_white"
+	icon_state = "cowboy_white"
+	item_color = "cowboy_white"
 
-/obj/item/clothing/shoes/cowboyboots/pink
+/obj/item/clothing/shoes/cowboy/fancy
+	name = "bilton wrangler boots"
+	desc = "A pair of authentic haute couture boots from Japanifornia. You doubt they have ever been close to cattle."
+	icon_state = "cowboy_fancy"
+	item_color = "cowboy_fancy"
+
+/obj/item/clothing/shoes/cowboy/pink
 	name = "pink cowgirl boots"
 	desc = "For a Rustlin' tustlin' cowgirl."
 	icon_state = "cowboyboots_pink"
 	item_color = "cowboyboots_pink"
 
+/obj/item/clothing/shoes/cowboy/lizard
+	name = "lizard skin boots"
+	desc = "You can hear a faint hissing from inside the boots; you hope it is just a mournful ghost."
+	icon_state = "lizardboots_green"
+
+/obj/item/clothing/shoes/cowboy/lizardmasterwork
+	name = "\improper Hugs-The-Feet lizard skin boots"
+	desc = "A pair of masterfully crafted lizard skin boots. Finally a good application for the station's most bothersome inhabitants."
+	icon_state = "lizardboots_blue"
+
+/obj/effect/spawner/lootdrop/lizardboots
+	name = "random lizard boot quality"
+	desc = "Which ever gets picked, the lizard race loses"
+	icon = 'icons/obj/clothing/shoes.dmi'
+	icon_state = "lizardboots_green"
+	loot = list(
+		/obj/item/clothing/shoes/cowboy/lizard = 7,
+		/obj/item/clothing/shoes/cowboy/lizardmasterwork = 1)
+
 /obj/item/clothing/shoes/footwraps
  	name = "cloth footwraps"
  	desc = "A roll of treated canvas used for wrapping claws or paws."

code/modules/clothing/spacesuits/ert.dm

@@ -190,7 +190,7 @@
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	sprite_sheets = null
 	actions_types = list()
-	has_camera = 0
+	has_camera = FALSE
 
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal
 	name = "paranormal response team suit"
@@ -208,20 +208,26 @@
 	name = "inquisitor's helmet"
 	icon_state = "hardsuit0-inquisitor"
 	item_color = "inquisitor"
+	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
 
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
 	name = "inquisitor's hardsuit"
 	icon_state = "hardsuit-inquisitor"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor
+	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
+	slowdown = 0
 
 /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/berserker
 	name = "champion's helmet"
 	desc = "Peering into the eyes of the helmet is enough to seal damnation."
 	icon_state = "hardsuit0-berserker"
 	item_color = "berserker"
+	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
 
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/berserker
 	name = "champion's hardsuit"
 	desc = "Voices echo from the hardsuit, driving the user insane."
 	icon_state = "hardsuit-berserker"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/berserker
+	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
+	slowdown = 0

code/modules/clothing/spacesuits/hardsuit.dm

@@ -14,7 +14,7 @@
 	actions_types = list(/datum/action/item_action/toggle_helmet_light)
 
 	//Species-specific stuff.
-	species_restricted = list("exclude","Diona","Wryn")
+	species_restricted = list("exclude","Wryn")
 	sprite_sheets = list(
 		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
 		"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
@@ -93,9 +93,10 @@
 	var/obj/item/clothing/head/helmet/space/hardsuit/helmet
 	actions_types = list(/datum/action/item_action/toggle_helmet)
 	var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
+	var/obj/item/tank/jetpack/suit/jetpack = null
 
 	hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
-	species_restricted = list("exclude","Diona","Wryn")
+	species_restricted = list("exclude", "Wryn")
 	sprite_sheets = list(
 		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
 		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
@@ -112,10 +113,59 @@
 		"Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/suits.dmi'
 		)
 
+/obj/item/clothing/suit/space/hardsuit/New()
+	if(jetpack && ispath(jetpack))
+		jetpack = new jetpack(src)
+	..()
+
 /obj/item/clothing/suit/space/hardsuit/attack_self(mob/user)
 	user.changeNext_move(CLICK_CD_MELEE)
 	..()
 
+/obj/item/clothing/suit/space/hardsuit/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/tank/jetpack/suit))
+		if(jetpack)
+			to_chat(user, "<span class='warning'>[src] already has a jetpack installed.</span>")
+			return
+		if(src == user.get_item_by_slot(slot_wear_suit)) //Make sure the player is not wearing the suit before applying the upgrade.
+			to_chat(user, "<span class='warning'>You cannot install the upgrade to [src] while wearing it.</span>")
+			return
+
+		if(user.unEquip(I))
+			I.forceMove(src)
+			jetpack = I
+			to_chat(user, "<span class='notice'>You successfully install the jetpack into [src].</span>")
+			return
+	else if(isscrewdriver(I))
+		if(!jetpack)
+			to_chat(user, "<span class='warning'>[src] has no jetpack installed.</span>")
+			return
+		if(src == user.get_item_by_slot(slot_wear_suit))
+			to_chat(user, "<span class='warning'>You cannot remove the jetpack from [src] while wearing it.</span>")
+			return
+
+		jetpack.turn_off(user)
+		jetpack.forceMove(drop_location())
+		jetpack = null
+		to_chat(user, "<span class='notice'>You successfully remove the jetpack from [src].</span>")
+		return
+	return ..()
+
+/obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot)
+	..()
+	if(jetpack)
+		if(slot == slot_wear_suit)
+			for(var/X in jetpack.actions)
+				var/datum/action/A = X
+				A.Grant(user)
+
+/obj/item/clothing/suit/space/hardsuit/dropped(mob/user)
+	..()
+	if(jetpack)
+		for(var/X in jetpack.actions)
+			var/datum/action/A = X
+			A.Remove(user)
+
 /obj/item/clothing/suit/space/hardsuit/item_action_slot_check(slot)
 	if(slot == slot_wear_suit) //we only give the mob the ability to toggle the helmet if he's wearing the hardsuit.
 		return 1
@@ -178,6 +228,7 @@
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS					//Uncomment to enable firesuit protection
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/elite
+	jetpack = /obj/item/tank/jetpack/suit
 
 //Mining hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/mining
@@ -291,6 +342,7 @@
 	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
 	allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
+	jetpack = /obj/item/tank/jetpack/suit
 
 /obj/item/clothing/suit/space/hardsuit/syndi/update_icon()
 	icon_state = "hardsuit[on]-[item_color]"
@@ -438,6 +490,7 @@
 	icon_state = "hardsuit-hos"
 	armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos
+	jetpack = /obj/item/tank/jetpack/suit
 	sprite_sheets = null
 
 //Singuloth armor
@@ -522,6 +575,7 @@
 	allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank)
 	slowdown = 0
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi
+	jetpack = /obj/item/tank/jetpack/suit
 	sprite_sheets = list(
 		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
 		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -7,7 +7,7 @@
 	flags_inv = HIDEFACE
 	permeability_coefficient = 0.01
 	armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/helmet.dmi',
@@ -31,7 +31,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	allowed = list(/obj/item/tank, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/restraints/handcuffs)
 	armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi'
@@ -72,7 +72,7 @@
 	allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/tank,/obj/item/kitchen/knife/combat)
 	armor = list(melee = 40, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 90, rad = 20)
 	strip_delay = 120
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi'
@@ -159,7 +159,7 @@
 	icon_state = "paramedic-eva-helmet"
 	item_state = "paramedic-eva-helmet"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/helmet.dmi',
@@ -180,7 +180,7 @@
 	item_state = "paramedic-eva"
 	desc = "A brand new paramedic EVA suit. The nitrile seems a bit too thin to be space proof. Used for retrieving bodies in space."
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi',
@@ -200,7 +200,7 @@
 	item_state = "s_suit"
 	desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies."
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")
 
 	sprite_sheets = list(
 		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
@@ -223,7 +223,7 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	flash_protect = 0
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")
 
 	sprite_sheets = list(
 		"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
@@ -244,7 +244,7 @@
 	desc = ". . ."
 	icon_state = "spacemimehelmet"
 	item_state = "spacemimehelmet"
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 	sprite_sheets = null
 	sprite_sheets_obj = null
 
@@ -254,7 +254,7 @@
 	desc = ". . ."
 	icon_state = "spacemime_suit"
 	item_state = "spacemime_items"
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 	sprite_sheets = null
 	sprite_sheets_obj = null
 
@@ -264,7 +264,7 @@
 	desc = "An EVA helmet specifically designed for the clown. SPESSHONK!"
 	icon_state = "clownhelmet"
 	item_state = "clownhelmet"
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 	sprite_sheets = null
 	sprite_sheets_obj = null
 
@@ -274,7 +274,6 @@
 	desc = "An EVA suit specifically designed for the clown. SPESSHONK!"
 	icon_state = "spaceclown_suit"
 	item_state = "spaceclown_items"
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 	sprite_sheets = null
 	sprite_sheets_obj = null
-	

code/modules/clothing/suits/armor.dm

@@ -209,6 +209,15 @@
 	allowed = list(/obj/item/nullrod/claymore)
 	armor = list(melee = 25, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 0, rad = 0)
 
+/obj/item/clothing/suit/armor/vest/durathread
+	name = "durathread vest"
+	desc = "A vest made of durathread with strips of leather acting as trauma plates."
+	icon_state = "durathread"
+	item_state = "durathread"
+	strip_delay = 60
+	burn_state = FLAMMABLE
+	armor = list(melee = 20, bullet = 10, laser = 30, energy = 5, bomb = 15, bio = 0, rad = 0)
+
 /obj/item/clothing/suit/armor/bulletproof
 	name = "Bulletproof Vest"
 	desc = "A bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
@@ -528,14 +537,4 @@
 	item_state = "bonearmor"
 	blood_overlay_type = "armor"
 	armor = list(melee = 35, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
-
-/obj/item/clothing/head/helmet/skull
-	name = "skull helmet"
-	desc = "An intimidating tribal helmet, it doesn't look very comfortable."
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
-	flags_cover = HEADCOVERSEYES
-	armor = list(melee = 25, bullet = 25, laser = 25, energy = 10, bomb = 10, bio = 5, rad = 20)
-	icon_state = "skull"
-	item_state = "skull"
-	strip_delay = 100
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS

code/modules/clothing/suits/hood.dm

@@ -2,44 +2,21 @@
 
 /obj/item/clothing/suit/hooded
 	actions_types = list(/datum/action/item_action/toggle)
-	var/obj/item/clothing/head/hood
-	var/hoodtype = /obj/item/clothing/head/winterhood //so the chaplain hoodie or other hoodies can override this
+	var/obj/item/clothing/head/hooded/hood
+	var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this
 
-/obj/item/clothing/head/chaplain_hood
-	flags = NODROP
-
-/obj/item/clothing/head/nun_hood
-	flags = NODROP
-
-/obj/item/clothing/head/monk_hood
-	flags = NODROP
-
-/obj/item/clothing/head/culthood
-	flags = NODROP
-
-/obj/item/clothing/head/culthood/alt
-	flags = NODROP
-
-/obj/item/clothing/head/berserkerhood
-	flags = NODROP
-
-/obj/item/clothing/head/hooded/drake
-	flags = NODROP
-
-/obj/item/clothing/head/hooded/goliath
-	flags = NODROP
-
-/obj/item/clothing/suit/hooded/New()
+/obj/item/clothing/suit/hooded/Initialize(mapload)
+	. = ..()
 	MakeHood()
-	..()
 
 /obj/item/clothing/suit/hooded/Destroy()
 	QDEL_NULL(hood)
-	return ..()
+	. = ..()
 
 /obj/item/clothing/suit/hooded/proc/MakeHood()
 	if(!hood)
-		var/obj/item/clothing/head/W = new hoodtype(src)
+		var/obj/item/clothing/head/hooded/W = new hoodtype(src)
+		W.suit = src
 		hood = W
 
 /obj/item/clothing/suit/hooded/ui_action_click()
@@ -63,7 +40,7 @@
 		var/mob/living/carbon/H = hood.loc
 		H.unEquip(hood, 1)
 		H.update_inv_wear_suit()
-	hood.loc = src
+	hood.forceMove(src)
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.UpdateButtonIcon()
@@ -82,7 +59,7 @@
 			if(H.head)
 				to_chat(H,"<span class='warning'>You're already wearing something on your head!</span>")
 				return
-			else if(H.equip_to_slot_if_possible(hood,slot_head,0,0,1))
+			else if(H.equip_to_slot_if_possible(hood, slot_head, 0, 0, 1))
 				suit_adjusted = 1
 				icon_state = "[initial(icon_state)]_hood"
 				H.update_inv_wear_suit()
@@ -91,3 +68,23 @@
 					A.UpdateButtonIcon()
 	else
 		RemoveHood()
+
+/obj/item/clothing/head/hooded
+	var/obj/item/clothing/suit/hooded/suit
+
+/obj/item/clothing/head/hooded/Destroy()
+	suit = null
+	return ..()
+
+/obj/item/clothing/head/hooded/dropped()
+	..()
+	if(suit)
+		suit.RemoveHood()
+
+/obj/item/clothing/head/hooded/equipped(mob/user, slot)
+	..()
+	if(slot != slot_head)
+		if(suit)
+			suit.RemoveHood()
+		else
+			qdel(src)

code/modules/clothing/suits/jobs.dm

@@ -30,7 +30,7 @@
 		"Vox" = 'icons/mob/species/vox/suit.dmi'
 		)
 
-//Botonist
+//Botanist
 /obj/item/clothing/suit/apron
 	name = "apron"
 	desc = "A basic blue apron."
@@ -85,7 +85,7 @@
 	icon_state = "chaplain_hoodie"
 	item_state = "chaplain_hoodie"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
-	hoodtype = /obj/item/clothing/head/chaplain_hood
+	hoodtype = /obj/item/clothing/head/hooded/chaplain_hood
 	allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen)
 
 	sprite_sheets = list(
@@ -100,7 +100,7 @@
 	item_state = "nun"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
 	flags_inv = HIDESHOES|HIDEJUMPSUIT
-	hoodtype = /obj/item/clothing/head/nun_hood
+	hoodtype = /obj/item/clothing/head/hooded/nun_hood
 	allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen)
 
 	sprite_sheets = list(
@@ -115,7 +115,7 @@
 	item_state = "monkrobe"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
 	flags_inv = HIDESHOES|HIDEJUMPSUIT
-	hoodtype = /obj/item/clothing/head/monk_hood
+	hoodtype = /obj/item/clothing/head/hooded/monk_hood
 	allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen)
 
 /obj/item/clothing/suit/witchhunter
@@ -364,6 +364,9 @@
 		"Vox" = 'icons/mob/species/vox/suit.dmi'
 		)
 
+/obj/item/clothing/suit/suspenders/nodrop
+	flags = NODROP
+
 // Surgeon
 /obj/item/clothing/suit/apron/surgical
 	name = "surgical apron"
@@ -371,7 +374,7 @@
 	icon_state = "surgical"
 	item_state = "surgical"
 	allowed = list(/obj/item/scalpel, /obj/item/surgical_drapes, /obj/item/cautery, /obj/item/hemostat, /obj/item/retractor)
-	
+
 //Research Director
 /obj/item/clothing/suit/mantle/labcoat
 	name = "research director's mantle"

code/modules/clothing/suits/toggles.dm

@@ -6,7 +6,8 @@
 /obj/item/clothing/suit/space/hardsuit/Destroy()
 	if(helmet)
 		helmet.suit = null
-		qdel(helmet)
+		QDEL_NULL(helmet)
+	QDEL_NULL(jetpack)
 	return ..()
 
 /obj/item/clothing/head/helmet/space/hardsuit/Destroy()

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

@@ -88,6 +88,9 @@
 	item_state = "sexyclown"
 	item_color = "sexyclown"
 
+/obj/item/clothing/under/rank/clown/nodrop
+	flags = NODROP
+
 /obj/item/clothing/under/rank/head_of_personnel
 	desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
 	name = "head of personnel's jumpsuit"
@@ -208,6 +211,8 @@
 	item_color = "mime"
 	flags_size = ONESIZEFITSALL
 
+/obj/item/clothing/under/mime/nodrop
+	flags = NODROP
 
 /obj/item/clothing/under/rank/miner
 	desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."

code/modules/clothing/under/miscellaneous.dm

@@ -890,3 +890,10 @@
 	item_color = "hawaiianblue"
 	flags_size = ONESIZEFITSALL
 
+/obj/item/clothing/under/misc/durathread
+	name = "durathread jumpsuit"
+	desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer."
+	icon_state = "durathread"
+	item_state = "durathread"
+	item_color = "durathread"
+	armor = list(melee = 10, bullet = 0, laser = 10, energy = 0, bomb = 5, bio = 0, rad = 0)

code/modules/crafting/craft.dm

@@ -1,7 +1,26 @@
 /datum/personal_crafting
 	var/busy
 	var/viewing_category = 1 //typical powergamer starting on the Weapons tab
-	var/list/categories = list(CAT_WEAPON,CAT_AMMO,CAT_ROBOT,CAT_FOOD,CAT_MISC,CAT_PRIMAL)
+	var/viewing_subcategory = 1
+	var/list/categories = list(
+				CAT_WEAPONRY,
+				CAT_ROBOT,
+				CAT_MISC,
+				CAT_PRIMAL,
+				CAT_FOOD,
+				CAT_CLOTHING)
+	var/list/subcategories = list(
+						list(	//Weapon subcategories
+							CAT_WEAPON,
+							CAT_AMMO),
+						CAT_NONE, //Robot subcategories
+						CAT_NONE, //Misc subcategories
+						CAT_NONE, //Tribal subcategories
+						list(	//Food subcategories
+							CAT_CAKE,
+							CAT_SUSHI,
+							CAT_SANDWICH),
+                        CAT_CLOTHING) //Clothing subcategories
 	var/display_craftable_only = FALSE
 	var/display_compact = TRUE
 
@@ -22,11 +41,14 @@
 
 
 /datum/personal_crafting/proc/check_contents(datum/crafting_recipe/R, list/contents)
+	contents = contents["other"]
 	main_loop:
 		for(var/A in R.reqs)
 			var/needed_amount = R.reqs[A]
 			for(var/B in contents)
 				if(ispath(B, A))
+					if (R.blacklist.Find(B))
+						continue
 					if(contents[B] >= R.reqs[A])
 						continue main_loop
 					else
@@ -56,45 +78,47 @@
 				if(AM.flags_2 & HOLOGRAM_2)
 					continue
 				. += AM
+	for(var/slot in list(slot_r_store, slot_l_store))
+		. += user.get_item_by_slot(slot)
 
 
 /datum/personal_crafting/proc/get_surroundings(mob/user)
 	. = list()
+	.["other"] = list()
 	for(var/obj/item/I in get_environment(user))
 		if(I.flags_2 & HOLOGRAM_2)
 			continue
 		if(istype(I, /obj/item/stack))
 			var/obj/item/stack/S = I
-			.[I.type] += S.amount
+			.["other"][I.type] += S.amount
 		else
 			if(istype(I, /obj/item/reagent_containers))
 				var/obj/item/reagent_containers/RC = I
-				if(RC.container_type & OPENCONTAINER)
+				if(RC.is_drainable())
 					for(var/datum/reagent/A in RC.reagents.reagent_list)
-						.[A.type] += A.volume
-			.[I.type] += 1
+						.["other"][A.type] += A.volume
+			.["other"][I.type] += 1
 
 /datum/personal_crafting/proc/check_tools(mob/user, datum/crafting_recipe/R, list/contents)
 	if(!R.tools.len)
-		return 1
+		return TRUE
 	var/list/possible_tools = list()
 	for(var/obj/item/I in user.contents)
 		if(istype(I, /obj/item/storage))
 			for(var/obj/item/SI in I.contents)
 				possible_tools += SI.type
 		possible_tools += I.type
-	possible_tools += contents
+	possible_tools |= contents["other"]
 
 	main_loop:
 		for(var/A in R.tools)
 			for(var/I in possible_tools)
 				if(ispath(I,A))
 					continue main_loop
-			return 0
-	return 1
+			return FALSE
+	return TRUE
 
 /datum/personal_crafting/proc/construct_item(mob/user, datum/crafting_recipe/R)
-	for(var/A in R.parts)
 	var/list/contents = get_surroundings(user)
 	var/send_feedback = 1
 	if(check_contents(R, contents))
@@ -108,6 +132,8 @@
 				var/list/parts = del_reqs(R, user)
 				var/atom/movable/I = new R.result (get_turf(user.loc))
 				I.CheckParts(parts, R)
+				if(isitem(I))
+					user.put_in_hands(I)
 				if(send_feedback)
 					feedback_add_details("object_crafted","[I.type]")
 				return 0
@@ -173,6 +199,7 @@
 							RGNT.volume += RG.volume
 							RGNT.data += RG.data
 							qdel(RG)
+						RC.on_reagent_change()
 					else
 						surroundings -= RC
 			else if(ispath(A, /obj/item/stack))
@@ -195,7 +222,7 @@
 						else
 							data = S.amount
 							S = locate(S.type) in Deletion
-							S.amount += data
+							S.add(data)
 						surroundings -= S
 			else
 				var/atom/movable/I
@@ -241,11 +268,19 @@
 
 /datum/personal_crafting/ui_data(mob/user)
 	var/list/data = list()
+	var/list/subs = list()
+	var/cur_subcategory = CAT_NONE
 	var/cur_category = categories[viewing_category]
+	if(islist(subcategories[viewing_category]))
+		subs = subcategories[viewing_category]
+		cur_subcategory = subs[viewing_subcategory]
 	data["busy"] = busy
 	data["prev_cat"] = categories[prev_cat()]
+	data["prev_subcat"] = subs[prev_subcat()]
 	data["category"] = cur_category
+	data["subcategory"] = cur_subcategory
 	data["next_cat"] = categories[next_cat()]
+	data["next_subcat"] = subs[next_subcat()]
 	data["display_craftable_only"] = display_craftable_only
 	data["display_compact"] = display_compact
 
@@ -254,7 +289,11 @@
 	var/list/cant_craft = list()
 	for(var/rec in GLOB.crafting_recipes)
 		var/datum/crafting_recipe/R = rec
-		if(R.category != cur_category)
+
+		if(!R.always_availible && !(R.type in user?.mind?.learned_recipes)) //User doesn't actually know how to make this.
+			continue
+
+		if((R.category != cur_category) || (R.subcategory != cur_subcategory))
 			continue
 		if(check_contents(R, surroundings))
 			can_craft += list(build_recipe_data(R))
@@ -269,41 +308,54 @@
 		return
 
 	if(href_list["make"])
-		var/datum/crafting_recipe/TR = locate(href_list["make"])
-		busy = 1
+		var/datum/crafting_recipe/TR = locate(href_list["make"]) in GLOB.crafting_recipes
+		busy = TRUE
 		SSnanoui.update_uis(src)
 		var/fail_msg = construct_item(usr, TR)
 		if(!fail_msg)
 			to_chat(usr, "<span class='notice'>[TR.name] constructed.</span>")
 		else
 			to_chat(usr, "<span class ='warning'>Construction failed[fail_msg]</span>")
-		busy = 0
+		busy = FALSE
 		SSnanoui.update_uis(src)
 	if(href_list["forwardCat"])
-		viewing_category = next_cat()
-		to_chat(usr, "<span class='notice'>Category is now [categories[viewing_category]].</span>")
+		viewing_category = next_cat(FALSE)
 		. = TRUE
 	if(href_list["backwardCat"])
-		viewing_category = prev_cat()
-		to_chat(usr, "<span class='notice'>Category is now [categories[viewing_category]].</span>")
+		viewing_category = prev_cat(FALSE)
+		. = TRUE
+	if(href_list["forwardSubCat"])
+		viewing_subcategory = next_subcat()
+		. = TRUE
+	if(href_list["backwardSubCat"])
+		viewing_subcategory = prev_subcat()
 		. = TRUE
 	if(href_list["toggle_recipes"])
 		display_craftable_only = !display_craftable_only
-		to_chat(usr, "<span class='notice'>You will now [display_craftable_only ? "only see recipes you can craft":"see all recipes"].</span>")
 		. = TRUE
 	if(href_list["toggle_compact"])
 		display_compact = !display_compact
-		to_chat(usr, "<span class='notice'>Crafting menu is now [display_compact? "compact" : "full size"].</span>")
 		. = TRUE
 
 	SSnanoui.update_uis(src)
 
 //Next works nicely with modular arithmetic
-/datum/personal_crafting/proc/next_cat()
+//Next works nicely with modular arithmetic
+/datum/personal_crafting/proc/next_cat(readonly = TRUE)
+	if (!readonly)
+		viewing_subcategory = 1
 	. = viewing_category % categories.len + 1
 
+/datum/personal_crafting/proc/next_subcat()
+	if(islist(subcategories[viewing_category]))
+		var/list/subs = subcategories[viewing_category]
+		. = viewing_subcategory % subs.len + 1
+
+
 //Previous can go fuck itself
-/datum/personal_crafting/proc/prev_cat()
+/datum/personal_crafting/proc/prev_cat(readonly = TRUE)
+	if (!readonly)
+		viewing_subcategory = 1
 	if(viewing_category == categories.len)
 		. = viewing_category-1
 	else
@@ -311,6 +363,18 @@
 	if(. <= 0)
 		. = categories.len
 
+/datum/personal_crafting/proc/prev_subcat()
+	if(islist(subcategories[viewing_category]))
+		var/list/subs = subcategories[viewing_category]
+		if(viewing_subcategory == subs.len)
+			. = viewing_subcategory-1
+		else
+			. = viewing_subcategory % subs.len - 1
+		if(. <= 0)
+			. = subs.len
+	else
+		. = null
+
 /datum/personal_crafting/proc/build_recipe_data(datum/crafting_recipe/R)
 	var/list/data = list()
 	data["name"] = R.name
@@ -334,9 +398,19 @@
 	data["catalyst_text"] = catalyst_text
 
 	for(var/a in R.tools)
-		var/atom/A = a //cheat-typecast
-		tool_text += " [R.tools[A]] [initial(A.name)],"
+		if(ispath(a, /obj/item))
+			var/obj/item/b = a
+			tool_text += " [initial(b.name)],"
+		else
+			tool_text += " [a],"
 	tool_text = replacetext(tool_text, ",", "", -1)
 	data["tool_text"] = tool_text
 
-	return data
+	return data
+
+//Mind helpers
+
+/datum/mind/proc/teach_crafting_recipe(R)
+	if(!learned_recipes)
+		learned_recipes = list()
+	learned_recipes |= R

code/modules/crafting/recipes.dm

@@ -1,19 +1,15 @@
 /datum/crafting_recipe
 	var/name = "" //in-game display name
 	var/reqs[] = list() //type paths of items consumed associated with how many are needed
+	var/blacklist[] = list() //type paths of items explicitly not allowed as an ingredient
 	var/result //type path of item resulting from this craft
 	var/tools[] = list() //type paths of items needed but not consumed
 	var/time = 30 //time in deciseconds
 	var/parts[] = list() //type paths of items that will be placed in the result
 	var/chem_catalysts[] = list() //like tools but for reagents
-	var/category = CAT_NONE // Recipe category
-	var/roundstart_enabled = TRUE //Set to FALSE if you don't want a particular crafting recipe to be available all the time
-
-/datum/crafting_recipe/proc/AdjustChems(var/obj/resultobj as obj)
-	//This proc is to replace the make_food proc of recipes from microwaves and such that are being converted to table crafting recipes.
-	//Use it to handle the removal of reagents after the food has been created (like removing toxins from a salad made with ambrosia)
-	//If a recipe does not require it's chems adjusted, don't bother declaring this for the recipe, as it will call this placeholder
-	return
+	var/category = CAT_NONE //where it shows up in the crafting UI
+	var/subcategory = CAT_NONE
+	var/always_availible = TRUE //Set to FALSE if it needs to be learned first.
 
 /datum/crafting_recipe/IED
 	name = "IED"
@@ -24,7 +20,8 @@
 				/obj/item/reagent_containers/food/drinks/cans = 1)
 	parts = list(/obj/item/reagent_containers/food/drinks/cans = 1)
 	time = 15
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/molotov
 	name = "Molotov"
@@ -33,7 +30,8 @@
 				/obj/item/reagent_containers/food/drinks/bottle = 1)
 	parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)
 	time = 40
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/stunprod
 	name = "Stunprod"
@@ -42,7 +40,8 @@
 				/obj/item/stack/rods = 1,
 				/obj/item/assembly/igniter = 1)
 	time = 40
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/bola
 	name = "Bola"
@@ -50,7 +49,8 @@
 	reqs = list(/obj/item/restraints/handcuffs/cable = 1,
 				/obj/item/stack/sheet/metal = 6)
 	time = 20//15 faster than crafting them by hand!
-	category= CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/ed209
 	name = "ED209"
@@ -144,7 +144,8 @@
 				/obj/item/weldingtool = 1)
 	tools = list(/obj/item/screwdriver)
 	time = 10
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/meteorshot
 	name = "Meteorshot Shell"
@@ -154,7 +155,8 @@
 				/obj/item/stock_parts/manipulator = 2)
 	tools = list(/obj/item/screwdriver)
 	time = 5
-	category = CAT_AMMO
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/pulseslug
 	name = "Pulse Slug Shell"
@@ -164,7 +166,8 @@
 				/obj/item/stock_parts/micro_laser/ultra = 1)
 	tools = list(/obj/item/screwdriver)
 	time = 5
-	category = CAT_AMMO
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/dragonsbreath
 	name = "Dragonsbreath Shell"
@@ -173,7 +176,8 @@
 				/datum/reagent/phosphorus = 5,)
 	tools = list(/obj/item/screwdriver)
 	time = 5
-	category = CAT_AMMO
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/frag12
 	name = "FRAG-12 Shell"
@@ -184,7 +188,8 @@
 				/datum/reagent/facid = 5,)
 	tools = list(/obj/item/screwdriver)
 	time = 5
-	category = CAT_AMMO
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/ionslug
 	name = "Ion Scatter Shell"
@@ -194,7 +199,8 @@
 				/obj/item/stock_parts/subspace/crystal = 1)
 	tools = list(/obj/item/screwdriver)
 	time = 5
-	category = CAT_AMMO
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/improvisedslug
 	name = "Improvised Shotgun Shell"
@@ -205,7 +211,8 @@
 				/datum/reagent/fuel = 10)
 	tools = list(/obj/item/screwdriver)
 	time = 5
-	category = CAT_AMMO
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/improvisedslugoverload
 	name = "Overload Improvised Shell"
@@ -215,7 +222,8 @@
 				/datum/reagent/plasma_dust = 20)
 	tools = list(/obj/item/screwdriver)
 	time = 5
-	category = CAT_AMMO
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/laserslug
 	name = "Laser Slug Shell"
@@ -225,7 +233,8 @@
 				/obj/item/stock_parts/micro_laser/high = 1)
 	tools = list(/obj/item/screwdriver)
 	time = 5
-	category = CAT_AMMO
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/ishotgun
 	name = "Improvised Shotgun"
@@ -236,7 +245,8 @@
 				/obj/item/stack/packageWrap = 5,)
 	tools = list(/obj/item/screwdriver)
 	time = 100
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/chainsaw
 	name = "Chainsaw"
@@ -246,7 +256,8 @@
 				/obj/item/stack/sheet/plasteel = 1)
 	tools = list(/obj/item/weldingtool)
 	time = 50
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/spear
 	name = "Spear"
@@ -255,7 +266,8 @@
 				/obj/item/shard = 1,
 				/obj/item/stack/rods = 1)
 	time = 40
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/spooky_camera
 	name = "Camera Obscura"
@@ -296,7 +308,8 @@
 	reqs = list(/obj/item/stack/sheet/wood = 1,
 				/obj/item/stack/cable_coil = 5)
 	tools = list(/obj/item/kitchen/knife) // Gotta carve the wood into handles
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/makeshift_bolt
 	name = "Makeshift Bolt"
@@ -304,7 +317,8 @@
 	time = 5
 	reqs = list(/obj/item/stack/rods = 1)
 	tools = list(/obj/item/weldingtool)
-	category = CAT_AMMO
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
 
 /datum/crafting_recipe/crossbow
 	name = "Powered Crossbow"
@@ -316,7 +330,8 @@
 				/obj/item/stack/sheet/wood = 5)
 	tools = list(/obj/item/weldingtool,
 				/obj/item/screwdriver)
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/glove_balloon
 	name = "Latex Glove Balloon"
@@ -361,7 +376,8 @@
 	)
 	parts = list(/obj/item/stock_parts/matter_bin = 1, /obj/item/grenade/chem_grenade = 2)
 	time = 30
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/chemical_payload2
 	name = "Chemical Payload (gibtonite)"
@@ -373,7 +389,8 @@
 	)
 	parts = list(/obj/item/stock_parts/matter_bin = 1, /obj/item/grenade/chem_grenade = 2)
 	time = 50
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/toxins_payload
 	name = "Toxins Payload Casing"
@@ -383,7 +400,8 @@
 		/obj/item/assembly/signaler = 1,
 		/obj/item/stack/sheet/metal = 2
 	)
-	category = CAT_WEAPON
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
 
 /datum/crafting_recipe/bonearmor
 	name = "Bone Armor"
@@ -552,4 +570,4 @@
 				/obj/item/grown/log = 2)
 	time = 50
 	category = CAT_MISC
-	roundstart_enabled = FALSE
+	always_availible = FALSE

code/modules/crafting/tailoring.dm

@@ -0,0 +1,145 @@
+/datum/crafting_recipe/durathread_vest
+	name = "Durathread Vest"
+	result = /obj/item/clothing/suit/armor/vest/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 5,
+				/obj/item/stack/sheet/leather = 4)
+	time = 50
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_helmet
+	name = "Durathread Helmet"
+	result = /obj/item/clothing/head/helmet/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 4,
+				/obj/item/stack/sheet/leather = 5)
+	time = 40
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_jumpsuit
+	name = "Durathread Jumpsuit"
+	result = /obj/item/clothing/under/misc/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 4)
+	time = 40
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_beret
+	name = "Durathread Beret"
+	result = /obj/item/clothing/head/beret/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 2)
+	time = 40
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_beanie
+	name = "Durathread Beanie"
+	result = /obj/item/clothing/head/beanie/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 2)
+	time = 40
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_bandana
+	name = "Durathread Bandana"
+	result = /obj/item/clothing/mask/bandana/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 1)
+	time = 25
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/fannypack
+	name = "Fannypack"
+	result = /obj/item/storage/belt/fannypack
+	reqs = list(/obj/item/stack/sheet/cloth = 2,
+				/obj/item/stack/sheet/leather = 1)
+	time = 20
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsunsec
+	name = "Security HUDsunglasses"
+	result = /obj/item/clothing/glasses/hud/security/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/security = 1,
+				  /obj/item/clothing/glasses/sunglasses = 1,
+				  /obj/item/stack/cable_coil = 5)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsunsecremoval
+	name = "Security HUD removal"
+	result = /obj/item/clothing/glasses/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/security/sunglasses = 1)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsunmed
+	name = "Medical HUDsunglasses"
+	result = /obj/item/clothing/glasses/hud/health/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/health = 1,
+				  /obj/item/clothing/glasses/sunglasses = 1,
+				  /obj/item/stack/cable_coil = 5)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsunmedremoval
+	name = "Medical HUD removal"
+	result = /obj/item/clothing/glasses/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/health/sunglasses = 1)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsundiag
+	name = "Diagnostic HUDsunglasses"
+	result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1,
+				  /obj/item/clothing/glasses/sunglasses = 1,
+				  /obj/item/stack/cable_coil = 5)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsundiagremoval
+	name = "Diagnostic HUD removal"
+	result = /obj/item/clothing/glasses/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/beergoggles
+	name = "Beer Goggles"
+	result = /obj/item/clothing/glasses/sunglasses/reagent
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/science = 1,
+				  /obj/item/clothing/glasses/sunglasses = 1,
+				  /obj/item/stack/cable_coil = 5)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/beergogglesremoval
+	name = "Beer Goggles removal"
+	result = /obj/item/clothing/glasses/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/sunglasses/reagent = 1)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/ghostsheet
+	name = "Ghost Sheet"
+	result = /obj/item/clothing/suit/ghost_sheet
+	time = 5
+	tools = list(/obj/item/wirecutters)
+	reqs = list(/obj/item/bedsheet = 1)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/cowboyboots
+	name = "Cowboy Boots"
+	result = /obj/item/clothing/shoes/cowboy
+	reqs = list(/obj/item/stack/sheet/leather = 2)
+	time = 45
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/lizardboots
+	name = "Lizard Skin Boots"
+	result = /obj/effect/spawner/lootdrop/lizardboots
+	reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1, /obj/item/stack/sheet/leather = 1)
+	time = 60
+	category = CAT_CLOTHING

code/modules/customitems/item_defines.dm

@@ -178,7 +178,7 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "book_berner_1"
 
-/obj/item/clothing/glasses/sunglasses/fake/fluff/kaki //Rapidvalj: Kakicharakiti
+/obj/item/clothing/glasses/sunglasses_fake/fluff/kaki //Rapidvalj: Kakicharakiti
 	name = "broken thermonocle"
 	desc = "A weathered Vox thermonocle, doesn't seem to work anymore."
 	icon_state = "thermoncle"
@@ -903,9 +903,9 @@
 	desc = "A green hoodie with the Nanotrasen logo on the back. It looks weathered."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "linda_hoodie"
-	hoodtype = /obj/item/clothing/head/hood/fluff/linda
+	hoodtype = /obj/item/clothing/head/hooded/hood/fluff/linda
 
-/obj/item/clothing/head/hood/fluff/linda //Epic_Charger: Linda Clark
+/obj/item/clothing/head/hooded/hood/fluff/linda //Epic_Charger: Linda Clark
 	icon_state = "greenhood"
 
 /obj/item/clothing/suit/hooded/hoodie/hylo //Hylocereus: Sam Aria
@@ -913,9 +913,9 @@
 	desc = "A soft, cozy longline hoodie. It looks old and worn, but well cared for. There's no label, but a series of dates and names is penned on a scrap of fabric sewn on the inside of the left side of the chest - 'Sam Aria' is scrawled atop them all, next to the words 'Please Remember'."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "sam_hoodie"
-	hoodtype = /obj/item/clothing/head/hood/hylo
+	hoodtype = /obj/item/clothing/head/hooded/hood/hylo
 
-/obj/item/clothing/head/hood/hylo
+/obj/item/clothing/head/hooded/hood/hylo
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "sam_hood"
 
@@ -925,9 +925,9 @@
 	body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "skeleton_suit"
-	hoodtype = /obj/item/clothing/head/hood/fluff/skeleton
+	hoodtype = /obj/item/clothing/head/hooded/hood/fluff/skeleton
 
-/obj/item/clothing/head/hood/fluff/skeleton
+/obj/item/clothing/head/hooded/hood/fluff/skeleton
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "skeleton_hood"
 
@@ -973,18 +973,18 @@
 	desc = "A velvety smooth black winter coat with white and red stripes on the side."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "xantholne_wintercoat"
-	hoodtype = /obj/item/clothing/head/hood/fluff/xantholne
+	hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xantholne
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
 
 
-/obj/item/clothing/head/hood/fluff/xantholne // Xantholne: Meex Zwichsnicrur
+/obj/item/clothing/head/hooded/hood/fluff/xantholne // Xantholne: Meex Zwichsnicrur
 	name = "black winter hood"
 	desc = "A black hood attached to a stripped winter coat."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "xantholne_winterhood"
 	body_parts_covered = HEAD
-	flags = NODROP|BLOCKHAIR
+	flags = BLOCKHAIR
 	flags_inv = HIDEEARS
 
 /obj/item/clothing/suit/hooded/hoodie/fluff/xydonus //Xydonus: Rsik Ugsharki Atan | Based off of the bomber jacket, but with a hood slapped on (for allowed suit storage)
@@ -993,18 +993,18 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "xydonus_jacket"
 	ignore_suitadjust = 0
-	hoodtype = /obj/item/clothing/head/hood/fluff/xydonus
+	hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xydonus
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
 	allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
 
-/obj/item/clothing/head/hood/fluff/xydonus
+/obj/item/clothing/head/hooded/hood/fluff/xydonus
 	name = "custom fit hood"
 	desc = "A hood with some horns <i>glued</i> to them, or something like that. Custom fit for a Unathi's head shape."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "xydonus_bomberhood"
 	body_parts_covered = HEAD
-	flags = NODROP|BLOCKHAIR
+	flags = BLOCKHAIR
 	flags_inv = HIDEEARS
 
 /obj/item/clothing/suit/fluff/pineapple //Pineapple Salad: Dan Jello
@@ -1039,17 +1039,17 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "shesicoat"
 	item_state = "shesicoat"
-	hoodtype = /obj/item/clothing/head/hood/fluff/shesi
+	hoodtype = /obj/item/clothing/head/hooded/hood/fluff/shesi
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	cold_protection = UPPER_TORSO|LOWER_TORSO
 
-/obj/item/clothing/head/hood/fluff/shesi //MrSynnester : Shesi Skaklas
+/obj/item/clothing/head/hooded/hood/fluff/shesi //MrSynnester : Shesi Skaklas
 	name = "custom made winter hood"
 	desc = "A custom made winter coat hood. Looks comfy."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "shesicoat_hood2"
 	body_parts_covered = HEAD
-	flags = NODROP|BLOCKHAIR
+	flags = BLOCKHAIR
 	flags_inv = HIDEEARS
 
 /obj/item/clothing/suit/jacket/dtx //AffectedArc07: DTX
@@ -1212,16 +1212,16 @@
 
 //////////// Sets ////////////
 // Fox P McCloud: Fox McCloud
-/obj/item/clothing/suit/jacket/fluff/fox
+/obj/item/clothing/suit/storage/fox
 	name = "Aeronautics Jacket"
 	desc = "An aviator styled jacket made from a peculiar material; this one seems very old."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "fox_jacket"
 	item_state = "fox_jacket"
-	ignore_suitadjust = TRUE
-	actions_types = list()
-	adjust_flavour = null
-	sprite_sheets = null
+	allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/projectile/automatic/pistol, /obj/item/gun/projectile/revolver, /obj/item/gun/projectile/revolver/detective)
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 
 /obj/item/clothing/under/fluff/fox
 	name = "Aeronautics Jumpsuit"
@@ -1232,6 +1232,12 @@
 	item_color = "fox_suit"
 	displays_id = FALSE //still appears on examine; this is pure fluff.
 
+/obj/item/clothing/suit/storage/fox/miljacket_desert
+	name = "rugged military jacket"
+	desc = "A rugged brown military jacket with a stylized 'A' embroidered on the back. It seems very old, yet is in near mint condition. Has a tag on the inside collar signed 'Fox McCloud'."
+	icon_state = "fox_coat"
+	item_color = "fox_coat"
+
 /obj/item/toy/plushie/fluff/fox
 	name = "orange fox plushie"
 	desc = "A cute, soft, fuzzy, fluffy, and cuddly plushie. This has a small tag on it that is signed 'Fox McCloud'."
@@ -1262,12 +1268,6 @@
 /obj/item/toy/plushie/fluff/fox/ui_action_click()
 	change_color()
 
-/obj/item/clothing/suit/jacket/miljacket/desert/fox
-	name = "rugged military jacket"
-	desc = "A rugged brown military jacket with a stylized 'A' embroidered on the back. It seems very old, yet is in near mint condition. Has a tag on the inside collar signed 'Fox McCloud'."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "fox_coat"
-	item_color = "fox_coat"
 
 // TheFlagbearer: Willow Walker
 /obj/item/clothing/under/fluff/arachno_suit

code/modules/economy/ATM.dm

@@ -240,9 +240,7 @@ log transactions
 						if(amount > 10000) // prevent crashes
 							to_chat(usr, "<span class='notice'>The ATM's screen flashes, 'Maximum single withdrawl limit reached, defaulting to 10,000.'</span>")
 							amount = 10000
-						authenticated_account.money -= amount
 						withdraw_arbitrary_sum(amount)
-
 						authenticated_account.charge(amount, null, "Credit withdrawal", machine_id, authenticated_account.owner_name)
 					else
 						to_chat(usr, "[bicon(src)]<span class='warning'>You don't have enough funds to do that!</span>")

code/modules/events/grid_check.dm

@@ -1,6 +1,6 @@
 /datum/event/grid_check	//NOTE: Times are measured in master controller ticks!
 	announceWhen		= 5
-	
+
 /datum/event/grid_check/setup()
 	endWhen = rand(30,120)
 
@@ -12,7 +12,7 @@
 		if(!M.client || !is_station_level(T.z))
 			continue
 		SEND_SOUND(M, S)
-		
+
 /datum/event/grid_check/announce()
 	event_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Automated Grid Check", new_sound = 'sound/AI/poweroff.ogg')
 
@@ -45,11 +45,6 @@
 			continue
 		if(C.cell)
 			C.cell.charge = 0
-	for(var/obj/machinery/power/P in GLOB.machines)
-		var/area/current_area = get_area(P)
-		if((current_area.type in skipped_areas_apc) || (current_area.type in skipped_areas) || !is_station_level(P.z))
-			continue
-		P.malfunction = TRUE
 
 /proc/power_restore(var/announce = 1)
 	var/list/skipped_areas = list(/area/turret_protected/ai)
@@ -72,8 +67,6 @@
 		S.input_attempt = S.last_input_attempt
 		S.update_icon()
 		S.power_change()
-	for(var/obj/machinery/power/P in GLOB.machines)
-		P.malfunction = FALSE
 
 /proc/power_restore_quick(var/announce = 1)
 	if(announce)

code/modules/events/spacevine.dm

@@ -137,7 +137,7 @@
 		if(prob(50))
 			ChangeTurf(baseturf)
 
-/turf/simulated/floor/vines/ChangeTurf(turf/open/floor/T)
+/turf/simulated/floor/vines/ChangeTurf(turf/simulated/floor/T)
 	. = ..()
 	//Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't
 	for(var/obj/structure/spacevine/SV in src)

code/modules/food_and_drinks/food.dm

@@ -12,7 +12,7 @@
 	var/apply_method = "swallow"
 	var/transfer_efficiency = 1.0
 	var/instant_application = 0 //if we want to bypass the forcedfeed delay
-	var/taste = TRUE//whether you can taste eating from this
+	var/can_taste = TRUE//whether you can taste eating from this
 	var/antable = TRUE // Will ants come near it?
 	var/ant_location = null
 	var/ant_timer = null

code/modules/food_and_drinks/food/customizables.dm

@@ -89,6 +89,7 @@
 	basename = "personal pizza"
 	snack_overlays = 0
 	top = 0
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
 
 /obj/item/reagent_containers/food/snacks/customizable/pasta
 	name = "spaghetti"
@@ -107,6 +108,7 @@
 	basename = "bread"
 	snack_overlays = 0
 	top = 0
+	tastes = list("bread" = 10)
 
 /obj/item/reagent_containers/food/snacks/customizable/cook/pie
 	name = "pie"
@@ -116,6 +118,7 @@
 	basename = "pie"
 	snack_overlays = 0
 	top = 0
+	tastes = list("pie" = 1)
 
 /obj/item/reagent_containers/food/snacks/customizable/cook/cake
 	name = "cake"
@@ -125,6 +128,7 @@
 	basename = "cake"
 	snack_overlays = 0
 	top = 0
+	tastes = list("cake" = 1)
 
 /obj/item/reagent_containers/food/snacks/customizable/cook/jelly
 	name = "jelly"
@@ -152,6 +156,7 @@
 	basename = "kebab"
 	snack_overlays = 0
 	top = 0
+	tastes = list("meat" = 3, "metal" = 1)
 
 /obj/item/reagent_containers/food/snacks/customizable/cook/salad
 	name = "salad"
@@ -161,6 +166,7 @@
 	basename = "salad"
 	snack_overlays = 0
 	top = 0
+	tastes = list("leaves" = 1)
 
 /obj/item/reagent_containers/food/snacks/customizable/cook/waffles
 	name = "waffles"
@@ -170,6 +176,7 @@
 	basename = "waffles"
 	snack_overlays = 0
 	top = 0
+	tastes = list("waffles" = 1)
 
 /obj/item/reagent_containers/food/snacks/customizable/candy/cookie
 	name = "cookie"
@@ -179,6 +186,7 @@
 	basename = "cookie"
 	snack_overlays = 0
 	top = 0
+	tastes = list("cookie" = 1)
 
 /obj/item/reagent_containers/food/snacks/customizable/candy/cotton
 	name = "flavored cotton candy"
@@ -308,6 +316,7 @@
 	snack_overlays = 0
 	trash = /obj/item/trash/bowl
 	top = 0
+	tastes = list("soup" = 1)
 
 /obj/item/reagent_containers/food/snacks/customizable/burger
 	name = "burger bun"
@@ -316,6 +325,7 @@
 	baseicon = "burgercustom"
 	basename = "burger"
 	toptype = new /obj/item/reagent_containers/food/snacks/bun()
+	tastes = list("bun" = 4)
 
 /obj/item/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
 	if(contents.len > sandwich_limit)

code/modules/food_and_drinks/food/foods/baked_goods.dm

@@ -12,6 +12,7 @@
 	bitesize = 3
 	filling_color = "#FFD675"
 	list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5)
+	tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
 
 /obj/item/reagent_containers/food/snacks/carrotcakeslice
 	name = "carrot cake slice"
@@ -19,6 +20,8 @@
 	icon_state = "carrotcake_slice"
 	trash = /obj/item/trash/plate
 	filling_color = "#FFD675"
+	tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/sliceable/braincake
 	name = "brain cake"
@@ -29,6 +32,7 @@
 	filling_color = "#E6AEDB"
 	bitesize = 3
 	list_reagents = list("protein" = 10, "nutriment" = 10, "mannitol" = 10, "vitamin" = 5)
+	tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
 
 /obj/item/reagent_containers/food/snacks/braincakeslice
 	name = "brain cake slice"
@@ -36,6 +40,7 @@
 	icon_state = "braincakeslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#E6AEDB"
+	tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/cheesecake
 	name = "cheese cake"
@@ -46,6 +51,7 @@
 	filling_color = "#FAF7AF"
 	bitesize = 3
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("cake" = 4, "cream cheese" = 3)
 
 /obj/item/reagent_containers/food/snacks/cheesecakeslice
 	name = "cheese cake slice"
@@ -53,6 +59,7 @@
 	icon_state = "cheesecake_slice"
 	trash = /obj/item/trash/plate
 	filling_color = "#FAF7AF"
+	tastes = list("cake" = 4, "cream cheese" = 3)
 
 /obj/item/reagent_containers/food/snacks/sliceable/plaincake
 	name = "vanilla cake"
@@ -63,6 +70,7 @@
 	bitesize = 3
 	filling_color = "#F7EDD5"
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
 
 /obj/item/reagent_containers/food/snacks/plaincakeslice
 	name = "vanilla cake slice"
@@ -70,6 +78,7 @@
 	icon_state = "plaincake_slice"
 	trash = /obj/item/trash/plate
 	filling_color = "#F7EDD5"
+	tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
 
 /obj/item/reagent_containers/food/snacks/sliceable/orangecake
 	name = "orange cake"
@@ -80,6 +89,7 @@
 	bitesize = 3
 	filling_color = "#FADA8E"
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
 
 /obj/item/reagent_containers/food/snacks/orangecakeslice
 	name = "orange cake slice"
@@ -87,6 +97,7 @@
 	icon_state = "orangecake_slice"
 	trash = /obj/item/trash/plate
 	filling_color = "#FADA8E"
+	tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
 
 /obj/item/reagent_containers/food/snacks/sliceable/bananacake
 	name = "banana cake"
@@ -97,6 +108,7 @@
 	bitesize = 3
 	filling_color = "#FADA8E"
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
 
 /obj/item/reagent_containers/food/snacks/bananacakeslice
 	name = "banana cake slice"
@@ -104,6 +116,7 @@
 	icon_state = "bananacake_slice"
 	trash = /obj/item/trash/plate
 	filling_color = "#FADA8E"
+	tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
 
 /obj/item/reagent_containers/food/snacks/sliceable/limecake
 	name = "lime cake"
@@ -114,6 +127,7 @@
 	slices_num = 5
 	filling_color = "#CBFA8E"
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
 
 /obj/item/reagent_containers/food/snacks/limecakeslice
 	name = "lime cake slice"
@@ -121,6 +135,7 @@
 	icon_state = "limecake_slice"
 	trash = /obj/item/trash/plate
 	filling_color = "#CBFA8E"
+	tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
 
 /obj/item/reagent_containers/food/snacks/sliceable/lemoncake
 	name = "lemon cake"
@@ -131,6 +146,7 @@
 	bitesize = 3
 	filling_color = "#FAFA8E"
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
 
 /obj/item/reagent_containers/food/snacks/lemoncakeslice
 	name = "lemon cake slice"
@@ -138,6 +154,7 @@
 	icon_state = "lemoncake_slice"
 	trash = /obj/item/trash/plate
 	filling_color = "#FAFA8E"
+	tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
 
 /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake
 	name = "chocolate cake"
@@ -148,6 +165,7 @@
 	bitesize = 3
 	filling_color = "#805930"
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
 
 /obj/item/reagent_containers/food/snacks/chocolatecakeslice
 	name = "chocolate cake slice"
@@ -155,6 +173,7 @@
 	icon_state = "chocolatecake_slice"
 	trash = /obj/item/trash/plate
 	filling_color = "#805930"
+	tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
 
 /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake
 	name = "birthday cake"
@@ -165,6 +184,7 @@
 	filling_color = "#FFD6D6"
 	bitesize = 3
 	list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5)
+	tastes = list("cake" = 5, "sweetness" = 1)
 
 /obj/item/reagent_containers/food/snacks/birthdaycakeslice
 	name = "birthday cake slice"
@@ -172,6 +192,7 @@
 	icon_state = "birthdaycakeslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#FFD6D6"
+	tastes = list("cake" = 5, "sweetness" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/applecake
 	name = "apple cake"
@@ -182,6 +203,7 @@
 	bitesize = 3
 	filling_color = "#EBF5B8"
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
 
 /obj/item/reagent_containers/food/snacks/applecakeslice
 	name = "apple cake slice"
@@ -189,6 +211,7 @@
 	icon_state = "applecakeslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#EBF5B8"
+	tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
 
 
 //////////////////////
@@ -202,6 +225,7 @@
 	bitesize = 1
 	filling_color = "#DBC94F"
 	list_reagents = list("nutriment" = 1, "sugar" = 3, "hot_coco" = 5 )
+	tastes = list("cookie" = 1, "crunchy chocolate" = 1)
 
 /obj/item/reagent_containers/food/snacks/fortunecookie
 	name = "fortune cookie"
@@ -210,12 +234,14 @@
 	filling_color = "#E8E79E"
 	list_reagents = list("nutriment" = 3)
 	trash = /obj/item/paper/fortune
+	tastes = list("cookie" = 1)
 
 /obj/item/reagent_containers/food/snacks/sugarcookie
 	name = "sugar cookie"
 	desc = "Just like your little sister used to make."
 	icon_state = "sugarcookie"
 	list_reagents = list("nutriment" = 1, "sugar" = 3)
+	tastes = list("sweetness" = 1)
 
 
 //////////////////////
@@ -230,6 +256,7 @@
 	filling_color = "#FBFFB8"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
+	tastes = list("pie" = 1)
 
 /obj/item/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom)
 	..()
@@ -245,6 +272,7 @@
 	filling_color = "#948051"
 	bitesize = 3
 	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	tastes = list("pie" = 1, "meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/tofupie
 	name = "tofu-pie"
@@ -254,6 +282,7 @@
 	filling_color = "#FFFEE0"
 	bitesize = 3
 	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	tastes = list("pie" = 1, "tofu" = 1)
 
 /obj/item/reagent_containers/food/snacks/amanita_pie
 	name = "amanita pie"
@@ -262,6 +291,7 @@
 	filling_color = "#FFCCCC"
 	bitesize = 4
 	list_reagents = list("nutriment" = 6, "amanitin" = 3, "psilocybin" = 1, "vitamin" = 4)
+	tastes = list("pie" = 1, "mushroom" = 1)
 
 /obj/item/reagent_containers/food/snacks/plump_pie
 	name = "plump pie"
@@ -270,6 +300,7 @@
 	filling_color = "#B8279B"
 	bitesize = 3
 	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	tastes = list("pie" = 1, "mushroom" = 1)
 
 /obj/item/reagent_containers/food/snacks/plump_pie/New()
 	..()
@@ -285,6 +316,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#43DE18"
 	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	tastes = list("pie" = 1, "meat" = 1, "acid" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/applepie
 	name = "apple pie"
@@ -293,6 +326,8 @@
 	filling_color = "#E0EDC5"
 	bitesize = 3
 	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	tastes = list("pie" = 1, "apple" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/cherrypie
 	name = "cherry pie"
@@ -301,6 +336,7 @@
 	filling_color = "#FF525A"
 	bitesize = 3
 	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	tastes = list("pie" = 1, "cherries" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
 	name = "pumpkin pie"
@@ -311,6 +347,7 @@
 	bitesize = 3
 	filling_color = "#F5B951"
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("pie" = 1, "pumpkin" = 1)
 
 /obj/item/reagent_containers/food/snacks/pumpkinpieslice
 	name = "pumpkin pie slice"
@@ -318,7 +355,7 @@
 	icon_state = "pumpkinpieslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#F5B951"
-
+	tastes = list("pie" = 1, "pumpkin" = 1)
 
 //////////////////////
 //		Donuts		//
@@ -333,6 +370,7 @@
 	var/extra_reagent = null
 	filling_color = "#D2691E"
 	var/randomized_sprinkles = 1
+	tastes = list("donut" = 1)
 
 /obj/item/reagent_containers/food/snacks/donut/New()
 	..()
@@ -353,6 +391,7 @@
 	name = "chaos donut"
 	desc = "Like life, it never quite tastes the same."
 	bitesize = 10
+	tastes = list("donut" = 3, "chaos" = 1)
 
 /obj/item/reagent_containers/food/snacks/donut/chaos/New()
 	..()
@@ -369,6 +408,7 @@
 	desc = "You jelly?"
 	icon_state = "jdonut1"
 	extra_reagent = "berryjuice"
+	tastes = list("jelly" = 1, "donut" = 3)
 
 /obj/item/reagent_containers/food/snacks/donut/jelly/New()
 	..()
@@ -403,6 +443,7 @@
 	icon_state = "muffin"
 	filling_color = "#E0CF9B"
 	list_reagents = list("nutriment" = 6)
+	tastes = list("muffin" = 1)
 
 /obj/item/reagent_containers/food/snacks/berryclafoutis
 	name = "berry clafoutis"
@@ -411,6 +452,8 @@
 	trash = /obj/item/trash/plate
 	bitesize = 3
 	list_reagents = list("nutriment" = 10, "berryjuice" = 5, "vitamin" = 2)
+	tastes = list("pie" = 1, "blackberries" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/poppypretzel
 	name = "poppy pretzel"
@@ -418,6 +461,7 @@
 	icon_state = "poppypretzel"
 	filling_color = "#916E36"
 	list_reagents = list("nutriment" = 5)
+	tastes = list("pretzel" = 1)
 
 /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
 	name = "plump helmet biscuit"
@@ -425,6 +469,7 @@
 	icon_state = "phelmbiscuit"
 	filling_color = "#CFB4C4"
 	list_reagents = list("nutriment" = 5)
+	tastes = list("mushroom" = 1, "biscuit" = 1)
 
 /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/New()
 	..()
@@ -441,6 +486,8 @@
 	filling_color = "#FFFF00"
 	bitesize = 3
 	list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4)
+	tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/cracker
 	name = "cracker"
@@ -449,3 +496,4 @@
 	bitesize = 1
 	filling_color = "#F5DEB8"
 	list_reagents = list("nutriment" = 1)
+	tastes = list("cracker" = 1)

code/modules/food_and_drinks/food/foods/bread.dm

@@ -11,6 +11,7 @@
 	slices_num = 5
 	filling_color = "#FF7575"
 	list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
+	tastes = list("bread" = 10, "meat" = 10)
 
 /obj/item/reagent_containers/food/snacks/meatbreadslice
 	name = "meatbread slice"
@@ -27,6 +28,7 @@
 	slices_num = 5
 	filling_color = "#8AFF75"
 	list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
+	tastes = list("bread" = 10, "acid" = 10)
 
 /obj/item/reagent_containers/food/snacks/xenomeatbreadslice
 	name = "xenomeatbread slice"
@@ -42,6 +44,7 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/spidermeatbreadslice
 	slices_num = 5
 	list_reagents = list("protein" = 20, "nutriment" = 10, "toxin" = 15, "vitamin" = 5)
+	tastes = list("bread" = 10, "cobwebs" = 5)
 
 /obj/item/reagent_containers/food/snacks/spidermeatbreadslice
 	name = "spider meat bread slice"
@@ -58,6 +61,7 @@
 	slices_num = 5
 	filling_color = "#EDE5AD"
 	list_reagents = list("banana" = 20, "nutriment" = 20)
+	tastes = list("bread" = 10)
 
 /obj/item/reagent_containers/food/snacks/bananabreadslice
 	name = "Banana-nut bread slice"
@@ -65,6 +69,7 @@
 	icon_state = "bananabreadslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#EDE5AD"
+	tastes = list("bread" = 10)
 
 /obj/item/reagent_containers/food/snacks/sliceable/tofubread
 	name = "Tofubread"
@@ -74,6 +79,7 @@
 	slices_num = 5
 	filling_color = "#F7FFE0"
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("bread" = 10, "tofu" = 10)
 
 /obj/item/reagent_containers/food/snacks/tofubreadslice
 	name = "Tofubread slice"
@@ -90,6 +96,7 @@
 	slices_num = 6
 	filling_color = "#FFE396"
 	list_reagents = list("nutriment" = 10)
+	tastes = list("bread" = 10)
 
 /obj/item/reagent_containers/food/snacks/breadslice
 	name = "Bread slice"
@@ -98,6 +105,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#D27332"
 	list_reagents = list("nutriment" = 2, "bread" = 5)
+	tastes = list("bread" = 10)
 
 /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread
 	name = "Cream Cheese Bread"
@@ -107,6 +115,7 @@
 	slices_num = 5
 	filling_color = "#FFF896"
 	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	tastes = list("bread" = 10, "cheese" = 10)
 
 /obj/item/reagent_containers/food/snacks/creamcheesebreadslice
 	name = "Cream Cheese Bread slice"
@@ -115,6 +124,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#FFF896"
 	list_reagents = list("nutriment" = 4, "vitamin" = 1)
+	tastes = list("bread" = 10, "cheese" = 10)
 
 
 //////////////////////
@@ -127,6 +137,8 @@
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "bun"
 	list_reagents = list("nutriment" = 1)
+	tastes = list("bun" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/flatbread
 	name = "flatbread"
@@ -134,6 +146,7 @@
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "flatbread"
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bread" = 2)
 
 /obj/item/reagent_containers/food/snacks/baguette
 	name = "baguette"
@@ -142,6 +155,7 @@
 	filling_color = "#E3D796"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bread" = 2)
 
 /obj/item/reagent_containers/food/snacks/twobread
 	name = "Two Bread"
@@ -150,6 +164,7 @@
 	filling_color = "#DBCC9A"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "vitamin" = 2)
+	tastes = list("bread" = 2)
 
 /obj/item/reagent_containers/food/snacks/jelliedtoast
 	name = "Jellied Toast"
@@ -158,6 +173,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#B572AB"
 	bitesize = 3
+	tastes = list("toast" = 1, "jelly" = 1)
 
 /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
 	list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2)
@@ -173,6 +189,7 @@
 	filling_color = "#FF00F7"
 	bitesize = 4
 	list_reagents = list("nutriment" = 8, "psilocybin" = 2, "vitamin" = 2)
+	tastes = list("waffle" = 1, "mushrooms" = 1)
 
 /obj/item/reagent_containers/food/snacks/waffles
 	name = "waffles"

code/modules/food_and_drinks/food/foods/candy.dm

@@ -12,6 +12,7 @@
 	desc = "It's placeholder flavored. This shouldn't be seen."
 	icon = 'icons/obj/food/candy.dmi'
 	icon_state = "candy"
+	tastes = list("candy" = 1)
 
 // ***********************************************************
 // Candy Ingredients / Flavorings / Byproduct
@@ -23,6 +24,7 @@
 	icon_state = "chocolatebar"
 	filling_color = "#7D5F46"
 	list_reagents = list("nutriment" = 2, "chocolate" = 4)
+	tastes = list("chocolate" = 1)
 
 /obj/item/reagent_containers/food/snacks/candy/caramel
 	name = "caramel"
@@ -107,6 +109,7 @@
 	icon_state = "candycorn"
 	filling_color = "#FFFCB0"
 	list_reagents = list("nutriment" = 4, "sugar" = 2)
+	tastes = list("candy corn" = 1)
 
 // ***********************************************************
 // Candy Products (plain / unflavored)
@@ -130,6 +133,7 @@
 	bitesize = 3
 	junkiness = 25
 	list_reagents = list("nutriment" = 1, "chocolate" = 1)
+	tastes = list("chocolate" = 1)
 
 
 /obj/item/reagent_containers/food/snacks/candy/candycane
@@ -177,6 +181,8 @@
 	icon_state = "candy_cash"
 	filling_color = "#302000"
 	list_reagents = list("nutriment" = 2, "chocolate" = 4)
+	tastes = list("chocolate" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/candy/coin
 	name = "chocolate coin"
@@ -185,6 +191,8 @@
 	filling_color = "#302000"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "chocolate" = 4)
+	tastes = list("chocolate" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/candy/gum
 	name = "bubblegum"

code/modules/food_and_drinks/food/foods/desserts.dm

@@ -10,6 +10,7 @@
 	icon_state = "icecream_cone"
 	bitesize = 3
 	list_reagents = list("nutriment" = 1, "sugar" = 1)
+	tastes = list("ice cream" = 1)
 
 /obj/item/reagent_containers/food/snacks/icecream/New()
 	..()
@@ -61,6 +62,7 @@
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#FFFBDB"
 	list_reagents = list("nutriment" = 7, "vitamin" = 2)
+	tastes = list("rice" = 1, "sweetness" = 1)
 
 /obj/item/reagent_containers/food/snacks/spacylibertyduff
 	name = "Spacy Liberty Duff"
@@ -70,6 +72,7 @@
 	filling_color = "#42B873"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "psilocybin" = 6)
+	tastes = list("jelly" = 1, "mushroom" = 1)
 
 /obj/item/reagent_containers/food/snacks/amanitajelly
 	name = "Amanita Jelly"
@@ -79,6 +82,7 @@
 	filling_color = "#ED0758"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "amanitin" = 6, "psilocybin" = 3)
+	tastes = list("jelly" = 1, "mushroom" = 1)
 
 /obj/item/reagent_containers/food/snacks/candiedapple
 	name = "Candied Apple"
@@ -87,6 +91,7 @@
 	filling_color = "#F21873"
 	bitesize = 3
 	list_reagents = list("nutriment" = 3, "sugar" = 2)
+	tastes = list("apple" = 2, "sweetness" = 2)
 
 /obj/item/reagent_containers/food/snacks/mint
 	name = "mint"

code/modules/food_and_drinks/food/foods/ethnic.dm

@@ -9,6 +9,7 @@
 	icon_state = "taco"
 	bitesize = 3
 	list_reagents = list("nutriment" = 7, "vitamin" = 1)
+	tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1)
 
 /obj/item/reagent_containers/food/snacks/burrito
 	name = "burrito"
@@ -17,6 +18,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#A36A1F"
 	list_reagents = list("nutriment" = 4, "vitamin" = 1)
+	tastes = list("torilla" = 2, "meat" = 3)
+
 
 /obj/item/reagent_containers/food/snacks/chimichanga
 	name = "chimichanga"
@@ -34,6 +37,7 @@
 	filling_color = "#A36A1F"
 	bitesize = 4
 	list_reagents = list("nutriment" = 8, "capsaicin" = 6)
+	tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
 
 /obj/item/reagent_containers/food/snacks/cornchips
 	name = "corn chips"
@@ -55,6 +59,7 @@
 	icon_state = "chinese1"
 	junkiness = 25
 	list_reagents = list("nutriment" = 1, "beans" = 3, "msg" = 4, "sugar" = 2)
+	tastes = list("noodle" = 1, "vegetables" = 1)
 
 /obj/item/reagent_containers/food/snacks/chinese/sweetsourchickenball
 	name = "sweet & sour chicken balls"
@@ -62,6 +67,7 @@
 	icon_state = "chickenball"
 	junkiness = 25
 	list_reagents = list("nutriment" = 2, "msg" = 4, "sugar" = 2)
+	tastes = list("chicken" = 1, "sweetness" = 1)
 
 /obj/item/reagent_containers/food/snacks/chinese/tao
 	name = "Admiral Yamamoto carp"
@@ -69,6 +75,7 @@
 	icon_state = "chinese2"
 	junkiness = 25
 	list_reagents = list("nutriment" = 1, "protein" = 1, "msg" = 4, "sugar" = 4)
+	tastes = list("chicken" = 1)
 
 /obj/item/reagent_containers/food/snacks/chinese/newdles
 	name = "chinese newdles"
@@ -76,6 +83,7 @@
 	icon_state = "chinese3"
 	junkiness = 25
 	list_reagents = list("nutriment" = 1, "msg" = 4, "sugar" = 3)
+	tastes = list("noodles" = 1)
 
 /obj/item/reagent_containers/food/snacks/chinese/rice
 	name = "fried rice"
@@ -83,6 +91,7 @@
 	icon_state = "chinese4"
 	junkiness = 20
 	list_reagents = list("nutriment" = 1, "rice" = 3, "msg" = 4, "sugar" = 2)
+	tastes = list("rice" = 1)
 
 
 //////////////////////
@@ -96,6 +105,7 @@
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#F0F2E4"
 	list_reagents = list("nutriment" = 5)
+	tastes = list("custard" = 1)
 
 /obj/item/reagent_containers/food/snacks/yakiimo
 	name = "yaki imo"
@@ -104,6 +114,7 @@
 	trash = /obj/item/trash/plate
 	list_reagents = list("nutriment" = 5, "vitamin" = 4)
 	filling_color = "#8B1105"
+	tastes = list("sweet potato" = 1)
 
 
 //////////////////////

code/modules/food_and_drinks/food/foods/ingredients.dm

@@ -10,6 +10,7 @@
 	filling_color = "#FFFEE0"
 	bitesize = 3
 	list_reagents = list("plantmatter" = 2)
+	tastes = list("tofu" = 1)
 
 /obj/item/reagent_containers/food/snacks/fried_tofu
 	name = "fried tofu"
@@ -18,6 +19,7 @@
 	filling_color = "#FFFEE0"
 	bitesize = 3
 	list_reagents = list("plantmatter" = 3)
+	tastes = list("tofu" = 1)
 
 /obj/item/reagent_containers/food/snacks/soydope
 	name = "soy dope"
@@ -26,6 +28,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#C4BF76"
 	list_reagents = list("nutriment" = 2)
+	tastes = list("soy" = 1)
 
 
 //////////////////////
@@ -40,12 +43,14 @@
 	slices_num = 5
 	filling_color = "#FFF700"
 	list_reagents = list("nutriment" = 15, "vitamin" = 5, "cheese" = 20)
+	tastes = list("cheese" = 1)
 
 /obj/item/reagent_containers/food/snacks/cheesewedge
 	name = "cheese wedge"
 	desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
 	icon_state = "cheesewedge"
 	filling_color = "#FFF700"
+	tastes = list("cheese" = 1)
 
 /obj/item/reagent_containers/food/snacks/weirdcheesewedge
 	name = "weird cheese"
@@ -66,6 +71,7 @@
 	filling_color = "#E0D7C5"
 	bitesize = 6
 	list_reagents = list("plantmatter" = 3, "vitamin" = 1)
+	tastes = list("mushroom" = 1)
 
 /obj/item/reagent_containers/food/snacks/tomatomeat
 	name = "tomato slice"
@@ -74,18 +80,21 @@
 	filling_color = "#DB0000"
 	bitesize = 6
 	list_reagents = list("protein" = 2)
+	tastes = list("tomato" = 1)
 
 /obj/item/reagent_containers/food/snacks/watermelonslice
 	name = "watermelon slice"
 	desc = "A slice of watery goodness."
 	icon_state = "watermelonslice"
 	filling_color = "#FF3867"
+	tastes = list("watermelon" = 1)
 
 /obj/item/reagent_containers/food/snacks/pineappleslice
 	name = "pineapple slices"
 	desc = "Rings of pineapple."
 	icon_state = "pineappleslice"
 	filling_color = "#e5b437"
+	tastes = list("pineapple" = 1)
 
 
 //////////////////////
@@ -98,6 +107,7 @@
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "dough"
 	list_reagents = list("nutriment" = 6)
+	tastes = list("dough" = 1)
 
 // Dough + rolling pin = flat dough
 /obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/I, mob/user, params)
@@ -120,6 +130,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/doughslice
 	slices_num = 3
 	list_reagents = list("nutriment" = 6)
+	tastes = list("dough" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/doughslice
 	name = "dough slice"
@@ -127,6 +139,7 @@
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "doughslice"
 	list_reagents = list("nutriment" = 1)
+	tastes = list("dough" = 1)
 
 
 ///cookies by Ume
@@ -138,6 +151,8 @@
 	desc = "The base for tasty cookies."
 	icon_state = "cookiedough"
 	list_reagents = list("nutriment" = 5, "sugar" = 5)
+	tastes = list("dough" = 1, "sugar" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/cookiedough/update_icon()
     if(flat)
@@ -193,6 +208,7 @@
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "unbaked_cookies_choco"
 	list_reagents = list("nutriment" = 5, "sugar" = 5, "chocolate" = 5)
+	tastes = list("dough" = 1, "sugar" = 1, "chocolate" = 1)
 
 //////////////////////
 //	Chocolate		//
@@ -204,6 +220,7 @@
 	icon_state = "chocolatebar"
 	filling_color = "#7D5F46"
 	list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2)
+	tastes = list("chocolate" = 1)
 
 ///Chocolate crumbles/pile
 /obj/item/reagent_containers/food/snacks/chocolatebar/attackby(obj/item/I, mob/user, params)
@@ -224,6 +241,7 @@
 	icon_state = "cocoa"
 	filling_color = "#7D5F46"
 	list_reagents = list("chocolate" = 5)
+	tastes = list("chocolate" = 1)
 
 
 //////////////////////
@@ -236,3 +254,4 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "ectoplasm"
 	list_reagents = list("ectoplasm" = 10)
+	tastes = list("spookiness" = 1)

code/modules/food_and_drinks/food/foods/junkfood.dm

@@ -12,6 +12,7 @@
 	filling_color = "#E8C31E"
 	junkiness = 20
 	list_reagents = list("nutriment" = 1, "sodiumchloride" = 1, "sugar" = 3)
+	tastes = list("crisps" = 1)
 
 /obj/item/reagent_containers/food/snacks/sosjerky
 	name = "Scaredy's Private Reserve Beef Jerky"
@@ -21,6 +22,7 @@
 	filling_color = "#631212"
 	junkiness = 25
 	list_reagents = list("protein" = 1, "sugar" = 3)
+	tastes = list("chewy beef" = 1)
 
 /obj/item/reagent_containers/food/snacks/pistachios
 	name = "pistachios"
@@ -30,6 +32,7 @@
 	filling_color = "#BAD145"
 	junkiness = 20
 	list_reagents = list("plantmatter" = 2, "sodiumchloride" = 1, "sugar" = 4)
+	tastes = list("pistachios" = 1)
 
 /obj/item/reagent_containers/food/snacks/no_raisin
 	name = "4no Raisins"
@@ -39,6 +42,7 @@
 	filling_color = "#343834"
 	junkiness = 25
 	list_reagents = list("plantmatter" = 2, "sugar" = 4)
+	tastes = list("dried raisins" = 1)
 
 /obj/item/reagent_containers/food/snacks/spacetwinkie
 	name = "Space Twinkie"
@@ -47,6 +51,7 @@
 	filling_color = "#FFE591"
 	junkiness = 25
 	list_reagents = list("sugar" = 4)
+	tastes = list("twinkies" = 1)
 
 /obj/item/reagent_containers/food/snacks/cheesiehonkers
 	name = "Cheesie Honkers"
@@ -56,6 +61,7 @@
 	filling_color = "#FFA305"
 	junkiness = 25
 	list_reagents = list("nutriment" = 1, "fake_cheese" = 2, "sugar" = 3)
+	tastes = list("cheese" = 1, "crisps" = 2)
 
 /obj/item/reagent_containers/food/snacks/syndicake
 	name = "Syndi-Cakes"
@@ -65,6 +71,7 @@
 	trash = /obj/item/trash/syndi_cakes
 	bitesize = 3
 	list_reagents = list("nutriment" = 4, "salglu_solution" = 5)
+	tastes = list("sweetness" = 3, "cake" = 1)
 
 /obj/item/reagent_containers/food/snacks/tastybread
 	name = "bread tube"
@@ -74,6 +81,7 @@
 	filling_color = "#A66829"
 	junkiness = 20
 	list_reagents = list("nutriment" = 2, "sugar" = 4)
+	tastes = list("bread" = 1)
 
 
 //////////////////////

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

@@ -11,6 +11,7 @@
 	filling_color = "#FF1C1C"
 	bitesize = 3
 	list_reagents = list("protein" = 3)
+	tastes = list("meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/meat/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/kitchen/knife) || istype(W, /obj/item/scalpel))
@@ -30,6 +31,7 @@
 	name = "-meat"
 	var/subjectname = ""
 	var/subjectjob = null
+	tastes = list("tender meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct
 	name = "meat product"
@@ -83,6 +85,7 @@
 	filling_color = "#DB0000"
 	bitesize = 3
 	list_reagents = list("protein" = 12, "morphine" = 5, "vitamin" = 2)
+	tastes = list("meat" = 1, "salmon" = 1)
 
 /obj/item/reagent_containers/food/snacks/xenomeat
 	name = "meat"
@@ -91,6 +94,7 @@
 	filling_color = "#43DE18"
 	bitesize = 6
 	list_reagents = list("protein" = 3, "vitamin" = 1)
+	tastes = list("meat" = 1, "acid" = 1)
 
 /obj/item/reagent_containers/food/snacks/spidermeat
 	name = "spider meat"
@@ -98,6 +102,7 @@
 	icon_state = "spidermeat"
 	bitesize = 3
 	list_reagents = list("protein" = 3, "toxin" = 3, "vitamin" = 1)
+	tastes = list("cobwebs" = 1)
 
 /obj/item/reagent_containers/food/snacks/lizardmeat
 	name = "mutant lizard meat"
@@ -106,30 +111,35 @@
 	filling_color = "#43DE18"
 	bitesize = 3
 	list_reagents = list("protein" = 3, "toxin" = 3)
+	tastes = list("tough meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/spiderleg
 	name = "spider leg"
 	desc = "A still twitching leg of a giant spider. You don't really want to eat this, do you?"
 	icon_state = "spiderleg"
 	list_reagents = list("protein" = 2, "toxin" = 2)
+	tastes = list("cobwebs" = 1, "creepy motion" = 1)
 
 /obj/item/reagent_containers/food/snacks/raw_bacon
 	name = "raw bacon"
 	desc = "God's gift to man in uncooked form."
 	icon_state = "raw_bacon"
 	list_reagents = list("nutriment" = 1, "porktonium" = 10)
+	tastes = list("bacon" = 1)
 
 /obj/item/reagent_containers/food/snacks/spidereggs
 	name = "spider eggs"
 	desc = "A cluster of juicy spider eggs. A great side dish for when you don't care about your health."
 	icon_state = "spidereggs"
 	list_reagents = list("protein" = 2, "toxin" = 2)
+	tastes = list("cobwebs" = 1, "spider juice" = 1)
 
 /obj/item/reagent_containers/food/snacks/goliath
 	name = "goliath meat"
 	desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
 	icon_state = "goliathmeat"
 	list_reagents = list("protein" = 3, "toxin" = 5)
+	tastes = list("tough meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/goliath/burn()
 	visible_message("[src] finishes cooking!")
@@ -148,12 +158,14 @@
 	filling_color = "#7A3D11"
 	bitesize = 3
 	list_reagents = list("nutriment" = 5)
+	tastes = list("meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/bacon
 	name = "bacon"
 	desc = "It looks crispy and tastes amazing! Mmm... Bacon."
 	icon_state = "bacon"
 	list_reagents = list("nutriment" = 4, "porktonium" = 10, "msg" = 4)
+	tastes = list("bacon" = 1)
 
 /obj/item/reagent_containers/food/snacks/telebacon
 	name = "tele bacon"
@@ -161,6 +173,7 @@
 	icon_state = "bacon"
 	var/obj/item/radio/beacon/bacon/baconbeacon
 	list_reagents = list("nutriment" = 4, "porktonium" = 10)
+	tastes = list("bacon" = 1)
 
 /obj/item/reagent_containers/food/snacks/telebacon/New()
 	..()
@@ -178,6 +191,7 @@
 	icon_state = "meatball"
 	filling_color = "#DB0000"
 	list_reagents = list("protein" = 4, "vitamin" = 1)
+	tastes = list("meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/sausage
 	name = "sausage"
@@ -185,6 +199,7 @@
 	icon_state = "sausage"
 	filling_color = "#DB0000"
 	list_reagents = list("protein" = 6, "vitamin" = 1, "porktonium" = 10)
+	tastes = list("meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/cutlet
 	name = "cutlet"
@@ -192,6 +207,7 @@
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "cutlet"
 	list_reagents = list("protein" = 2)
+	tastes = list("meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/spidereggsham
 	name = "green eggs and ham"
@@ -200,6 +216,7 @@
 	trash = /obj/item/trash/plate
 	bitesize = 4
 	list_reagents = list("nutriment" = 6)
+	tastes = list("cobwebs" = 1, "the colour green" = 1)
 
 /obj/item/reagent_containers/food/snacks/boiledspiderleg
 	name = "boiled spider leg"
@@ -208,6 +225,7 @@
 	trash = /obj/item/trash/plate
 	bitesize = 3
 	list_reagents = list("nutriment" = 3, "capsaicin" = 2)
+	tastes = list("cobwebs" = 1, "hot peppers" = 1)
 
 /obj/item/reagent_containers/food/snacks/wingfangchu
 	name = "wing fang chu"
@@ -216,6 +234,7 @@
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#43DE18"
 	list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2)
+	tastes = list("soy" = 1)
 
 /obj/item/reagent_containers/food/snacks/goliath_steak
 	name = "goliath steak"
@@ -224,6 +243,7 @@
 	icon_state = "goliathsteak"
 	trash = null
 	list_reagents = list("protein" = 6, "vitamin" = 2)
+	tastes = list("meat" = 1)
 
 //////////////////////
 //		Cubes		//
@@ -238,6 +258,7 @@
 	var/faction
 	var/datum/species/monkey_type = /datum/species/monkey
 	list_reagents = list("nutriment" = 2)
+	tastes = list("the jungle" = 1, "bananas" = 1)
 
 /obj/item/reagent_containers/food/snacks/monkeycube/water_act(volume, temperature, source, method = TOUCH)
 	. = ..()
@@ -294,6 +315,8 @@
 	icon_state = "egg"
 	filling_color = "#FDFFD1"
 	list_reagents = list("protein" = 1, "egg" = 5)
+	tastes = list("egg" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
 	..()
@@ -367,6 +390,7 @@
 	filling_color = "#FFDF78"
 	bitesize = 1
 	list_reagents = list("nutriment" = 3, "egg" = 5)
+	tastes = list("egg" = 1, "salt" = 1, "pepper" = 1)
 
 /obj/item/reagent_containers/food/snacks/boiledegg
 	name = "boiled egg"
@@ -390,6 +414,7 @@
 	filling_color = "#FFF9A8"
 	list_reagents = list("nutriment" = 8, "vitamin" = 1)
 	bitesize = 1
+	tastes = list("egg" = 1, "cheese" = 1)
 
 /obj/item/reagent_containers/food/snacks/benedict
 	name = "eggs benedict"
@@ -397,6 +422,7 @@
 	icon_state = "benedict"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "egg" = 3, "vitamin" = 4)
+	tastes = list("egg" = 1, "bacon" = 1, "bun" = 1)
 
 
 //////////////////////
@@ -409,6 +435,7 @@
 	icon_state = "hotdog"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3)
+	tastes = list("bun" = 3, "meat" = 2)
 
 /obj/item/reagent_containers/food/snacks/meatbun
 	name = "meat bun"
@@ -416,6 +443,7 @@
 	icon_state = "meatbun"
 	bitesize = 6
 	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	tastes = list("bun" = 3, "meat" = 2)
 
 /obj/item/reagent_containers/food/snacks/sliceable/turkey
 	name = "turkey"
@@ -424,6 +452,7 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/turkeyslice
 	slices_num = 6
 	list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 5)
+	tastes = list("turkey" = 2, "stuffing" = 2)
 
 /obj/item/reagent_containers/food/snacks/turkeyslice
 	name = "turkey serving"
@@ -431,6 +460,7 @@
 	icon_state = "turkeyslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#B97A57"
+	tastes = list("turkey" = 1)
 
 /obj/item/reagent_containers/food/snacks/organ
 	name = "organ"

code/modules/food_and_drinks/food/foods/misc.dm

@@ -10,6 +10,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#4D2F5E"
 	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	tastes = list("eggplant" = 2, "cheese" = 2)
 
 /obj/item/reagent_containers/food/snacks/soylentgreen
 	name = "soylent green"
@@ -18,6 +19,7 @@
 	trash = /obj/item/trash/waffles
 	filling_color = "#B8E6B5"
 	list_reagents = list("nutriment" = 10, "vitamin" = 1)
+	tastes = list("waffles" = 7, "people" = 1)
 
 /obj/item/reagent_containers/food/snacks/soylentviridians
 	name = "soylent virdians"
@@ -26,6 +28,7 @@
 	trash = /obj/item/trash/waffles
 	filling_color = "#E6FA61"
 	list_reagents = list("nutriment" = 10, "vitamin" = 1)
+	tastes = list("waffles" = 10)
 
 /obj/item/reagent_containers/food/snacks/monkeysdelight
 	name = "monkey's delight"
@@ -35,6 +38,7 @@
 	filling_color = "#5C3C11"
 	bitesize = 6
 	list_reagents = list("nutriment" = 10, "banana" = 5, "vitamin" = 5)
+	tastes = list("banana" = 1, "the jungle" = 1)
 
 /obj/item/reagent_containers/food/snacks/dionaroast
 	name = "roast diona"
@@ -43,6 +47,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#75754B"
 	list_reagents = list("plantmatter" = 4, "nutriment" = 2, "radium" = 2, "vitamin" = 4)
+	tastes = list("chewy vegetables" = 1)
 
 /obj/item/reagent_containers/food/snacks/tofurkey
 	name = "tofurkey"
@@ -51,6 +56,7 @@
 	filling_color = "#FFFEE0"
 	bitesize = 3
 	list_reagents = list("nutriment" = 12, "ether" = 3)
+	tastes = list("tofu" = 1)
 
 
 //////////////////////
@@ -65,6 +71,7 @@
 	filling_color = "#468C00"
 	bitesize = 3
 	list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6)
+	tastes = list("divinity" = 1, "lettuce" = 1)
 
 /obj/item/reagent_containers/food/snacks/herbsalad
 	name = "herb salad"
@@ -74,6 +81,7 @@
 	filling_color = "#76B87F"
 	bitesize = 3
 	list_reagents = list("nutriment" = 8, "vitamin" = 2)
+	tastes = list("lettuce" = 1, "apple" = 1)
 
 /obj/item/reagent_containers/food/snacks/validsalad
 	name = "valid salad"
@@ -83,6 +91,7 @@
 	filling_color = "#76B87F"
 	bitesize = 3
 	list_reagents = list("nutriment" = 8, "salglu_solution" = 5, "vitamin" = 2)
+	tastes = list("fried potato" = 1, "lettuce" = 1, "meat" = 1, "valids" = 1)
 
 
 //////////////////////
@@ -95,6 +104,7 @@
 	icon_state = "donkpocket"
 	filling_color = "#DEDEAB"
 	list_reagents = list("nutriment" = 4)
+	tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
 
 /obj/item/reagent_containers/food/snacks/warmdonkpocket
 	name = "warm Donk-pocket"
@@ -102,6 +112,7 @@
 	icon_state = "donkpocket"
 	filling_color = "#DEDEAB"
 	list_reagents = list("nutriment" = 4)
+	tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
 
 /obj/item/reagent_containers/food/snacks/warmdonkpocket/Post_Consume(mob/living/M)
 	M.reagents.add_reagent("omnizine", 15)
@@ -140,6 +151,7 @@
 	icon_state = "boiledrorocore"
 	bitesize = 3
 	list_reagents = list("slimejelly" = 5)
+	tastes = list("jelly" = 3)
 
 /obj/item/reagent_containers/food/snacks/popcorn
 	name = "Popcorn"
@@ -150,6 +162,7 @@
 	filling_color = "#FFFAD4"
 	bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
 	list_reagents = list("nutriment" = 2)
+	tastes = list("popcorn" = 3, "butter" = 1)
 
 /obj/item/reagent_containers/food/snacks/popcorn/New()
 	..()

code/modules/food_and_drinks/food/foods/pasta.dm

@@ -10,6 +10,7 @@
 	icon_state = "spaghetti"
 	filling_color = "#EDDD00"
 	list_reagents = list("nutriment" = 1, "vitamin" = 1)
+	tastes = list("raw pasta" = 1)
 
 /obj/item/reagent_containers/food/snacks/macaroni
 	name = "macaroni twists"
@@ -18,6 +19,7 @@
 	icon_state = "macaroni"
 	filling_color = "#EDDD00"
 	list_reagents = list("nutriment" = 1, "vitamin" = 1)
+	tastes = list("raw pasta" = 1)
 
 
 //////////////////////
@@ -32,6 +34,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#FCEE81"
 	list_reagents = list("nutriment" = 2, "vitamin" = 1)
+	tastes = list("pasta" = 1)
 
 /obj/item/reagent_containers/food/snacks/pastatomato
 	name = "spaghetti"
@@ -42,6 +45,7 @@
 	filling_color = "#DE4545"
 	bitesize = 4
 	list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4)
+	tastes = list("pasta" = 1, "tomato" = 1)
 
 /obj/item/reagent_containers/food/snacks/meatballspaghetti
 	name = "spaghetti & meatballs"
@@ -51,6 +55,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#DE4545"
 	list_reagents = list("nutriment" = 8, "synaptizine" = 5, "vitamin" = 4)
+	tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/spesslaw
 	name = "Spesslaw"
@@ -59,6 +64,7 @@
 	icon_state = "spesslaw"
 	filling_color = "#DE4545"
 	list_reagents = list("nutriment" = 8, "synaptizine" = 10, "vitamin" = 6)
+	tastes = list("pasta" = 1, "tomato" = 1, "meat" = 2)
 
 /obj/item/reagent_containers/food/snacks/macncheese
 	name = "mac n cheese"
@@ -68,10 +74,12 @@
 	icon_state = "macncheese"
 	filling_color = "#ffe45d"
 	list_reagents = list("nutriment" = 5, "vitamin" = 2, "cheese" = 4)
+	tastes = list("pasta" = 1, "cheese" = 1, "comfort" = 1)
 
 /obj/item/reagent_containers/food/snacks/lasagna
 	name = "Lasagna"
 	icon_state = "lasagna"
-	desc = "Tajarans loves to eat this, for some reason."
+	desc = "Tajara love to eat this, for some reason."
 	filling_color = "#E18712"
 	list_reagents = list("nutriment" = 10, "msg" = 3, "vitamin" = 4, "tomatojuice" = 10)
+	tastes = list("pasta" = 1, "cheese" = 1, "tomato" = 1, "meat" = 1)

code/modules/food_and_drinks/food/foods/pizza.dm

@@ -7,6 +7,7 @@
 	icon = 'icons/obj/food/pizza.dmi'
 	slices_num = 6
 	filling_color = "#BAA14C"
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita
 	name = "margherita pizza"
@@ -22,6 +23,7 @@
 	icon_state = "pizzamargheritaslice"
 	filling_color = "#BAA14C"
 	list_reagents = list("nutriment" = 5)
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
 	name = "meat pizza"
@@ -29,6 +31,7 @@
 	icon_state = "meatpizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/meatpizzaslice
 	list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/meatpizzaslice
 	name = "meat pizza slice"
@@ -36,6 +39,7 @@
 	icon = 'icons/obj/food/pizza.dmi'
 	icon_state = "meatpizzaslice"
 	filling_color = "#BAA14C"
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
 	name = "mushroom pizza"
@@ -43,6 +47,8 @@
 	icon_state = "mushroompizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/mushroompizzaslice
 	list_reagents = list("plantmatter" = 30, "vitamin" = 5)
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/mushroompizzaslice
 	name = "mushroom pizza slice"
@@ -50,6 +56,7 @@
 	icon = 'icons/obj/food/pizza.dmi'
 	icon_state = "mushroompizzaslice"
 	filling_color = "#BAA14C"
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
 	name = "vegetable pizza"
@@ -57,6 +64,8 @@
 	icon_state = "vegetablepizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/vegetablepizzaslice
 	list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "carrot" = 1, "vegetables" = 1)
+
 
 /obj/item/reagent_containers/food/snacks/vegetablepizzaslice
 	name = "vegetable pizza slice"
@@ -64,6 +73,7 @@
 	icon = 'icons/obj/food/pizza.dmi'
 	icon_state = "vegetablepizzaslice"
 	filling_color = "#BAA14C"
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "carrot" = 1, "vegetables" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
 	name = "Hawaiian pizza"
@@ -71,6 +81,7 @@
 	icon_state = "hawaiianpizza" //NEEDED
 	slice_path = /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice
 	list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5)
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 1)
 
 /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice
 	name = "Hawaiian pizza slice"
@@ -78,6 +89,7 @@
 	icon = 'icons/obj/food/pizza.dmi'
 	icon_state = "hawaiianpizzaslice"
 	filling_color = "#e5b437"
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
 	name = "mac n cheese pizza"
@@ -86,6 +98,7 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/macpizzaslice
 	list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious
 	filling_color = "#ffe45d"
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1)
 
 /obj/item/reagent_containers/food/snacks/macpizzaslice
 	name = "mac n cheese pizza slice"
@@ -93,6 +106,7 @@
 	icon = 'icons/obj/food/pizza.dmi'
 	icon_state = "macpizzaslice"
 	filling_color = "#ffe45d"
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1)
 
 
 //////////////////////

code/modules/food_and_drinks/food/foods/sandwiches.dm

@@ -10,6 +10,7 @@
 	filling_color = "#F2B6EA"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "prions" = 10, "vitamin" = 1)
+	tastes = list("bun" = 4, "brains" = 2)
 
 /obj/item/reagent_containers/food/snacks/ghostburger
 	name = "ghost burger"
@@ -18,6 +19,7 @@
 	filling_color = "#FFF2FF"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "ectoplasm" = 2)
 
 /obj/item/reagent_containers/food/snacks/human
 	var/hname = ""
@@ -30,6 +32,7 @@
 	icon_state = "hburger"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "tender meat" = 2)
 
 /obj/item/reagent_containers/food/snacks/cheeseburger
 	name = "cheeseburger"
@@ -37,6 +40,7 @@
 	icon_state = "cheeseburger"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "meat" = 1, "cheese" = 1)
 
 /obj/item/reagent_containers/food/snacks/monkeyburger
 	name = "burger"
@@ -45,6 +49,7 @@
 	filling_color = "#D63C3C"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "meat" = 1, "the jungle" = 1)
 
 /obj/item/reagent_containers/food/snacks/tofuburger
 	name = "tofu burger"
@@ -53,6 +58,7 @@
 	filling_color = "#FFFEE0"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "tofu" = 4)
 
 /obj/item/reagent_containers/food/snacks/roburger
 	name = "roburger"
@@ -61,6 +67,7 @@
 	filling_color = "#CCCCCC"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "nanomachines" = 10, "vitamin" = 1)
+	tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
 
 /obj/item/reagent_containers/food/snacks/roburgerbig
 	name = "roburger"
@@ -70,6 +77,7 @@
 	volume = 120
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "nanomachines" = 70, "vitamin" = 5)
+	tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 2)
 
 /obj/item/reagent_containers/food/snacks/xenoburger
 	name = "xenoburger"
@@ -78,6 +86,7 @@
 	filling_color = "#43DE18"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "acid" = 4)
 
 /obj/item/reagent_containers/food/snacks/clownburger
 	name = "clown burger"
@@ -86,6 +95,7 @@
 	filling_color = "#FF00FF"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "banana" = 1, "magic" = 2)
 
 /obj/item/reagent_containers/food/snacks/mimeburger
 	name = "mime burger"
@@ -94,6 +104,7 @@
 	filling_color = "#FFFFFF"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "silence" = 2)
 
 /obj/item/reagent_containers/food/snacks/baseballburger
 	name = "home run baseball burger"
@@ -102,6 +113,7 @@
 	filling_color = "#CD853F"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4)
 
 /obj/item/reagent_containers/food/snacks/spellburger
 	name = "spell burger"
@@ -110,6 +122,7 @@
 	filling_color = "#D505FF"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "magic" = 2)
 
 /obj/item/reagent_containers/food/snacks/bigbiteburger
 	name = "BigBite burger"
@@ -118,6 +131,7 @@
 	filling_color = "#E3D681"
 	bitesize = 3
 	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10)
 
 /obj/item/reagent_containers/food/snacks/superbiteburger
 	name = "SuperBite burger"
@@ -126,6 +140,7 @@
 	filling_color = "#CCA26A"
 	bitesize = 7
 	list_reagents = list("nutriment" = 40, "vitamin" = 5)
+	tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10)
 
 /obj/item/reagent_containers/food/snacks/jellyburger
 	name = "jelly burger"
@@ -133,6 +148,7 @@
 	icon_state = "jellyburger"
 	filling_color = "#B572AB"
 	bitesize = 3
+	tastes = list("bun" = 4, "jelly" = 2)
 
 /obj/item/reagent_containers/food/snacks/jellyburger/slime
 	list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1)
@@ -152,6 +168,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#D9BE29"
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
 
 /obj/item/reagent_containers/food/snacks/toastedsandwich
 	name = "toasted sandwich"
@@ -160,6 +177,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#D9BE29"
 	list_reagents = list("nutriment" = 6, "carbon" = 2)
+	tastes = list("toast" = 1)
 
 /obj/item/reagent_containers/food/snacks/grilledcheese
 	name = "grilled cheese sandwich"
@@ -168,6 +186,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#D9BE29"
 	list_reagents = list("nutriment" = 7, "vitamin" = 1) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value?
+	tastes = list("toast" = 1, "grilled cheese" = 1)
 
 /obj/item/reagent_containers/food/snacks/jellysandwich
 	name = "jelly sandwich"
@@ -176,6 +195,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#9E3A78"
 	bitesize = 3
+	tastes = list("toast" = 1, "jelly" = 1)
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/slime
 	list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2)
@@ -188,9 +208,11 @@
 	desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
 	icon_state = "notasandwich"
 	list_reagents = list("nutriment" = 6, "vitamin" = 6)
+	tastes = list("nothing suspicious" = 1)
 
 /obj/item/reagent_containers/food/snacks/wrap
 	name = "egg wrap"
 	desc = "The precursor to Pigs in a Blanket."
 	icon_state = "wrap"
 	list_reagents = list("nutriment" = 5)
+	tastes = list("egg" = 1)

code/modules/food_and_drinks/food/foods/seafood.dm

@@ -7,6 +7,7 @@
 	filling_color = "#FFDEFE"
 	bitesize = 6
 	list_reagents = list("protein" = 3, "carpotoxin" = 2, "vitamin" = 2)
+	tastes = list("white fish" = 1)
 
 /obj/item/reagent_containers/food/snacks/salmonmeat
 	name = "raw salmon"
@@ -16,6 +17,7 @@
 	filling_color = "#FFDEFE"
 	bitesize = 6
 	list_reagents = list("protein" = 3, "vitamin" = 2)
+	tastes = list("raw salmon" = 1)
 
 /obj/item/reagent_containers/food/snacks/salmonsteak
 	name = "salmon steak"
@@ -26,6 +28,7 @@
 	filling_color = "#7A3D11"
 	bitesize = 3
 	list_reagents = list("nutriment" = 4, "vitamin" = 2)
+	tastes = list("cooked salmon" = 1)
 
 /obj/item/reagent_containers/food/snacks/catfishmeat
 	name = "raw catfish"
@@ -35,6 +38,7 @@
 	filling_color = "#FFDEFE"
 	bitesize = 6
 	list_reagents = list("protein" = 3, "vitamin" = 2)
+	tastes = list("catfish" = 1)
 
 /obj/item/reagent_containers/food/snacks/fishfingers
 	name = "fish fingers"
@@ -44,6 +48,7 @@
 	filling_color = "#FFDEFE"
 	bitesize = 1
 	list_reagents = list("nutriment" = 4)
+	tastes = list("fish" = 1, "bread" = 1)
 
 /obj/item/reagent_containers/food/snacks/fishburger
 	name = "Fillet-O-Carp sandwich"
@@ -53,6 +58,7 @@
 	filling_color = "#FFDEFE"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "fish" = 4)
 
 /obj/item/reagent_containers/food/snacks/cubancarp
 	name = "Cuban carp"
@@ -63,6 +69,7 @@
 	filling_color = "#E9ADFF"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "capsaicin" = 1)
+	tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
 
 /obj/item/reagent_containers/food/snacks/fishandchips
 	name = "fish and chips"
@@ -72,6 +79,7 @@
 	filling_color = "#E3D796"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6)
+	tastes = list("fish" = 1, "chips" = 1)
 
 /obj/item/reagent_containers/food/snacks/sashimi
 	name = "carp sashimi"
@@ -80,6 +88,7 @@
 	icon_state = "sashimi"
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "capsaicin" = 5)
+	tastes = list("raw carp" = 1, "hot peppers" = 1)
 
 /obj/item/reagent_containers/food/snacks/fried_shrimp
 	name = "fried shrimp"
@@ -88,6 +97,7 @@
 	icon_state = "shrimp_fried"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
+	tastes = list("shrimp" = 1, "bread crumbs" = 1)
 
 /obj/item/reagent_containers/food/snacks/boiled_shrimp
 	name = "boiled shrimp"
@@ -96,6 +106,7 @@
 	icon_state = "shrimp_cooked"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
+	tastes = list("shrimp" = 1)
 
 /obj/item/reagent_containers/food/snacks/shrimp_skewer
 	name = "shrimp skewer"
@@ -105,6 +116,7 @@
 	icon_state = "shrimpskewer"
 	bitesize = 3 
 	list_reagents = list("nutriment" = 8)
+	tastes = list("shrimp" = 4)
 
 /obj/item/reagent_containers/food/snacks/fish_skewer
 	name = "fish skewer"
@@ -114,6 +126,7 @@
 	icon_state = "fishskewer"
 	bitesize = 3
 	list_reagents = list("protein" = 6, "vitamin" = 4)
+	tastes = list("shrimp" = 1, "batter" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
 	name = "ebi makiroll"
@@ -124,6 +137,7 @@
 	slices_num = 4
 	bitesize = 3
 	list_reagents = list("nutriment" = 8)
+	tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_Ebi
 	name = "ebi sushi"
@@ -132,6 +146,7 @@
 	icon_state = "sushi_Ebi"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
+	tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
 	name = "ikura makiroll"
@@ -142,6 +157,7 @@
 	slices_num = 4
 	bitesize = 3
 	list_reagents = list("nutriment" = 8, "protein" = 4)
+	tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_Ikura
 	name = "ikura sushi"
@@ -150,16 +166,18 @@
 	icon_state = "sushi_Ikura"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
+	tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
 	name = "sake makiroll"
-	desc = "A large unsliced roll of Ebi Sushi."
+	desc = "A large unsliced roll of Sake Sushi."
 	icon = 'icons/obj/food/seafood.dmi'
 	icon_state = "Sake_maki"
 	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Sake
 	slices_num = 4
 	bitesize = 3
 	list_reagents = list("nutriment" = 8)
+	tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_Sake
 	name = "sake sushi"
@@ -168,6 +186,7 @@
 	icon_state = "sushi_Sake"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
+	tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
 	name = "smoked salmon makiroll"
@@ -178,6 +197,7 @@
 	slices_num = 4
 	bitesize = 3
 	list_reagents = list("nutriment" = 8)
+	tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
 	name = "smoked salmon sushi"
@@ -186,6 +206,7 @@
 	icon_state = "sushi_SmokedSalmon"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
+	tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/Tamago_maki
 	name = "tamago makiroll"
@@ -196,6 +217,7 @@
 	slices_num = 4
 	bitesize = 3
 	list_reagents = list("nutriment" = 8)
+	tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_Tamago
 	name = "tamago sushi"
@@ -204,6 +226,7 @@
 	icon_state = "sushi_Tamago"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
+	tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
 	name = "inari makiroll"
@@ -214,6 +237,7 @@
 	slices_num = 4
 	bitesize = 3
 	list_reagents = list("nutriment" = 8)
+	tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_Inari
 	name = "inari sushi"
@@ -222,6 +246,7 @@
 	icon_state = "sushi_Inari"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
+	tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
 	name = "masago makiroll"
@@ -232,6 +257,7 @@
 	slices_num = 4
 	bitesize = 3
 	list_reagents = list("nutriment" = 8, "protein" = 4)
+	tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_Masago
 	name = "masago sushi"
@@ -240,6 +266,7 @@
 	icon_state = "sushi_Masago"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
+	tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
 	name = "tobiko makiroll"
@@ -250,6 +277,7 @@
 	slices_num = 4
 	bitesize = 3
 	list_reagents = list("nutriment" = 8, "protein" = 4)
+	tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_Tobiko
 	name = "tobiko sushi"
@@ -258,6 +286,7 @@
 	icon_state = "sushi_Masago"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
+	tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
 	name = "tobiko and egg makiroll"
@@ -268,6 +297,7 @@
 	slices_num = 4
 	bitesize = 3
 	list_reagents = list("nutriment" = 8, "protein" = 4)
+	tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
 	name = "tobiko and egg sushi"
@@ -276,6 +306,7 @@
 	icon_state = "sushi_TobikoEgg"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
+	tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
 	name = "tai makiroll"
@@ -286,6 +317,7 @@
 	slices_num = 4
 	bitesize = 3
 	list_reagents = list("nutriment" = 8)
+	tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_Tai
 	name = "tai sushi"
@@ -294,6 +326,7 @@
 	icon_state = "sushi_Tai"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
+	tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
 
 /obj/item/reagent_containers/food/snacks/sushi_Unagi
 	name = "unagi sushi"
@@ -302,3 +335,4 @@
 	icon_state = "sushi_Hokki"
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
+	tastes = list("grilled eel" = 1, "seaweed" = 1)

code/modules/food_and_drinks/food/foods/side_dishes.dm

@@ -9,6 +9,7 @@
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "rawsticks"
 	list_reagents = list("plantmatter" = 3)
+	tastes = list("raw potatoes" = 1)
 
 
 //////////////////////
@@ -22,6 +23,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#EDDD00"
 	list_reagents = list("nutriment" = 4)
+	tastes = list("fries" = 3, "salt" = 1)
 
 /obj/item/reagent_containers/food/snacks/cheesyfries
 	name = "cheesy fries"
@@ -30,6 +32,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#EDDD00"
 	list_reagents = list("nutriment" = 6)
+	tastes = list("fries" = 3, "cheese" = 1)
 
 /obj/item/reagent_containers/food/snacks/tatortot
 	name = "tator tot"
@@ -37,6 +40,7 @@
 	icon_state = "tatortot"
 	list_reagents = list("nutriment" = 4)
 	filling_color = "FFD700"
+	tastes = list("fried potato" = 3, "valids" = 1)
 
 /obj/item/reagent_containers/food/snacks/onionrings
 	name = "onion rings"
@@ -45,6 +49,7 @@
 	list_reagents = list("nutriment" = 3)
 	filling_color = "#C0C9A0"
 	gender = PLURAL
+	tastes = list("onion" = 3, "batter" = 1)
 
 /obj/item/reagent_containers/food/snacks/carrotfries
 	name = "carrot fries"
@@ -53,6 +58,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#FAA005"
 	list_reagents = list("plantmatter" = 3, "oculine" = 3, "vitamin" = 2)
+	tastes = list("carrots" = 3, "salt" = 1)
 
 
 //////////////////////
@@ -64,6 +70,7 @@
 	desc = "Musical fruit in a slightly less musical container."
 	icon_state = "beans"
 	list_reagents = list("nutriment" = 10, "beans" = 10, "vitamin" = 3)
+	tastes = list("beans" = 1)
 
 /obj/item/reagent_containers/food/snacks/mashed_potatoes //mashed taters
 	name = "mashed potatoes"
@@ -72,6 +79,7 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#D6D9C1"
 	list_reagents = list("nutriment" = 5, "gravy" = 5, "mashedpotatoes" = 10, "vitamin" = 2)
+	tastes = list("mashed potato" = 3, "gravy" = 1)
 
 /obj/item/reagent_containers/food/snacks/stuffing
 	name = "stuffing"
@@ -79,6 +87,7 @@
 	icon_state = "stuffing"
 	filling_color = "#C9AC83"
 	list_reagents = list("nutriment" = 3)
+	tastes = list("bread crumbs" = 1, "herbs" = 1)
 
 /obj/item/reagent_containers/food/snacks/loadedbakedpotato
 	name = "loaded baked potato"
@@ -86,6 +95,7 @@
 	icon_state = "loadedbakedpotato"
 	filling_color = "#9C7A68"
 	list_reagents = list("nutriment" = 6)
+	tastes = list("potato" = 1, "cheese" = 1, "herbs" = 1)
 
 /obj/item/reagent_containers/food/snacks/boiledrice
 	name = "boiled rice"
@@ -94,6 +104,7 @@
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#FFFBDB"
 	list_reagents = list("nutriment" = 5, "vitamin" = 1)
+	tastes = list("rice" = 1)
 
 
 /obj/item/reagent_containers/food/snacks/roastparsnip
@@ -103,3 +114,5 @@
 	trash = /obj/item/trash/plate
 	list_reagents = list("nutriment" = 3, "vitamin" = 4)
 	filling_color = "#FF5500"
+	tastes = list("parsnip" = 1)
+

code/modules/food_and_drinks/food/foods/soups.dm

@@ -11,6 +11,7 @@
 	filling_color = "#785210"
 	bitesize = 5
 	list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
+	tastes = list("meatball" = 1)
 
 /obj/item/reagent_containers/food/snacks/slimesoup
 	name = "slime soup"
@@ -19,6 +20,7 @@
 	filling_color = "#C4DBA0"
 	bitesize = 5
 	list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4)
+	tastes = list("slime" = 1)
 
 /obj/item/reagent_containers/food/snacks/bloodsoup
 	name = "tomato soup"
@@ -27,6 +29,7 @@
 	filling_color = "#FF0000"
 	bitesize = 5
 	list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4)
+	tastes = list("iron" = 1)
 
 /obj/item/reagent_containers/food/snacks/clownstears
 	name = "clown's tears"
@@ -35,6 +38,7 @@
 	filling_color = "#C4FBFF"
 	bitesize = 5
 	list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8)
+	tastes = list("a bad joke" = 1)
 
 /obj/item/reagent_containers/food/snacks/vegetablesoup
 	name = "vegetable soup"
@@ -44,6 +48,7 @@
 	filling_color = "#AFC4B5"
 	bitesize = 5
 	list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
+	tastes = list("vegetables" = 1)
 
 /obj/item/reagent_containers/food/snacks/nettlesoup
 	name = "nettle soup"
@@ -53,6 +58,7 @@
 	filling_color = "#AFC4B5"
 	bitesize = 5
 	list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
+	tastes = list("nettles" = 1)
 
 /obj/item/reagent_containers/food/snacks/mysterysoup
 	name = "mystery soup"
@@ -61,6 +67,7 @@
 	var/extra_reagent = null
 	bitesize = 5
 	list_reagents = list("nutriment" = 6)
+	tastes = list("chaos" = 1)
 
 /obj/item/reagent_containers/food/snacks/mysterysoup/New()
 	..()
@@ -75,6 +82,7 @@
 	filling_color = "#D1F4FF"
 	bitesize = 5
 	list_reagents = list("water" = 10)
+	tastes = list("wishes" = 1)
 
 /obj/item/reagent_containers/food/snacks/wishsoup/New()
 	..()
@@ -91,6 +99,7 @@
 	filling_color = "#D92929"
 	bitesize = 5
 	list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3)
+	tastes = list("tomato" = 1)
 
 /obj/item/reagent_containers/food/snacks/milosoup
 	name = "milosoup"
@@ -99,6 +108,7 @@
 	trash = /obj/item/trash/snack_bowl
 	bitesize = 5
 	list_reagents = list("nutriment" = 7, "vitamin" = 2)
+	tastes = list("milo" = 1)
 
 /obj/item/reagent_containers/food/snacks/mushroomsoup
 	name = "chantrelle soup"
@@ -108,6 +118,7 @@
 	filling_color = "#E386BF"
 	bitesize = 5
 	list_reagents = list("nutriment" = 8, "vitamin" = 4)
+	tastes = list("mushroom" = 1)
 
 /obj/item/reagent_containers/food/snacks/beetsoup
 	name = "beet soup"
@@ -117,6 +128,7 @@
 	bitesize = 5
 	filling_color = "#FAC9FF"
 	list_reagents = list("nutriment" = 7, "vitamin" = 2)
+	tastes = list("beet" = 1)
 
 /obj/item/reagent_containers/food/snacks/beetsoup/New()
 	..()
@@ -134,6 +146,7 @@
 	filling_color = "#9E673A"
 	bitesize = 7
 	list_reagents = list("nutriment" = 10, "oculine" = 5, "tomatojuice" = 5, "vitamin" = 5)
+	tastes = list("tomato" = 1, "carrot" = 1)
 
 /obj/item/reagent_containers/food/snacks/stewedsoymeat
 	name = "stewed soy meat"
@@ -141,6 +154,7 @@
 	icon_state = "stewedsoymeat"
 	trash = /obj/item/trash/plate
 	list_reagents = list("nutriment" = 8)
+	tastes = list("soy" = 1, "vegetables" = 1)
 
 
 //////////////////////
@@ -155,6 +169,7 @@
 	filling_color = "#FF3C00"
 	bitesize = 5
 	list_reagents = list("nutriment" = 5, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2)
+	tastes = list("hot peppers" = 1, "tomato" = 1)
 
 /obj/item/reagent_containers/food/snacks/coldchili
 	name = "cold chili"
@@ -164,3 +179,4 @@
 	trash = /obj/item/trash/snack_bowl
 	bitesize = 5
 	list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2)
+	tastes = list("tomato" = 1, "mint" = 1)

code/modules/food_and_drinks/food/snacks.dm

@@ -16,9 +16,21 @@
 	var/cooktype[0]
 	var/cooked_type = null  //for microwave cooking. path of the resulting item after microwaving
 	var/total_w_class = 0 //for the total weight an item of food can carry
+	var/list/tastes  // for example list("crisps" = 2, "salt" = 1)
 
+/obj/item/reagent_containers/food/snacks/add_initial_reagents()
+	if(tastes && tastes.len)
+		if(list_reagents)
+			for(var/rid in list_reagents)
+				var/amount = list_reagents[rid]
+				if(rid == "nutriment" || rid == "vitamin" || rid == "protein" || rid == "plantmatter")
+					reagents.add_reagent(rid, amount, tastes.Copy())
+				else
+					reagents.add_reagent(rid, amount)
+	else
+		..()
 
-	//Placeholder for effect that trigger on eating that aren't tied to reagents.
+//Placeholder for effect that trigger on eating that aren't tied to reagents.
 /obj/item/reagent_containers/food/snacks/proc/On_Consume(mob/M, mob/user)
 	if(!user)
 		return
@@ -153,11 +165,13 @@
 				C.adjustFireLoss(-5)
 				qdel(src)
 				G.last_eaten = world.time
+				G.taste(reagents)
 			else
 				M.visible_message("[M] takes a bite of [src].","<span class='notice'>You take a bite of [src].</span>")
 				playsound(loc,'sound/items/eatfood.ogg', rand(10,50), 1)
 				bitecount++
 				G.last_eaten = world.time
+				G.taste(reagents)
 		else if(ismouse(M))
 			var/mob/living/simple_animal/mouse/N = M
 			to_chat(N, text("<span class='notice'>You nibble away at [src].</span>"))
@@ -166,6 +180,7 @@
 			//N.emote("nibbles away at the [src]")
 			N.adjustBruteLoss(-1)
 			N.adjustFireLoss(-1)
+			N.taste(reagents)
 
 /obj/item/reagent_containers/food/snacks/sliceable/examine(mob/user)
 	. = ..()

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

@@ -17,6 +17,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sandwich
 	category = CAT_FOOD
+	subcategory = CAT_SANDWICH
 
 /datum/crafting_recipe/slimesandwich
 	name = "Slime Jelly Sandwich"
@@ -26,6 +27,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/jellysandwich/slime
 	category = CAT_FOOD
+	subcategory = CAT_SANDWICH
 
 /datum/crafting_recipe/cherrysandwich
 	name = "Cherry Jelly Sandwich"
@@ -35,6 +37,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
 	category = CAT_FOOD
+	subcategory = CAT_SANDWICH
 
 /datum/crafting_recipe/slimeburger
 	name = "Slime Jelly Burger"
@@ -44,6 +47,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/jellyburger/slime
 	category = CAT_FOOD
+	subcategory = CAT_SANDWICH
 
 /datum/crafting_recipe/jellyburger
 	name = "Cherry Jelly Burger"
@@ -53,6 +57,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/jellyburger/cherry
 	category = CAT_FOOD
+	subcategory = CAT_SANDWICH
 
 /datum/crafting_recipe/baseballburger
 	name = "Home run baseball burger"
@@ -62,6 +67,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/baseballburger
 	category = CAT_FOOD
+	subcategory = CAT_SANDWICH
 
 /datum/crafting_recipe/notasandwich
 	name = "not-a-sandwich"
@@ -71,7 +77,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/notasandwich
 	category = CAT_FOOD
-
+	subcategory = CAT_SANDWICH
 
 /datum/crafting_recipe/sushi_Ebi
 	name = "Ebi Sushi"
@@ -81,6 +87,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_Ebi
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/Ebi_maki
 	name = "Ebi Makiroll"
@@ -91,6 +98,7 @@
 	tools = list(/obj/item/kitchen/sushimat)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/sushi_Ikura
 	name = "Ikura Sushi"
@@ -100,6 +108,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_Ikura
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/Ikura_maki
 	name = "Ikura Makiroll"
@@ -110,6 +119,7 @@
 	tools = list(/obj/item/kitchen/sushimat)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/sushi_Inari
 	name = "Inari Sushi"
@@ -119,6 +129,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_Inari
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/Inari_maki
 	name = "Inari Makiroll"
@@ -129,6 +140,7 @@
 	tools = list(/obj/item/kitchen/sushimat)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/sushi_Sake
 	name = "Sake Sushi"
@@ -138,6 +150,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_Sake
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/Sake_maki
 	name = "Sake Makiroll"
@@ -148,6 +161,7 @@
 	tools = list(/obj/item/kitchen/sushimat)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/sushi_SmokedSalmon
 	name = "Smoked Salmon Sushi"
@@ -157,6 +171,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/SmokedSalmon_maki
 	name = "Smoked Salmon Makiroll"
@@ -167,6 +182,7 @@
 	tools = list(/obj/item/kitchen/sushimat)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/sushi_Masago
 	name = "Masago Sushi"
@@ -176,6 +192,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_Masago
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/Masago_maki
 	name = "Masago Makiroll"
@@ -186,6 +203,7 @@
 	tools = list(/obj/item/kitchen/sushimat)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/sushi_Tobiko
 	name = "Tobiko Sushi"
@@ -195,6 +213,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/Tobiko_maki
 	name = "Tobiko Makiroll"
@@ -205,6 +224,7 @@
 	tools = list(/obj/item/kitchen/sushimat)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/sushi_TobikoEgg
 	name = "Tobiko and Egg Sushi"
@@ -214,6 +234,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/TobikoEgg_maki
 	name = "Tobiko Makiroll"
@@ -224,6 +245,7 @@
 	tools = list(/obj/item/kitchen/sushimat)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/Sake_maki
 	name = "Sake Makiroll"
@@ -234,6 +256,7 @@
 	tools = list(/obj/item/kitchen/sushimat)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/sushi_Tai
 	name = "Tai Sushi"
@@ -243,6 +266,7 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_Tai
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/Tai_maki
 	name = "Tai Makiroll"
@@ -253,6 +277,7 @@
 	tools = list(/obj/item/kitchen/sushimat)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
 	category = CAT_FOOD
+	subcategory = CAT_SUSHI
 
 /datum/crafting_recipe/food
 
@@ -271,4 +296,5 @@
 		/datum/reagent/teslium = 1,
 	)
 	result = /mob/living/simple_animal/pet/cat/cak
-	category = CAT_FOOD
+	category = CAT_FOOD
+	subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Felines -Foxes are better

code/modules/holiday/christmas.dm

@@ -6,8 +6,10 @@
 				new /obj/item/a_gift(T)
 	for(var/mob/living/simple_animal/pet/corgi/Ian/Ian in GLOB.mob_list)
 		Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
-	GLOB.crafting_recipes += new /datum/crafting_recipe/snowman
-//The following spawn is necessary as both the timer and the shuttle systems initialise after the events system does, so we can't add stuff to the shuttle system as it doesn't exist yet and we can't use a timer
+	for(var/datum/crafting_recipe/snowman/S in GLOB.crafting_recipes)
+		S.always_availible = TRUE
+		break
+	//The following spawn is necessary as both the timer and the shuttle systems initialise after the events system does, so we can't add stuff to the shuttle system as it doesn't exist yet and we can't use a timer
 	spawn(60 SECONDS)
 		var/datum/supply_packs/xmas = SSshuttle.supply_packs["[/datum/supply_packs/misc/snow_machine]"]
 		xmas.special_enabled = TRUE

code/modules/hydroponics/fermenting_barrel.dm

@@ -32,8 +32,8 @@
 		data["alcohol_perc"] = G.wine_power
 		if(G.wine_flavor)
 			data["tastes"] = list(G.wine_flavor = 1)
-		// else										// Stub - Will implement when we port over tg's better taste system - I'd rather get the barrel in first. 
-		// 	data["tastes"] = list(G.tastes[1] = 1)
+		else
+			data["tastes"] = list(G.tastes[1] = 1)
 		reagents.add_reagent("fruit_wine", amount, data)
 	qdel(G)
 	playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)

code/modules/hydroponics/grown.dm

@@ -20,6 +20,9 @@
 
 /obj/item/reagent_containers/food/snacks/grown/New(newloc, var/obj/item/seeds/new_seed = null)
 	..()
+	if(!tastes)
+		tastes = list("[name]" = 1)
+
 	if(new_seed)
 		seed = new_seed.Copy()
 	else if(ispath(seed))
@@ -68,7 +71,7 @@
 
 			if(!isturf(loc) || !(locate(/obj/structure/table) in loc) && !(locate(/obj/machinery/optable) in loc) && !(locate(/obj/item/storage/bag/tray) in loc))
 				to_chat(user, "<span class='warning'>You cannot slice [src] here! You need a table or at least a tray to do it.</span>")
-				return TRUE	
+				return TRUE
 
 			var/slices_lost = 0
 			if(!inaccurate)

code/modules/hydroponics/grown/ambrosia.dm

@@ -7,6 +7,7 @@
 	slot_flags = SLOT_HEAD
 	filling_color = "#008000"
 	bitesize_mod = 2
+	tastes = list("ambrosia" = 1)
 
 // Ambrosia Vulgaris
 /obj/item/seeds/ambrosia
@@ -52,6 +53,7 @@
 	filling_color = "#008B8B"
 	origin_tech = "biotech=4;materials=3"
 	wine_power = 0.5
+	tastes = list("ambrosia deus" = 1)
 
 //Ambrosia Gaia
 /obj/item/seeds/ambrosia/gaia
@@ -78,6 +80,7 @@
 	seed = /obj/item/seeds/ambrosia/gaia
 	wine_power = 0.7
 	wine_flavor = "the earthmother's blessing"
+	tastes = list("ambrosia gaia" = 1)
 
 // Ambrosia Cruciatus
 /obj/item/seeds/ambrosia/cruciatus
@@ -88,4 +91,5 @@
 
 /obj/item/reagent_containers/food/snacks/grown/ambrosia/cruciatus
 	seed = /obj/item/seeds/ambrosia/cruciatus
-	wine_power = 0.7
+	wine_power = 0.7
+	tastes = list("ambrosia cruciatus" = 1)

code/modules/hydroponics/grown/apple.dm

@@ -23,6 +23,7 @@
 	icon_state = "apple"
 	filling_color = "#FF4500"
 	bitesize = 100 // Always eat the apple in one bite
+	tastes = list("apple" = 1)
 	distill_reagent = "hcider"
 
 // Posioned Apple

code/modules/hydroponics/grown/banana.dm

@@ -24,6 +24,7 @@
 	filling_color = "#FFFF00"
 	bitesize = 5
 	distill_reagent = "bananahonk"
+	tastes = list("banana" = 1)
 
 /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is aiming the [name] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.</span>")

code/modules/hydroponics/grown/beans.dm

@@ -25,6 +25,7 @@
 	icon_state = "soybeans"
 	filling_color = "#F0E68C"
 	bitesize_mod = 2
+	tastes = list("soybean" = 1)
 	wine_power = 0.2
 
 // Koibean
@@ -47,4 +48,5 @@
 	icon_state = "koibeans"
 	filling_color = "#F0E68C"
 	bitesize_mod = 2
+	tastes = list("koi" = 1)
 	wine_power = 0.4

code/modules/hydroponics/grown/berries.dm

@@ -25,6 +25,7 @@
 	gender = PLURAL
 	filling_color = "#FF00FF"
 	bitesize_mod = 2
+	tastes = list("berry" = 1)
 	distill_reagent = "gin"
 
 // Poison Berries
@@ -46,6 +47,7 @@
 	icon_state = "poisonberrypile"
 	filling_color = "#C71585"
 	distill_reagent = null
+	tastes = list("poison-berry" = 1)
 	wine_power = 0.35
 
 // Death Berries
@@ -69,6 +71,7 @@
 	icon_state = "deathberrypile"
 	filling_color = "#708090"
 	distill_reagent = null
+	tastes = list("death-berry" = 1)
 	wine_power = 0.5
 
 // Glow Berries
@@ -96,6 +99,7 @@
 	light_color = "#006622"
 	distill_reagent = null
 	wine_power = 0.6
+	tastes = list("glow-berry" = 1)
 	wine_flavor = "warmth"
 
 // Cherries
@@ -127,6 +131,7 @@
 	filling_color = "#FF0000"
 	bitesize_mod = 2
 	wine_power = 0.3
+	tastes = list("cherry" = 1)
 
 // Blue Cherries
 /obj/item/seeds/cherry/blue
@@ -148,6 +153,7 @@
 	filling_color = "#6495ED"
 	bitesize_mod = 2
 	wine_power = 0.5
+	tastes = list("blue cherry" = 1)
 
 // Grapes
 /obj/item/seeds/grape
@@ -179,6 +185,7 @@
 	filling_color = "#FF1493"
 	bitesize_mod = 2
 	distill_reagent = "wine"
+	tastes = list("grapes" = 1)
 
 // Green Grapes
 /obj/item/seeds/grape/green
@@ -197,4 +204,5 @@
 	name = "bunch of green grapes"
 	icon_state = "greengrapes"
 	filling_color = "#7FFF00"
+	tastes = list("green grape" = 1)
 	distill_reagent = "cognac"

code/modules/hydroponics/grown/cannabis.dm

@@ -93,6 +93,7 @@
 	icon_state = "cannabis"
 	filling_color = "#00FF00"
 	bitesize_mod = 2
+	tastes = list("cannabis" = 1)
 	wine_power = 0.2
 
 

code/modules/hydroponics/grown/cereals.dm

@@ -20,6 +20,7 @@
 	gender = PLURAL
 	icon_state = "wheat"
 	filling_color = "#F0E68C"
+	tastes = list("wheat" = 1)
 	bitesize_mod = 2
 	distill_reagent = "beer"
 
@@ -40,6 +41,7 @@
 	gender = PLURAL
 	icon_state = "oat"
 	filling_color = "#556B2F"
+	tastes = list("oat" = 1)
 	bitesize_mod = 2
 	distill_reagent = "ale"
 
@@ -62,6 +64,7 @@
 	icon_state = "rice"
 	filling_color = "#FAFAD2"
 	bitesize_mod = 2
+	tastes = list("rice" = 1)
 	distill_reagent = "sake"
 
 //Meatwheat - grows into synthetic meat
@@ -83,6 +86,7 @@
 	filling_color = rgb(150, 0, 0)
 	bitesize_mod = 2
 	seed = /obj/item/seeds/wheat/meat
+	tastes = list("meatwheat" = 1)
 	can_distill = FALSE
 
 /obj/item/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user)

code/modules/hydroponics/grown/chili.dm

@@ -25,6 +25,7 @@
 	icon_state = "chilipepper"
 	filling_color = "#FF0000"
 	bitesize_mod = 2
+	tastes = list("chili" = 1)
 	wine_power = 0.2
 
 // Ice Chili
@@ -50,6 +51,7 @@
 	filling_color = "#0000CD"
 	bitesize_mod = 2
 	origin_tech = "biotech=4"
+	tastes = list("chilli" = 1)
 	wine_power = 0.3
 
 // Ghost Chili
@@ -76,4 +78,5 @@
 	filling_color = "#F8F8FF"
 	bitesize_mod = 4
 	origin_tech = "biotech=4;magnets=5"
+	tastes = list("ghost chili" = 1)
 	wine_power = 0.5

code/modules/hydroponics/grown/citrus.dm

@@ -30,6 +30,7 @@
 	desc = "It's so sour, your face will twist."
 	icon_state = "lime"
 	filling_color = "#00FF00"
+	tastes = list("lime" = 1)
 	distill_reagent = "triple_sec"
 
 // Orange
@@ -56,6 +57,7 @@
 	name = "orange"
 	desc = "It's an tangy fruit."
 	icon_state = "orange"
+	tastes = list("orange" = 1)
 	filling_color = "#FFA500"
 
 // Lemon
@@ -81,6 +83,7 @@
 	name = "lemon"
 	desc = "When life gives you lemons, make lemonade."
 	icon_state = "lemon"
+	tastes = list("lemonade" = 1)
 	filling_color = "#FFD700"
 
 // Combustible lemon
@@ -107,6 +110,7 @@
 	icon_state = "firelemon"
 	bitesize_mod = 2
 	wine_power = 0.7
+	tastes = list("burning lemon" = 1)
 	wine_flavor = "fire"
 
 /obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user)

code/modules/hydroponics/grown/cocoa_vanilla.dm

@@ -25,6 +25,7 @@
 	icon_state = "cocoapod"
 	filling_color = "#FFD700"
 	bitesize_mod = 2
+	tastes = list("cocoa" = 1)
 	distill_reagent = "creme_de_cacao"
 
 // Vanilla Pod
@@ -45,4 +46,5 @@
 	desc = "Fattening... Mmmmm... vanilla."
 	icon_state = "vanillapod"
 	filling_color = "#FFD700"
+	tastes = list("vanilla" = 1)
 	distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it.

code/modules/hydroponics/grown/corn.dm

@@ -24,6 +24,7 @@
 	filling_color = "#FFFF00"
 	trash = /obj/item/grown/corncob
 	bitesize_mod = 2
+	tastes = list("corn" = 1)
 	distill_reagent = "whiskey"
 	wine_power = 0.4
 

code/modules/hydroponics/grown/cotton.dm

@@ -0,0 +1,79 @@
+/obj/item/seeds/cotton
+	name = "pack of cotton seeds"
+	desc = "A pack of seeds that'll grow into a cotton plant. Assistants make good free labor if neccesary."
+	icon_state = "seed-cotton"
+	species = "cotton"
+	plantname = "Cotton"
+	icon_harvest = "cotton-harvest"
+	product = /obj/item/grown/cotton
+	lifespan = 35
+	endurance = 25
+	maturation = 15
+	production = 1
+	yield = 2
+	potency = 50
+	growthstages = 3
+	growing_icon = 'icons/obj/hydroponics/growing.dmi'
+	icon_dead = "cotton-dead"
+	mutatelist = list(/obj/item/seeds/cotton/durathread)
+
+/obj/item/grown/cotton
+	seed = /obj/item/seeds/cotton
+	name = "cotton bundle"
+	desc = "A fluffy bundle of cotton."
+	icon_state = "cotton"
+	force = 0
+	throwforce = 0
+	w_class = WEIGHT_CLASS_TINY
+	throw_speed = 2
+	throw_range = 3
+	attack_verb = list("pomfed")
+	var/cotton_type = /obj/item/stack/sheet/cotton
+	var/cotton_name = "raw cotton"
+
+/obj/item/grown/cotton/attack_self(mob/user)
+	user.show_message("<span class='notice'>You pull some [cotton_name] out of the [name]!</span>", 1)
+	var/seed_modifier = 0
+	if(seed)
+		seed_modifier = round(seed.potency / 25)
+	var/obj/item/stack/cotton = new cotton_type(user.loc, 1 + seed_modifier)
+	var/old_cotton_amount = cotton.amount
+	for(var/obj/item/stack/ST in user.loc)
+		if(ST != cotton && istype(ST, cotton_type) && ST.amount < ST.max_amount)
+			ST.attackby(cotton, user)
+	if(cotton.amount > old_cotton_amount)
+		to_chat(user, "<span class='notice'>You add the newly-formed [cotton_name] to the stack. It now contains [cotton.amount] [cotton_name].</span>")
+	qdel(src)
+
+//reinforced mutated variant
+/obj/item/seeds/cotton/durathread
+	name = "pack of durathread seeds"
+	desc = "A pack of seeds that'll grow into an extremely durable thread that could easily rival plasteel if woven properly."
+	icon_state = "seed-durathread"
+	species = "durathread"
+	plantname = "Durathread"
+	icon_harvest = "durathread-harvest"
+	product = /obj/item/grown/cotton/durathread
+	lifespan = 80
+	endurance = 50
+	maturation = 15
+	production = 1
+	yield = 2
+	potency = 50
+	growthstages = 3
+	growing_icon = 'icons/obj/hydroponics/growing.dmi'
+	icon_dead = "cotton-dead"
+
+/obj/item/grown/cotton/durathread
+	seed = /obj/item/seeds/cotton/durathread
+	name = "durathread bundle"
+	desc = "A tough bundle of durathread, good luck unraveling this."
+	icon_state = "durathread"
+	force = 5
+	throwforce = 5
+	w_class = WEIGHT_CLASS_NORMAL
+	throw_speed = 2
+	throw_range = 3
+	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
+	cotton_type = /obj/item/stack/sheet/cotton/durathread
+	cotton_name = "raw durathread"

code/modules/hydroponics/grown/eggplant.dm

@@ -22,6 +22,7 @@
 	icon_state = "eggplant"
 	filling_color = "#800080"
 	bitesize_mod = 2
+	tastes = list("eggplant" = 1)
 	wine_power = 0.2
 
 // Egg-Plant
@@ -43,4 +44,5 @@
 	trash = /obj/item/reagent_containers/food/snacks/egg
 	filling_color = "#F8F8FF"
 	bitesize_mod = 2
+	tastes = list("egg-plant" = 1)
 	distill_reagent = "eggnog"

code/modules/hydroponics/grown/flowers.dm

@@ -25,6 +25,7 @@
 	slot_flags = SLOT_HEAD
 	filling_color = "#FF6347"
 	bitesize_mod = 3
+	tastes = list("poppy" = 1)
 	distill_reagent = "vermouth"
 
 // Lily
@@ -42,6 +43,7 @@
 	name = "lily"
 	desc = "A beautiful orange flower"
 	icon_state = "lily"
+	tastes = list("lily" = 1)
 	filling_color = "#FFA500"
 
 // Geranium
@@ -59,6 +61,7 @@
 	name = "geranium"
 	desc = "A beautiful blue flower"
 	icon_state = "geranium"
+	tastes = list("geranium" = 1)
 	filling_color = "#008B8B"
 
 
@@ -88,6 +91,7 @@
 	icon_state = "harebell"
 	slot_flags = SLOT_HEAD
 	filling_color = "#E6E6FA"
+	tastes = list("harebell" = 1)
 	bitesize_mod = 3
 	distill_reagent = "vermouth"
 
@@ -147,6 +151,7 @@
 	slot_flags = SLOT_HEAD
 	filling_color = "#E6E6FA"
 	bitesize_mod = 2
+	tastes = list("moonflower" = 1)
 	distill_reagent = "absinthe" 
 
 // Novaflower

code/modules/hydroponics/grown/grass_carpet.dm

@@ -27,6 +27,7 @@
 	bitesize_mod = 2
 	var/stacktype = /obj/item/stack/tile/grass
 	var/tile_coefficient = 0.02 // 1/50
+	tastes = list("grass" = 1)
 	wine_power = 0.15
 
 /obj/item/reagent_containers/food/snacks/grown/grass/attack_self(mob/user)
@@ -66,4 +67,5 @@
 	desc = "The textile industry's dark secret."
 	icon_state = "carpetclump"
 	stacktype = /obj/item/stack/tile/carpet
+	tastes = list("carpet" = 1)
 	can_distill = FALSE

code/modules/hydroponics/grown/herbals.dm

@@ -17,6 +17,7 @@
 	desc = "Mash to turn into a poultice."
 	icon_state = "tea_astra_leaves"
 	color = "#378C61"
+	tastes = list("comfrey" = 1)
 	bitesize_mod = 2
 
 /obj/item/reagent_containers/food/snacks/grown/comfrey/attack_self(mob/user)
@@ -43,6 +44,7 @@
 	desc = "Mash to turn into a poultice."
 	icon_state = "ambrosiavulgaris"
 	color = "#4CC5C7"
+	tastes = list("aloe" = 1)
 	bitesize_mod = 2
 
 /obj/item/reagent_containers/food/snacks/grown/aloe/attack_self(mob/user)

code/modules/hydroponics/grown/kudzu.dm

@@ -95,4 +95,5 @@
 	icon_state = "kudzupod"
 	filling_color = "#6B8E23"
 	bitesize_mod = 2
+	tastes = list("kudzu" = 1)
 	wine_power = 0.2

code/modules/hydroponics/grown/melon.dm

@@ -24,6 +24,7 @@
 	dried_type = null
 	w_class = WEIGHT_CLASS_NORMAL
 	filling_color = "#008000"
+	tastes = list("watermelon" = 1)
 	bitesize_mod = 3
 	wine_power = 0.4
 
@@ -47,4 +48,5 @@
 	filling_color = "#FFD700"
 	dried_type = null
 	wine_power = 0.7 //Water to wine, baby.
+	tastes = list("melon" = 1, "divinity" = 1)
 	wine_flavor = "divinity"

code/modules/hydroponics/grown/misc.dm

@@ -53,6 +53,7 @@
 	icon_state = "cabbage"
 	filling_color = "#90EE90"
 	bitesize_mod = 2
+	tastes = list("cabbage" = 1)
 	wine_power = 0.2
 
 
@@ -79,6 +80,7 @@
 	icon_state = "sugarcane"
 	filling_color = "#FFD700"
 	bitesize_mod = 2
+	tastes = list("sugarcane" = 1)
 	distill_reagent = "rum"
 
 
@@ -109,6 +111,7 @@
 	icon_state = "gatfruit"
 	origin_tech = "combat=6"
 	trash = /obj/item/gun/projectile/revolver
+	tastes = list("2nd amendment" = 1, "freedom" = 1)
 	bitesize_mod = 2
 	wine_power = 0.9 //It burns going down, too.
 
@@ -131,6 +134,7 @@
 	filling_color = rgb(20, 20, 20)
 	seed = /obj/item/seeds/cherry/bomb
 	bitesize_mod = 2
+	tastes = list("cherry" = 1, "explosion" = 1)
 	volume = 125 //Gives enough room for the black powder at max potency
 	wine_power = 0.8
 

code/modules/hydroponics/grown/mushrooms.dm

@@ -28,6 +28,7 @@
 	name = "reishi"
 	desc = "<I>Ganoderma lucidum</I>: A special fungus known for its medicinal and stress relieving properties."
 	icon_state = "reishi"
+	tastes = list("reishi" = 1)
 	filling_color = "#FF4500"
 
 
@@ -55,6 +56,7 @@
 	name = "fly amanita"
 	desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
 	icon_state = "amanita"
+	tastes = list("amanita" = 1)
 	filling_color = "#FF0000"
 
 
@@ -85,6 +87,7 @@
 	desc = "<I>Amanita Virosa</I>: Deadly poisonous basidiomycete fungus filled with alpha amanitin."
 	icon_state = "angel"
 	filling_color = "#C0C0C0"
+	tastes = list("destroying angel" = 1)
 	wine_power = 0.6
 
 
@@ -112,6 +115,7 @@
 	icon_state = "libertycap"
 	filling_color = "#DAA520"
 	wine_power = 0.8
+	tastes = list("liberty-cap" = 1)
 	wine_flavor = "freedom"
 
 
@@ -139,6 +143,7 @@
 	desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
 	icon_state = "plumphelmet"
 	filling_color = "#9370DB"
+	tastes = list("plump helmet" = 1, "dwarven hardiness" = 1)
 	distill_reagent = "manlydorf"
 
 
@@ -166,6 +171,7 @@
 	icon_state = "walkingmushroom"
 	filling_color = "#9370DB"
 	origin_tech = "biotech=4;programming=5"
+	tastes = list("walking mushroom" = 1, "motion" = 1)
 	can_distill = FALSE
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
@@ -205,6 +211,7 @@
 	name = "chanterelle cluster"
 	desc = "<I>Cantharellus Cibarius</I>: These jolly yellow little shrooms sure look tasty!"
 	icon_state = "chanterelle"
+	tastes = list("chanterelle" = 1)
 	filling_color = "#FFA500"
 
 
@@ -238,6 +245,7 @@
 	var/effect_path = /obj/structure/glowshroom
 	origin_tech = "biotech=4;plasmatech=6"
 	light_color = "#006622"
+	tastes = list("warmth" = 1, "light" = 1, "glowshroom" = 1)
 	wine_power = 0.5
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
@@ -287,6 +295,7 @@
 	effect_path = /obj/structure/glowshroom/glowcap
 	origin_tech = "biotech=4;powerstorage=6;plasmatech=4"
 	light_color = "#8E0300"
+	tastes = list("warmth" = 1, "light" = 1, "glowscap" = 1)
 	wine_power = 0.6
 	wine_flavor = "warmth"
 
@@ -311,6 +320,7 @@
 	name = "fungus"
 	desc = "A fungus ideal for making antibacterials."
 	icon_state = "angel"
+	tastes = list("fungus" = 1)
 	color = "#4f4331"
 
 //Shadowshroom
@@ -335,5 +345,6 @@
 	icon_state = "shadowshroom"
 	effect_path = /obj/structure/glowshroom/shadowshroom
 	origin_tech = "biotech=4;plasmatech=4;magnets=4"
+	tastes = list("strange coldness" = 1, "shadowshroom" = 1)
 	wine_power = 0.6
 	wine_flavor = "strange coldness"

code/modules/hydroponics/grown/onion.dm

@@ -24,6 +24,7 @@
 	filling_color = "#C0C9A0"
 	bitesize_mod = 2
 	slice_path = /obj/item/reagent_containers/food/snacks/onion_slice
+	tastes = list("onion" = 1, "pungentness" = 1)
 	slices_num = 2
 	wine_power = 0.2
 	wine_flavor = "pungentness"
@@ -45,6 +46,7 @@
 	icon_state = "onion_red"
 	filling_color = "#C29ACF"
 	slice_path = /obj/item/reagent_containers/food/snacks/onion_slice/red
+	tastes = list("red onion" = 1, "pungentness" = 3)
 	wine_power = 0.6
 	wine_flavor = "powerful pungentness"
 
@@ -54,6 +56,7 @@
 	icon_state = "onionslice"
 	list_reagents = list("plantmatter" = 5, "vitamin" = 2)
 	filling_color = "#C0C9A0"
+	tastes = list("onion" = 1, "pungentness" = 1)
 	gender = PLURAL
 	cooked_type = /obj/item/reagent_containers/food/snacks/onionrings
 
@@ -62,4 +65,5 @@
 	desc = "They shine like exceptionally low quality amethyst."
 	icon_state = "onionslice_red"
 	filling_color = "#C29ACF"
+	tastes = list("red onion" = 1, "pungentness" = 3)
 	list_reagents = list("plantmatter" = 5, "vitamin" = 2, "onionjuice" = 2.5)

code/modules/hydroponics/grown/peanut.dm

@@ -22,4 +22,5 @@
 	name = "patch of peanuts"
 	desc = "Best avoided if you have spess allergies."
 	icon_state = "peanuts"
+	tastes = list("peanut" = 1, "nuttiness" = 1)
 	gender = PLURAL

code/modules/hydroponics/grown/pineapple.dm

@@ -25,4 +25,5 @@
   filling_color = "#e5b437"
   w_class = WEIGHT_CLASS_NORMAL
   bitesize_mod = 3
+  tastes = list("pineapple" = 1)
   wine_power = 0.4

code/modules/hydroponics/grown/potato.dm

@@ -24,6 +24,7 @@
 	desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
 	icon_state = "potato"
 	filling_color = "#E9967A"
+	tastes = list("potato" = 1)
 	bitesize = 100
 	distill_reagent = "vodka"
 
@@ -33,6 +34,7 @@
 	desc = "Slices of neatly cut potato."
 	icon_state = "potato_wedges"
 	filling_color = "#E9967A"
+	tastes = list("potato" = 1)
 	bitesize = 100
 	distill_reagent = "sbiten"
 
@@ -64,4 +66,5 @@
 	seed = /obj/item/seeds/potato/sweet
 	name = "sweet potato"
 	desc = "It's sweet."
+	tastes = list("sweet potato" = 1)
 	icon_state = "sweetpotato"

code/modules/hydroponics/grown/pumpkin.dm

@@ -23,6 +23,7 @@
 	icon_state = "pumpkin"
 	filling_color = "#FFA500"
 	bitesize_mod = 2
+	tastes = list("pumpkin" = 1)
 	wine_power = 0.2
 
 /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -53,4 +54,5 @@
 	icon_state = "blumpkin"
 	filling_color = "#87CEFA"
 	bitesize_mod = 2
+	tastes = list("blumpkin" = 1)
 	wine_power = 0.5

code/modules/hydroponics/grown/replicapod.dm

@@ -88,7 +88,7 @@
 		make_podman = 0
 
 	if(make_podman)	//all conditions met!
-		var/mob/living/carbon/human/diona/podman = new /mob/living/carbon/human/diona(parent.loc)
+		var/mob/living/carbon/human/pod_diona/podman = new /mob/living/carbon/human/pod_diona(parent.loc)
 		if(realName)
 			podman.real_name = realName
 		mind.transfer_to(podman)

code/modules/hydroponics/grown/root.dm

@@ -21,6 +21,7 @@
 	icon_state = "carrot"
 	filling_color = "#FFA500"
 	bitesize_mod = 2
+	tastes = list("carrot" = 1)
 	wine_power = 0.3
 
 /obj/item/reagent_containers/food/snacks/grown/carrot/wedges
@@ -60,16 +61,17 @@
 	desc = "Closely related to carrots."
 	icon_state = "parsnip"
 	bitesize_mod = 2
+	tastes = list("parsnip" = 1)
 	wine_power = 0.35
 
 
 // White-Beet
 /obj/item/seeds/whitebeet
-	name = "pack of white-beet seeds"
+	name = "pack of white beet seeds"
 	desc = "These seeds grow into sugary beet producing plants."
 	icon_state = "seed-whitebeet"
 	species = "whitebeet"
-	plantname = "White-Beet Plants"
+	plantname = "White Beet Plants"
 	product = /obj/item/reagent_containers/food/snacks/grown/whitebeet
 	lifespan = 60
 	endurance = 50
@@ -81,11 +83,12 @@
 
 /obj/item/reagent_containers/food/snacks/grown/whitebeet
 	seed = /obj/item/seeds/whitebeet
-	name = "white-beet"
-	desc = "You can't beat white-beet."
+	name = "white beet"
+	desc = "You can't beat white beet."
 	icon_state = "whitebeet"
 	filling_color = "#F4A460"
 	bitesize_mod = 2
+	tastes = list("white beet" = 1)
 	wine_power = 0.4
 
 // Red Beet
@@ -94,7 +97,7 @@
 	desc = "These seeds grow into red beet producing plants."
 	icon_state = "seed-redbeet"
 	species = "redbeet"
-	plantname = "Red-Beet Plants"
+	plantname = "Red Beet Plants"
 	product = /obj/item/reagent_containers/food/snacks/grown/redbeet
 	lifespan = 60
 	endurance = 50
@@ -109,5 +112,6 @@
 	name = "red beet"
 	desc = "You can't beat red beet."
 	icon_state = "redbeet"
+	tastes = list("red beet" = 1)
 	bitesize_mod = 2
 	wine_power = 0.6

code/modules/hydroponics/grown/tea_coffee.dm

@@ -21,6 +21,7 @@
 	name = "Tea Aspera tips"
 	desc = "These aromatic tips of the tea plant can be dried to make tea."
 	icon_state = "tea_aspera_leaves"
+	tastes = list("tea leaves" = 1)
 	filling_color = "#008000"
 	can_distill = FALSE
 
@@ -28,6 +29,7 @@
 /obj/item/seeds/tea/astra
 	name = "pack of tea astra seeds"
 	icon_state = "seed-teaastra"
+	desc = "These seeds grow into Tea Astra, a more potent variant of tea"
 	species = "teaastra"
 	plantname = "Tea Astra Plant"
 	product = /obj/item/reagent_containers/food/snacks/grown/tea/astra
@@ -38,7 +40,9 @@
 /obj/item/reagent_containers/food/snacks/grown/tea/astra
 	seed = /obj/item/seeds/tea/astra
 	name = "Tea Astra tips"
+	desc = "Knock away your fatigue!"
 	icon_state = "tea_astra_leaves"
+	tastes = list("tea leaves" = 1, "pure energy" = 1)
 	filling_color = "#4582B4"
 
 
@@ -67,6 +71,7 @@
 	desc = "Dry them out to make coffee."
 	icon_state = "coffee_arabica"
 	filling_color = "#DC143C"
+	tastes = list("coffee beans" = 1)
 	bitesize_mod = 2
 	distill_reagent = "kahlua"
 
@@ -86,4 +91,5 @@
 	seed = /obj/item/seeds/coffee/robusta
 	name = "coffee robusta beans"
 	desc = "Increases robustness by 37 percent!"
+	tastes = list("coffee beans" = 1, "robustness" = 1)
 	icon_state = "coffee_robusta"

code/modules/hydroponics/grown/tobacco.dm

@@ -20,6 +20,7 @@
 	name = "tobacco leaves"
 	desc = "Dry them out to make some smokes."
 	icon_state = "tobacco_leaves"
+	tastes = list("tobacco" = 1)
 	filling_color = "#008000"
 	distill_reagent = "creme_de_menthe" //Menthol, I guess.
 
@@ -40,5 +41,6 @@
 	name = "space tobacco leaves"
 	desc = "Dry them out to make some space-smokes."
 	icon_state = "stobacco_leaves"
+	tastes = list("space tobacco" = 1)
 	distill_reagent = null
 	wine_power = 0.5

code/modules/hydroponics/grown/tomato.dm

@@ -21,6 +21,7 @@
 	icon_state = "tomato"
 	splat_type = /obj/effect/decal/cleanable/tomato_smudge
 	filling_color = "#FF6347"
+	tastes = list("tomato" = 1)
 	bitesize_mod = 2
 	distill_reagent = "enzyme"
 
@@ -43,6 +44,7 @@
 	icon_state = "bloodtomato"
 	splat_type = /obj/effect/gibspawner/generic
 	filling_color = "#FF0000"
+	tastes = list("tomato" = 1, "blood" = 2)
 	origin_tech = "biotech=5"
 	distill_reagent = "bloodymary"
 
@@ -67,6 +69,7 @@
 	name = "blue-tomato"
 	desc = "I say blue-mah-to, you say blue-mae-to."
 	icon_state = "bluetomato"
+	tastes = list("bluemato" = 1)
 	splat_type = /obj/effect/decal/cleanable/blood/oil
 	filling_color = "#0000FF"
 
@@ -90,6 +93,7 @@
 	name = "bluespace tomato"
 	desc = "So lubricated, you might slip through space-time."
 	icon_state = "bluespacetomato"
+	tastes = list("bluemato" = 1, "taste bud dislocation" = 1)
 	origin_tech = "biotech=4;bluespace=5"
 	distill_reagent = null
 	wine_power = 0.8

code/modules/hydroponics/hydroitemdefines.dm

@@ -86,6 +86,7 @@
 	name = "hatchet"
 	desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
 	icon_state = "hatchet"
+	item_state = "hatchet"
 	flags = CONDUCT
 	force = 12
 	w_class = WEIGHT_CLASS_TINY
@@ -109,6 +110,12 @@
 	icon_state = "unathiknife"
 	attack_verb = list("ripped", "torn", "cut")
 
+/obj/item/hatchet/wooden
+	desc = "A crude axe blade upon a short wooden handle."
+	icon_state = "woodhatchet"
+	materials = null
+	flags = NONE
+
 /obj/item/scythe
 	icon_state = "scythe0"
 	name = "scythe"

code/modules/hydroponics/seeds.dm

@@ -160,15 +160,23 @@
 	return result
 
 
-/obj/item/seeds/proc/prepare_result(var/obj/item/reagent_containers/food/snacks/grown/T)
-	if(T.reagents)
-		for(var/reagent_id in reagents_add)
-			if(reagent_id == "blood") // Hack to make blood in plants always O-
-				T.reagents.add_reagent(reagent_id, 1 + round(potency * reagents_add[reagent_id], 1), list("blood_type"="O-"))
-				continue
+/obj/item/seeds/proc/prepare_result(obj/item/T)
+	if(!T.reagents)
+		CRASH("[T] has no reagents.")
 
-			T.reagents.add_reagent(reagent_id, 1 + round(potency * reagents_add[reagent_id]), 1)
-		return 1
+	for(var/rid in reagents_add)
+		var/amount = 1 + round(potency * reagents_add[rid], 1)
+
+		var/list/data = null
+		if(rid == "blood") // Hack to make blood in plants always O-
+			data = list("blood_type" = "O-")
+		if(rid == "nutriment" || rid == "vitamin" || rid == "protein" || rid == "plantmatter")
+			// apple tastes of apple.
+			if(istype(T, /obj/item/reagent_containers/food/snacks/grown))
+				var/obj/item/reagent_containers/food/snacks/grown/grown_edible = T
+				data = grown_edible.tastes.Copy()
+
+		T.reagents.add_reagent(rid, amount, data)
 
 
 /// Setters procs ///

code/modules/mining/equipment/kinetic_crusher.dm

@@ -209,7 +209,7 @@
 		if(istype(T, denied_type) || istype(src, T.denied_type))
 			to_chat(user, "<span class='warning'>You can't seem to attach [src] to [H]. Maybe remove a few trophies?</span>")
 			return FALSE
-	if(!user.drop_item())
+	if(!user.unEquip(src))
 		return
 	forceMove(H)
 	H.trophies += src

code/modules/mining/equipment/lazarus_injector.dm

@@ -73,9 +73,10 @@
 	icon = 'icons/obj/mobcap.dmi'
 	icon_state = "mobcap0"
 	w_class = WEIGHT_CLASS_TINY
-	throw_range = 20
+	throw_range = 7
 	var/mob/living/simple_animal/captured = null
 	var/colorindex = 0
+	var/capture_type = SENTIENCE_ORGANIC //So you can't capture boss monsters or robots with it
 
 /obj/item/mobcapsule/Destroy()
 	if(captured)
@@ -83,26 +84,25 @@
 		QDEL_NULL(captured)
 	return ..()
 
-/obj/item/mobcapsule/attack(var/atom/A, mob/user, prox_flag)
-	if(!istype(A, /mob/living/simple_animal) || isbot(A))
-		return ..()
-	capture(A, user)
-	return 1
+/obj/item/mobcapsule/attack(mob/living/simple_animal/S, mob/user, prox_flag)
+	if(istype(S) && S.sentience_type == capture_type)
+		capture(S, user)
+		return TRUE
+	return ..()
 
-/obj/item/mobcapsule/proc/capture(var/mob/target, var/mob/U as mob)
-	var/mob/living/simple_animal/T = target
+/obj/item/mobcapsule/proc/capture(mob/living/simple_animal/S, mob/living/M)
 	if(captured)
-		to_chat(U, "<span class='notice'>Capture failed!</span>: The capsule already has a mob registered to it!")
+		to_chat(M, "<span class='notice'>Capture failed!</span>: The capsule already has a mob registered to it!")
 	else
-		if(istype(T) && "neutral" in T.faction)
-			T.forceMove(src)
-			T.name = "[U.name]'s [initial(T.name)]"
-			T.cancel_camera()
-			name = "Lazarus Capsule: [initial(T.name)]"
-			to_chat(U, "<span class='notice'>You placed a [T.name] inside the Lazarus Capsule!</span>")
-			captured = T
+		if("neutral" in S.faction)
+			S.forceMove(src)
+			S.name = "[M.name]'s [initial(S.name)]"
+			S.cancel_camera()
+			name = "Lazarus Capsule: [initial(S.name)]"
+			to_chat(M, "<span class='notice'>You placed a [S.name] inside the Lazarus Capsule!</span>")
+			captured = S
 		else
-			to_chat(U, "You can't capture that mob!")
+			to_chat(M, "You can't capture that mob!")
 
 /obj/item/mobcapsule/throw_impact(atom/A, mob/user)
 	..()

code/modules/mining/equipment/survival_pod.dm

@@ -77,6 +77,7 @@
 	dir = FULLTILE_WINDOW_DIR
 	max_integrity = 100
 	fulltile = TRUE
+	flags = PREVENT_CLICK_UNDER
 	reinf = TRUE
 	heat_resistance = 1600
 	armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100)
@@ -296,7 +297,7 @@
 	name = "air flow blocker"
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF
 	unacidable = TRUE
-	invisibility = INVISIBILITY_ABSTRACT	
+	invisibility = INVISIBILITY_ABSTRACT
 
 //Signs
 /obj/structure/sign/mining

code/modules/mining/lavaland/loot/colossus_loot.dm

@@ -380,7 +380,7 @@
 	medsensor.add_hud_to(src)
 
 /mob/living/simple_animal/hostile/lightgeist/AttackingTarget()
-	..()
+	. = ..()
 	if(isliving(target) && target != src)
 		var/mob/living/L = target
 		if(L.stat < DEAD)

code/modules/mining/lavaland/loot/tendril_loot.dm

@@ -77,6 +77,21 @@
 
 			add_fingerprint(M)
 
+//Book of Babel
+
+/obj/item/book_of_babel
+	name = "Book of Babel"
+	desc = "An ancient tome written in countless tongues."
+	icon = 'icons/obj/library.dmi'
+	icon_state = "book1"
+	w_class = 2
+
+/obj/item/book_of_babel/attack_self(mob/user)
+	to_chat(user, "You flip through the pages of the book, quickly and conveniently learning every language in existence. Somewhat less conveniently, the aging book crumbles to dust in the process. Whoops.")
+	user.grant_all_languages()
+	new /obj/effect/decal/cleanable/ash(get_turf(user))
+	qdel(src)
+
 //Potion of Flight: as we do not have the "Angel" species this currently does not work.
 
 /obj/item/reagent_containers/glass/bottle/potion
@@ -117,6 +132,30 @@
 		H.emote("scream")
 	..()*/
 
+/obj/item/jacobs_ladder
+	name = "jacob's ladder"
+	desc = "A celestial ladder that violates the laws of physics."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "ladder00"
+
+/obj/item/jacobs_ladder/attack_self(mob/user)
+	var/turf/T = get_turf(src)
+	var/ladder_x = T.x
+	var/ladder_y = T.y
+	to_chat(user, "<span class='notice'>You unfold the ladder. It extends much farther than you were expecting.</span>")
+	var/last_ladder = null
+	for(var/i in 1 to world.maxz)
+		if(is_admin_level(i) || is_away_level(i))
+			continue
+		var/turf/T2 = locate(ladder_x, ladder_y, i)
+		last_ladder = new /obj/structure/ladder/unbreakable/jacob(T2, null, last_ladder)
+	qdel(src)
+
+// Inherit from unbreakable but don't set ID, to suppress the default Z linkage
+/obj/structure/ladder/unbreakable/jacob
+	name = "jacob's ladder"
+	desc = "An indestructible celestial ladder that violates the laws of physics."
+
 //Boat
 
 /obj/vehicle/lavaboat

code/modules/mining/lavaland/necropolis_chests.dm

@@ -18,7 +18,7 @@
 	if(!add_loot)
 		return
 
-	var/loot = rand(1,25)
+	var/loot = rand(1, 26)
 	switch(loot)
 		if(1)
 			new /obj/item/shared_storage/red(src)
@@ -48,7 +48,7 @@
 		if(11)
 			new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/berserker(src)
 		if(12)
-			new /obj/item/sord(src)
+			new /obj/item/jacobs_ladder(src)
 		if(13)
 			new /obj/item/nullrod/scythe/talking(src)
 		if(14)
@@ -78,6 +78,8 @@
 		if(24)
 			new /obj/item/spellbook/oneuse/summonitem(src)
 		if(25)
+			new /obj/item/book_of_babel(src)
+		if(26)
 			new /obj/item/borg/upgrade/modkit/lifesteal(src)
 			new /obj/item/bedsheet/cult(src)
 

code/modules/mining/machine_vending.dm

@@ -37,7 +37,7 @@
 		new /datum/data/mining_equipment("Lazarus Injector",			/obj/item/lazarus_injector,											1000),
 		new /datum/data/mining_equipment("Silver Pickaxe",				/obj/item/pickaxe/silver,											1000),
 		new /datum/data/mining_equipment("Mining Conscription Kit",		/obj/item/storage/backpack/duffel/mining_conscript,					1500),
-		new /datum/data/mining_equipment("Jetpack",             		/obj/item/tank/jetpack/carbondioxide/mining,               			2000),
+		new /datum/data/mining_equipment("Jetpack Upgrade",				/obj/item/tank/jetpack/suit,										2000),
 		new /datum/data/mining_equipment("Mining Hardsuit",				/obj/item/clothing/suit/space/hardsuit/mining,						2000),
 		new /datum/data/mining_equipment("Diamond Pickaxe",				/obj/item/pickaxe/diamond,											2000),
 		new /datum/data/mining_equipment("Super Resonator",				/obj/item/resonator/upgraded,										2500),