diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm
index 3ff6f740e69..1ee6434f09a 100644
--- a/code/modules/mob/living/carbon/human/human_mob.dm
+++ b/code/modules/mob/living/carbon/human/human_mob.dm
@@ -2264,6 +2264,8 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
 					analysis += "<span class='info'>You conclude [src]'s [E.name] is broken.</span>"
 				else
 					analysis += "<span class='info'>You conclude [src]'s [E.name] has a [E.broken_description].</span>"
+		if(!length(analysis))
+			analysis += "<span class='info'>[src] appears to be in perfect health.</span>"
 		to_chat(user, chat_box_healthscan(analysis.Join("<br>")))
 
 /mob/living/carbon/human/pointed(atom/A as mob|obj|turf in view())
@@ -2274,8 +2276,15 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
 
 	if(istype(A, /obj/effect/temp_visual/point) || istype(A, /atom/movable/emissive_blocker))
 		return FALSE
-	if(mind && HAS_TRAIT(mind, TRAIT_COFFEE_SNOB) && reagents.has_reagent("coffee"))
-		changeNext_move(CLICK_CD_POINT / 3)
+	if(mind && HAS_MIND_TRAIT(src, TRAIT_COFFEE_SNOB))
+		var/found_coffee = FALSE
+		for(var/reagent in reagents.reagent_list)
+			if(istype(reagent, /datum/reagent/consumable/drink/coffee))
+				found_coffee = TRUE
+		if(found_coffee)
+			changeNext_move(CLICK_CD_POINT / 3)
+		else
+			changeNext_move(CLICK_CD_POINT)
 	else
 		changeNext_move(CLICK_CD_POINT)
 
diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm
index 31b37b1cb5d..a0eb9055242 100644
--- a/code/modules/mob/living/silicon/robot/robot_mob.dm
+++ b/code/modules/mob/living/silicon/robot/robot_mob.dm
@@ -936,6 +936,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 			return ITEM_INTERACT_COMPLETE
 		playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
 		being_charged = TRUE
+		to_chat(src, "<span class='notice'>[user] begins to manually charge your internal cell.</span>")
 		while(do_after(user, 0.5 SECONDS, target = src))
 			var/cell_difference = cell.maxcharge - cell.charge
 			if(donor.charge >= 500 && cell_difference >= 500)
diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
index 15ef7da805a..51de206ac26 100644
--- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
@@ -372,6 +372,17 @@
 	drink_desc = "The perfect blend of coffee, milk, and chocolate."
 	taste_description = "chocolatey coffee"
 
+/datum/reagent/consumable/drink/coffee/cafe_latte/pumpkin_latte
+	name = "Pumpkin Latte"
+	id = "pumpkin_latte"
+	description = "A mix of pumpkin juice and coffee."
+	color = "#F4A460"
+	nutriment_factor = 3 * REAGENTS_METABOLISM
+	drink_icon = "pumpkin_latte"
+	drink_name = "Pumpkin Latte"
+	drink_desc = "A mix of coffee and pumpkin juice."
+	taste_description = "overpriced hipster spices"
+
 /datum/reagent/consumable/drink/tea
 	name = "Tea"
 	id = "tea"
@@ -489,17 +500,6 @@
 	drink_desc = "An exotic blue milkshake."
 	taste_description = "blues"
 
-/datum/reagent/consumable/drink/pumpkin_latte
-	name = "Pumpkin Latte"
-	id = "pumpkin_latte"
-	description = "A mix of pumpkin juice and coffee."
-	color = "#F4A460"
-	nutriment_factor = 3 * REAGENTS_METABOLISM
-	drink_icon = "pumpkin_latte"
-	drink_name = "Pumpkin Latte"
-	drink_desc = "A mix of coffee and pumpkin juice."
-	taste_description = "overpriced hipster spices"
-
 /datum/reagent/consumable/drink/gibbfloats
 	name = "Gibb Floats"
 	id = "gibbfloats"