Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00
parent e66cbfd7db 55dd3876e5
commit 52fa1f314f
531 changed files with 5863 additions and 3439 deletions
@@ -55,7 +55,7 @@
 	current_beam = new(user,current_target,time=6000,beam_icon_state="medbeam",btype=/obj/effect/ebeam/medical)
 	INVOKE_ASYNC(current_beam, /datum/beam.proc/Start)

-	feedback_add_details("gun_fired","[src.type]")
+	SSblackbox.add_details("gun_fired","[src.type]")

 /obj/item/weapon/gun/medbeam/process()