From 3ba1b18b8fa893fbe591bc0b3bcb4980b3de7a0f Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Mon, 22 Dec 2014 19:53:44 -0500 Subject: [PATCH] Most PDA's now are set to silent on news updates. resolves #7454 Heads and Librarian(reporter) are not set to silent. The librarian can shush herself. old bitty. --- code/game/objects/items/devices/PDA/PDA.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index b69f85af38..f4b3b3308f 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -28,7 +28,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/fon = 0 //Is the flashlight function on? var/f_lum = 2 //Luminosity for the flashlight function var/message_silent = 0 //To beep or not to beep, that is the question - var/news_silent = 0 //To beep or not to beep, that is the question + var/news_silent = 1 //To beep or not to beep, that is the question. The answer is No. var/toff = 0 //If 1, messenger disabled var/tnote[0] //Current Texts var/last_text //No text spamming @@ -118,6 +118,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/heads default_cartridge = /obj/item/weapon/cartridge/head icon_state = "pda-h" + news_silent = 1 /obj/item/device/pda/heads/hop default_cartridge = /obj/item/weapon/cartridge/hop @@ -190,7 +191,7 @@ var/global/list/obj/item/device/pda/PDAs = list() desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader." note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!" message_silent = 1 //Quiet in the library! - news_silent = 1 + news_silent = 0 // Librarian is above the law! (That and alt job title is reporter) /obj/item/device/pda/clear icon_state = "pda-transp" @@ -1023,7 +1024,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/proc/new_info(var/beep_silent, var/message_tone, var/reception_message) if (!beep_silent) playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) - for (var/mob/O in hearers(3, loc)) + for (var/mob/O in hearers(2, loc)) O.show_message(text("\icon[src] *[message_tone]*")) //Search for holder of the PDA. var/mob/living/L = null @@ -1041,8 +1042,9 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/proc/new_news(var/message) new_info(news_silent, newstone, news_silent ? "" : "\icon[src] [message]") - new_news = 1 - update_icon() + if(!news_silent) + new_news = 1 + update_icon() /obj/item/device/pda/ai/new_news(var/message) // Do nothing