Merge pull request #5880 from Whitellama/master

Fixes #5870 (glasses being named inconsistently) and unreported issue of wet rags making glass-hit noises when you wash down a window

code/game/objects/structures/window.dm

@@ -161,6 +161,7 @@
 
 /obj/structure/window/attackby(obj/item/W as obj, mob/user as mob)
 	if(!istype(W)) return//I really wish I did not need this
+	if(W.flags & NOBLUDGEON) return
 
 	if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
 		var/obj/item/weapon/grab/G = W

code/modules/detectivework/footprints_and_rag.dm

@@ -23,6 +23,7 @@
 	possible_transfer_amounts = list(5)
 	volume = 5
 	can_be_placed_into = null
+	flags = FPRINT | TABLEPASS | OPENCONTAINER | NOBLUDGEON
 
 /obj/item/weapon/reagent_containers/glass/rag/attack_self(mob/user as mob)
 	return

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -605,8 +605,8 @@
 					center_of_mass = list("x"=16, "y"=10)
 		else
 			icon_state = "glass_empty"
-			name = "Drinking glass"
-			desc = "Your standard drinking glass"
+			name = "glass"
+			desc = "Your standard drinking glass."
 			center_of_mass = list("x"=16, "y"=10)
 			return