Merge branch 'master' of git://github.com/Baystation12/Baystation12

Conflicts:
	code/game/vote.dm

Because I did it derpily.

code/game/mecha/equipment/weapons/weapons.dm

@@ -125,7 +125,8 @@
 				if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
 					continue
 			M << "<font color='red' size='7'>HONK</font>"
-			M.sleeping = 0
+			if(!M.sleeping_willingly)
+				M.sleeping = 0
 			M.stuttering += 20
 			M.ear_deaf += 30
 			M.weakened = 3