mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13.git
synced 2026-08-21 21:07:05 +01:00
Fix
This commit is contained in:
@@ -307,14 +307,14 @@
|
||||
* The message that the program wishes to display.
|
||||
*/
|
||||
|
||||
/obj/item/modular_computer/proc/alert_call(datum/computer_file/program/, alerttext, sound = 'sound/machines/twobeep_high.ogg')
|
||||
if(! || !.alert_able || .alert_silenced || !alerttext) //Yeah, we're checking alert_able. No, you don't get to make alerts that the user can't silence.
|
||||
/obj/item/modular_computer/proc/alert_call(datum/computer_file/program/caller1, alerttext, sound = 'sound/machines/twobeep_high.ogg')
|
||||
if(!caller || !caller1.alert_able || caller1.alert_silenced || !alerttext) //Yeah, we're checking alert_able. No, you don't get to make alerts that the user can't silence.
|
||||
return
|
||||
playsound(src, sound, 50, TRUE)
|
||||
visible_message(span_notice("The [src] displays a [.filedesc] notification: [alerttext]"))
|
||||
visible_message(span_notice("The [src] displays a [caller1.filedesc] notification: [alerttext]"))
|
||||
var/mob/living/holder = loc
|
||||
if(istype(holder))
|
||||
to_chat(holder, "[icon2html(src)] [span_notice("The [src] displays a [.filedesc] notification: [alerttext]")]")
|
||||
to_chat(holder, "[icon2html(src)] [span_notice("The [src] displays a [caller1.filedesc] notification: [alerttext]")]")
|
||||
|
||||
// Function used by NanoUI's to obtain data for header. All relevant entries begin with "PC_"
|
||||
/obj/item/modular_computer/proc/get_header_data()
|
||||
|
||||
@@ -53,8 +53,8 @@
|
||||
/obj/item/modular_computer/processor/attack_ghost(mob/user)
|
||||
ui_interact(user)
|
||||
|
||||
/obj/item/modular_computer/processor/alert_call(datum/computer_file/program/, alerttext)
|
||||
if(! || !.alert_able || .alert_silenced || !alerttext)
|
||||
/obj/item/modular_computer/processor/alert_call(datum/computer_file/program/caller1, alerttext)
|
||||
if(!caller || !caller1.alert_able || caller1.alert_silenced || !alerttext)
|
||||
return
|
||||
playsound(src, 'sound/machines/twobeep_high.ogg', 50, TRUE)
|
||||
machinery_computer.visible_message(span_notice("The [src] displays a [.filedesc] notification: [alerttext]"))
|
||||
machinery_computer.visible_message(span_notice("The [src] displays a [caller1.filedesc] notification: [alerttext]"))
|
||||
|
||||
@@ -225,11 +225,11 @@
|
||||
borgo.toggle_headlamp(FALSE, TRUE)
|
||||
return TRUE
|
||||
|
||||
/obj/item/modular_computer/tablet/integrated/alert_call(datum/computer_file/program/, alerttext, sound = 'sound/machines/twobeep_high.ogg')
|
||||
if(! || !.alert_able || .alert_silenced || !alerttext) //Yeah, we're checking alert_able. No, you don't get to make alerts that the user can't silence.
|
||||
/obj/item/modular_computer/tablet/integrated/alert_call(datum/computer_file/program/caller1, alerttext, sound = 'sound/machines/twobeep_high.ogg')
|
||||
if(!caller || !caller1.alert_able || caller1.alert_silenced || !alerttext) //Yeah, we're checking alert_able. No, you don't get to make alerts that the user can't silence.
|
||||
return
|
||||
borgo.playsound_local(src, sound, 50, TRUE)
|
||||
to_chat(borgo, span_notice("The [src] displays a [.filedesc] notification: [alerttext]"))
|
||||
to_chat(borgo, span_notice("The [src] displays a [caller1.filedesc] notification: [alerttext]"))
|
||||
|
||||
|
||||
/obj/item/modular_computer/tablet/integrated/syndicate
|
||||
|
||||
Reference in New Issue
Block a user