Merge branch 'master' into upstream-merge-31737

2017-10-28 02:20:25 -04:00
parent 79d6f42dfd f0ae396a65
commit 0e553b26db
291 changed files with 204450 additions and 223168 deletions
@@ -67,6 +67,7 @@
 		C.activate(usr, saved_appearance, src)
 		to_chat(usr, "<span class='notice'>You activate \the [src].</span>")
 		new /obj/effect/temp_visual/emp/pulse(get_turf(src))
+	usr.cancel_camera()

 /obj/item/device/chameleon/proc/disrupt(delete_dummy = 1)
 	if(active_dummy)