diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
index 7cf0f019782..69ead620726 100644
--- a/code/game/objects/structures/shower.dm
+++ b/code/game/objects/structures/shower.dm
@@ -105,7 +105,7 @@
 		wash_obj(A)
 	else if(isturf(A))
 		wash_turf(A)
-	else if(ismob(A))
+	else if(isliving(A))
 		wash_mob(A)
 		check_heat(A)
 
@@ -219,12 +219,12 @@
 	if(current_temperature == SHOWER_FREEZING)
 		if(iscarbon(L))
 			C.adjust_bodytemperature(-80, 80)
-		to_chat(L, "<span class='warning'>The shower is freezing!</span>")
+		to_chat(L, "<span class='warning'>[src] is freezing!</span>")
 	else if(current_temperature == SHOWER_BOILING)
 		if(iscarbon(L))
 			C.adjust_bodytemperature(35, 0, 500)
 		L.adjustFireLoss(5)
-		to_chat(L, "<span class='danger'>The shower is searing!</span>")
+		to_chat(L, "<span class='danger'>[src] is searing!</span>")
 
 /obj/machinery/shower/proc/check_clothes(mob/living/carbon/human/H)
 	if(H.wear_suit && (H.wear_suit.clothing_flags & SHOWEROKAY))