diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index d4ee72861bc..caf50cffa99 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -1260,7 +1260,7 @@
 	product_ads = "House-training costs extra!;Now with 1000% more cat hair!;Allergies are a sign of weakness!;Dogs are man's best friend. Remember that Vulpkanin!; Heat lamps for Unathi!; Vox-y want a cracker?"
 	vend_delay = 15
 	icon_state = "crittercare"
-	products = list(/obj/item/clothing/accessory/petcollar = 5, /obj/item/weapon/storage/aquatic_kit =5, /obj/item/fish_eggs/goldfish = 5,
+	products = list(/obj/item/clothing/accessory/petcollar = 5, /obj/item/weapon/storage/aquatic_kit/full =5, /obj/item/fish_eggs/goldfish = 5,
 					/obj/item/fish_eggs/clownfish = 5, /obj/item/fish_eggs/shark = 5, /obj/item/fish_eggs/feederfish = 10,
 					/obj/item/fish_eggs/salmon = 5, /obj/item/fish_eggs/catfish = 5, /obj/item/fish_eggs/glofish = 5,
 					/obj/item/fish_eggs/electric_eel = 5, /obj/item/fish_eggs/shrimp = 10, /obj/item/toy/pet_rock = 5,
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 5ca60bea7f0..eaf73f5cd61 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -53,6 +53,7 @@
 	vision_flags = SEE_TURFS
 	prescription_upgradable = 1
 	species_fit = list("Vox")
+	see_darkness = 0 //don't render darkness while wearing mesons
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/eyes.dmi'
 		)
@@ -63,7 +64,6 @@
 	icon_state = "nvgmeson"
 	item_state = "glasses"
 	darkness_view = 8
-	see_darkness = 0
 	prescription_upgradable = 0
 
 /obj/item/clothing/glasses/meson/prescription
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index eec69c7b0ef..73cd5eff306 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -45,6 +45,12 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal
 
+/datum/recipe/microwave/donut/sprinkles
+	reagents = list("sugar" = 5, "sprinkles" = 3)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/dough
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/donut/sprinkles
 
 /datum/recipe/microwave/human/burger
 	items = list(
@@ -667,7 +673,7 @@ datum/recipe/microwave/slimesandwich
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/fries
 
-/datum/recipe/microwave/mint
+/datum/recipe/microwave/mint_2
 	reagents = list("sugar" = 5, "frostoil" = 5)
 	result = /obj/item/weapon/reagent_containers/food/snacks/mint
 
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index e1f7057288e..72b36a8f9d1 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -14,13 +14,6 @@ mob/living
 		qdel(food)
 	return ..()
 
-/mob/living/carbon/Life()
-	..()
-
-	// Increase germ_level regularly
-	if(germ_level < GERM_LEVEL_AMBIENT && prob(30))	//if you're just standing there, you shouldn't get more germs beyond an ambient level
-		germ_level++
-
 /mob/living/carbon/blob_act()
 	if (stat == DEAD)
 		return
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 56d63785db1..b5c3ea39400 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -376,18 +376,25 @@
 	else
 		H.sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
 
+		H.see_in_dark = darksight //set their variables to default, modify them later
+		H.see_invisible = SEE_INVISIBLE_LIVING
+
 		if(H.mind && H.mind.vampire)
 			if(VAMP_VISION in H.mind.vampire.powers && !(VAMP_FULL in H.mind.vampire.powers))
 				H.sight |= SEE_MOBS
+
 			else if(VAMP_FULL in H.mind.vampire.powers)
 				H.sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
 				H.see_in_dark = 8
-				if(!H.druggy)		H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+				H.see_invisible = SEE_INVISIBLE_MINIMUM
+
 
 		if(XRAY in H.mutations)
 			H.sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
 			H.see_in_dark = 8
-			if(!H.druggy)		H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+
+			H.see_invisible = SEE_INVISIBLE_MINIMUM
+
 
 		if(H.seer == 1)
 			var/obj/effect/rune/R = locate() in H.loc
@@ -397,11 +404,7 @@
 				H.see_invisible = SEE_INVISIBLE_LIVING
 				H.seer = 0
 
-		else if(!H.seer)
-			H.see_in_dark = darksight
-			H.see_invisible = SEE_INVISIBLE_LIVING
-
-		//	This checks how much the mob's eyewear impairs their vision
+		//This checks how much the mob's eyewear impairs their vision
 		if(H.tinttotal >= TINT_IMPAIR)
 			if(tinted_weldhelh)
 				if(H.tinttotal >= TINT_BLIND)
@@ -413,7 +416,9 @@
 			if(istype(H.glasses, /obj/item/clothing/glasses))
 				var/obj/item/clothing/glasses/G = H.glasses
 				H.sight |= G.vision_flags
-				H.see_in_dark = G.darkness_view
+
+				if(G.darkness_view)
+					H.see_in_dark = G.darkness_view
 
 				if(!G.see_darkness)
 					H.see_invisible = SEE_INVISIBLE_MINIMUM
@@ -442,6 +447,14 @@
 					if(ANTAGHUD)
 						process_antag_hud(H)
 
+
+		if(H.vision_type)
+			H.see_in_dark = max(H.see_in_dark, H.vision_type.see_in_dark, darksight)
+			H.see_invisible = H.vision_type.see_invisible
+			if(H.vision_type.light_sensitive)
+				H.weakeyes = 1
+			H.sight |= H.vision_type.sight_flags
+
 		if(H.see_override)	//Override all
 			H.see_invisible = H.see_override
 
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 16dec650e43..2761f9b1b07 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -13,6 +13,10 @@
 
 	handle_wetness()
 
+	// Increase germ_level regularly
+	if(germ_level < GERM_LEVEL_AMBIENT && prob(30))	//if you're just standing there, you shouldn't get more germs beyond an ambient level
+		germ_level++
+
 
 ///////////////
 // BREATHING //
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 097dc03e6e1..ceaf2fdc99f 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -448,6 +448,14 @@
 			src.name = "frosted donut"
 			reagents.add_reagent("sprinkles", 2)
 
+/obj/item/weapon/reagent_containers/food/snacks/donut/sprinkles
+	name = "frosted donut"
+	icon_state = "donut2"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 3)
+		reagents.add_reagent("sprinkles", 3)
+
 /obj/item/weapon/reagent_containers/food/snacks/donut/chaos
 	name = "Chaos Donut"
 	desc = "Like life, it never quite tastes the same."