Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

code/game/objects/structures/crates_lockers/closets.dm

@@ -320,7 +320,7 @@
 		return
 	step_towards(O, src.loc)
 	if(user != O)
-		user.show_viewers("<span class='danger'>[user] stuffs [O] into [src]!</span>")
+		user.visible_message("<span class='danger'>[user] stuffs [O] into [src]!</span>", "<span class='danger'>You stuff [O] into [src]!</span>")
 	src.add_fingerprint(user)
 
 /obj/structure/closet/attack_ai(mob/user)

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -58,6 +58,7 @@
 		return
 	if(src.allowed(user))
 		src.locked = !src.locked
+		playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
 		for(var/mob/O in viewers(user, 3))
 			if((O.client && !( O.blinded )))
 				to_chat(O, "<span class='notice'>The locker has been [locked ? null : "un"]locked by [user].</span>")
@@ -172,4 +173,4 @@
 			if(istype(src.loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
 				var/obj/structure/bigDelivery/BD = src.loc
 				BD.attack_hand(usr)
-			open()
+			open()

code/game/objects/structures/mirror.dm

@@ -17,6 +17,7 @@
 		if(!AC)
 			AC = new(src, user)
 			AC.name = "SalonPro Nano-Mirror™"
+			AC.flags = APPEARANCE_ALL_BODY
 			ui_users[user] = AC
 		AC.ui_interact(user)