Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

[MIRROR] Unorphans the blackbox
This commit is contained in:
LetterJay
2017-05-02 05:13:49 -05:00
committed by GitHub
131 changed files with 2226 additions and 589 deletions
+1 -1
View File
@@ -265,7 +265,7 @@
if(user)
user.update_inv_hands()
feedback_add_details("gun_fired","[src.type]")
SSblackbox.add_details("gun_fired","[src.type]")
return 1
/obj/item/weapon/gun/attack(mob/M as mob, mob/user)
+1 -1
View File
@@ -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()