Merge branch 'master' into upstream-merge-32183

This commit is contained in:
LetterJay
2017-11-12 23:09:55 -06:00
committed by GitHub
689 changed files with 16817 additions and 22502 deletions
+1 -1
View File
@@ -398,7 +398,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if(flashwindow)
window_flash(O.client)
if(source)
var/obj/screen/alert/notify_action/A = O.throw_alert("\ref[source]_notify_action", /obj/screen/alert/notify_action)
var/obj/screen/alert/notify_action/A = O.throw_alert("[REF(source)]_notify_action", /obj/screen/alert/notify_action)
if(A)
if(O.client.prefs && O.client.prefs.UI_style)
A.icon = ui_style2icon(O.client.prefs.UI_style)