Merge pull request #6656 from Amunak/countable-lists

Prettifies closet contents list with (newly added) countable variant of english_list

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

@@ -58,7 +58,7 @@
 	update_icon()
 
 /obj/structure/closet/examine(mob/user)
-	if(..(user, 1) && !opened)
+	if(!src.opened && (..(user, 1) || isobserver(user)))
 		var/content_size = 0
 		for(var/obj/item/I in src.contents)
 			if(!I.anchored)
@@ -74,6 +74,9 @@
 		else
 			to_chat(user, "It is full.")
 
+	if(!src.opened && isobserver(user))
+		to_chat(user, "It contains: [counting_english_list(contents)]")
+
 /obj/structure/closet/CanPass(atom/movable/mover, turf/target)
 	if(wall_mounted)
 		return TRUE
@@ -360,12 +363,6 @@
 	if(!src.toggle())
 		to_chat(usr, "<span class='notice'>It won't budge!</span>")
 
-/obj/structure/closet/attack_ghost(mob/ghost)
-	if(ghost.client && ghost.client.inquisitive_ghost)
-		ghost.examinate(src)
-		if (!src.opened)
-			to_chat(ghost, "It contains: [english_list(contents)].")
-
 /obj/structure/closet/verb/verb_toggleopen()
 	set src in oview(1)
 	set category = "Object"
@@ -474,4 +471,4 @@
 		return
 	dump_contents()
 	spawn(1) qdel(src)
-	return 1
+	return 1