Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

code/game/objects/structures/mirror.dm

@@ -1,7 +1,7 @@
 //wip wip wup
 /obj/structure/mirror
-	name = "mirror"
-	desc = "Mirror mirror on the wall, who's the most robust of them all?"
+	name = "SalonPro Nano-Mirror(TM)"
+	desc = "The leading technology in hair salon products, utilizing nano-machinery to style your hair just right."
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "mirror"
 	density = 0

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -78,7 +78,7 @@
 
 /obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
 	if (prob(5) && istype(M,/mob/living))
-		user.visible_message("\red [user] breaks [src] over [M]'s back!.")
+		user.visible_message("\red [user] breaks [src] over [M]'s back!")
 		user.u_equip(src)
 		var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
 		m.loc = get_turf(src)