Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188

[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
parent eeaa90a897 889defd2ce
commit eba36e48f9
107 changed files with 1337 additions and 875 deletions
@@ -278,7 +278,7 @@

 	if(user)
 		user.update_inv_hands()
-	SSblackbox.add_details("gun_fired","[src.type]")
+	SSblackbox.record_feedback("tally", "gun_fired", 1, type)
 	return TRUE

 /obj/item/gun/proc/reset_semicd()
@@ -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)

-	SSblackbox.add_details("gun_fired","[src.type]")
+	SSblackbox.record_feedback("tally", "gun_fired", 1, type)

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