Merge pull request #3975 from Citadel-Station-13/upstream-merge-32783

[MIRROR] Prevents proximity sensors from beeping when unarmed.
2017-11-17 02:06:31 +00:00
parent 1f9064d78d 140b54237a
commit 8fcf4dde02
1 changed files with 1 additions and 1 deletions
@@ -53,7 +53,7 @@


 /obj/item/device/assembly/prox_sensor/sense()
-	if(!secured || next_activate > world.time)
+	if(!scanning || !secured || next_activate > world.time)
 		return 0
 	pulse(0)
 	audible_message("[icon2html(src, hearers(src))] *beep* *beep*", null, 3)