diff --git a/GainStation13/code/datums/traits.dm b/GainStation13/code/datums/traits.dm
index 87ee915516..16235aac18 100644
--- a/GainStation13/code/datums/traits.dm
+++ b/GainStation13/code/datums/traits.dm
@@ -126,25 +126,6 @@
 	value = 0
 	medical_record_text = "Patient cares little with or dislikes being touched."
 
-/datum/quirk/universal_diet
-	name = "Universal diet"
-	desc = "You are fine with eating just about anything normally edible, you have no strong dislikes in food. Toxic food will still hurt you, though."
-	value = 0
-	gain_text = "<span class='notice'>You feel like you can eat any food type.</span>"
-	lose_text = "<span class='notice'>You start to dislike certain food types again.</span>"
-	medical_record_text = "Patient reports no strong dietary dislikes."
-
-/datum/quirk/universal_diet/add()
-	var/mob/living/carbon/human/H = quirk_holder
-	var/datum/species/species = H.dna.species
-	species.disliked_food = null
-
-/datum/quirk/universal_diet/remove()
-	var/mob/living/carbon/human/H = quirk_holder
-	if(H)
-		var/datum/species/species = H.dna.species
-		species.disliked_food = initial(species.disliked_food)
-
 /datum/quirk/fatness_liker //GS13
 	name = "Fat Affinity"
 	desc = "You like being fat, alot, maybe even a little bit too much. Being fat gives you a bigger mood boost."
diff --git a/GainStation13/code/modules/research/designs/autolathe.dm b/GainStation13/code/modules/research/designs/autolathe.dm
index dddaf1b041..2ee2cd4dba 100644
--- a/GainStation13/code/modules/research/designs/autolathe.dm
+++ b/GainStation13/code/modules/research/designs/autolathe.dm
@@ -5,3 +5,43 @@
 	materials = list(/datum/material/iron = 1000, /datum/material/glass = 500)
 	build_path = /obj/item/assembly/infra/fat
 	category = list("initial", "Misc")
+
+/datum/design/small_cup
+	name = "Small Gulp Cup"
+	id = "Small_Gulp"
+	build_type = AUTOLATHE
+	materials = list(/datum/material/plastic=200)
+	build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/small
+	category = list("initial","Dinnerware")
+
+/datum/design/medium_cup
+	name = "Medium Gulp Cup"
+	id = "Medium_Gulp"
+	build_type = AUTOLATHE
+	materials = list(/datum/material/plastic=300)
+	build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/medium
+	category = list("initial","Dinnerware")
+
+/datum/design/small_cup
+	name = "Big Gulp Cup"
+	id = "Big_Gulp"
+	build_type = AUTOLATHE
+	materials = list(/datum/material/plastic=500)
+	build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/big
+	category = list("initial","Dinnerware")
+
+/datum/design/extra_big_cup
+	name = "Extra Big Gulp Cup"
+	id = "Extra_Big_Gulp"
+	build_type = AUTOLATHE
+	materials = list(/datum/material/plastic=600)
+	build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big
+	category = list("initial","Dinnerware")
+
+/datum/design/super_extra_big_cup
+	name = "Super Extra Big Gulp Cup"
+	id = "Super_Extra_Big_Gulp"
+	build_type = AUTOLATHE
+	materials = list(/datum/material/plastic=1000)
+	build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big
+	category = list("initial","Dinnerware")
diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm
index 4dfc65946b..b715bd4df2 100644
--- a/code/datums/looping_sounds/machinery_sounds.dm
+++ b/code/datums/looping_sounds/machinery_sounds.dm
@@ -65,6 +65,13 @@
 	volume = 50
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/*
+/datum/looping_sound/deep_fryer
+	mid_length = 2
+	mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
+	volume = 30
+*/
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /datum/looping_sound/microwave
 	start_sound = 'sound/machines/microwave/microwave-start.ogg'
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 78c4789e68..e91504d806 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -410,6 +410,7 @@
 	if(isbrain(mob_occupant))
 		dna = B.stored_dna
 
+	//GS13 Port - DNC
 	if(HAS_TRAIT(mob_occupant, TRAIT_NEVER_CLONE))
 		scantemp = "Subject has an active DNC record on file. Unable to clone."
 		playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 0f1f307242..936f8182a6 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -299,6 +299,7 @@
 			S = dna.species
 			if(ishuman(src))
 				var/mob/living/carbon/human/H = src
+				//GS13 Port - Headpat slut stuff
 				if(HAS_TRAIT(H, TRAIT_DISTANT)) //No mood buff since you're not really liking it.
 					M.visible_message("<span class='notice'>[M] gives [H] a pat on the head to make [p_them()] feel better! They seem annoyed...</span>", \
 						"<span class='warning'>You give [H] a pat on the head to make [p_them()] feel better! They seem annoyed as they're now glaring towards you...</span>")
diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
index ed598fbee7..fbfd626ae7 100644
--- a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
+++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
@@ -77,47 +77,6 @@
 	build_path = /obj/item/reagent_containers/food/drinks/shaker
 	category = list("initial","Dinnerware")
 
-//GS13 Port - Add gulp cups
-/datum/design/small_cup
-	name = "Small Gulp Cup"
-	id = "Small_Gulp"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/plastic=200)
-	build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/small
-	category = list("initial","Dinnerware")
-
-/datum/design/medium_cup
-	name = "Medium Gulp Cup"
-	id = "Medium_Gulp"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/plastic=300)
-	build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/medium
-	category = list("initial","Dinnerware")
-
-/datum/design/small_cup
-	name = "Big Gulp Cup"
-	id = "Big_Gulp"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/plastic=500)
-	build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/big
-	category = list("initial","Dinnerware")
-
-/datum/design/extra_big_cup
-	name = "Extra Big Gulp Cup"
-	id = "Extra_Big_Gulp"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/plastic=600)
-	build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big
-	category = list("initial","Dinnerware")
-
-/datum/design/super_extra_big_cup
-	name = "Super Extra Big Gulp Cup"
-	id = "Super_Extra_Big_Gulp"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/plastic=1000)
-	build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big
-	category = list("initial","Dinnerware")
-
 ////////////
 ///Medical//
 ////////////