Merge branch 'master' of git://github.com/tgstation/tgstation

code/game/objects/structures/mirror.dm

@@ -41,6 +41,8 @@
 		var/new_style = input(user, "Select a hairstyle", "Grooming")  as null|anything in GLOB.hairstyles_list
 		if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 			return	//no tele-grooming
+		if(HAS_TRAIT(H, TRAIT_BALD))
+			to_chat(H, "<span class='notice'>If only growing back hair were that easy for you...</span>")
 		if(new_style)
 			H.hairstyle = new_style
 

code/game/objects/structures/reflector.dm

@@ -105,7 +105,7 @@
 								"<span class='hear'>You hear welding.</span>")
 			if(W.use_tool(src, user, 40, volume=40))
 				obj_integrity = max_integrity
-				user.visible_message("<span class='notice'>[user] has repaired [src].</span>", \
+				user.visible_message("<span class='notice'>[user] repairs [src].</span>", \
 									"<span class='notice'>You finish repairing [src].</span>")
 
 		else if(!anchored)

code/game/objects/structures/tables_racks.dm

@@ -512,7 +512,7 @@
 /obj/structure/table/optable/tablepush(mob/living/user, mob/living/pushed_mob)
 	pushed_mob.forceMove(loc)
 	pushed_mob.set_resting(TRUE, TRUE)
-	visible_message("<span class='notice'>[user] has laid [pushed_mob] on [src].</span>")
+	visible_message("<span class='notice'>[user] lays [pushed_mob] on [src].</span>")
 	check_patient()
 
 /obj/structure/table/optable/proc/check_patient()