diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm
index f1cd181fc4f..34c42f24bb7 100644
--- a/code/game/objects/window.dm
+++ b/code/game/objects/window.dm
@@ -100,7 +100,14 @@
 		if(reinf) new /obj/item/stack/rods( src.loc)
 		src.density = 0
 		del(src)
-	return
+		return
+	else
+		playsound(src.loc, 'Glassknock.ogg', 80, 1)
+		usr.visible_message("[usr.name] knocks on the [src.name].", \
+							"You knock on the [src.name].", \
+							"You hear a knocking sound.")
+		return
+
 
 /obj/structure/window/attack_paw()
 	if ((usr.mutations & HULK))
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 5e0e3b818dc..f3a6f807225 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -105,7 +105,7 @@
 
 						log_attack("<font color='red'>[usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit.</font>")
 						log_admin("ATTACK: [usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit.")
-						message_admins("ATTACK: [usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit.")
+		//				message_admins("ATTACK: [usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit.")
 
 						C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
 					del(G)
@@ -151,7 +151,7 @@
 
 				log_attack("<font color='red'>[user] ([user.ckey]) climbed into a disposals unit.</font>")
 				log_admin("ATTACK: [user] ([user.ckey]) climbed into in a disposals unit.")
-				message_admins("ATTACK: [user] ([user.ckey]) climbed into in a disposals unit.")
+				//message_admins("ATTACK: [user] ([user.ckey]) climbed into in a disposals unit.")
 
 				msg = "[user.name] climbs into the [src]."
 				user << "You climb into the [src]."
@@ -159,7 +159,7 @@
 
 				log_attack("<font color='red'>[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.</font>")
 				log_admin("ATTACK: [user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.")
-				message_admins("ATTACK: [user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.")
+				//message_admins("ATTACK: [user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.")
 
 				msg = "[user.name] stuffs [target.name] into the [src]!"
 				user << "You stuff [target.name] into the [src]!"
diff --git a/sound/effects/glassknock.ogg b/sound/effects/glassknock.ogg
new file mode 100644
index 00000000000..efdb198fd39
Binary files /dev/null and b/sound/effects/glassknock.ogg differ