cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6823 from lbnesquik/KoK-PDA-tweak

Browse Source 
Makes PDA beeps a toggable option.
This commit is contained in:
Atermonera
2020-03-15 11:46:57 -07:00
committed by VirgoBot
parent 08a9fcf0f2
commit b2becc99b5
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/devices/PDA/PDA.dm
View File

@@ -48,6 +48,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/list/conversations = list() // For keeping up with who we have PDA messsages from. var/list/conversations = list() // For keeping up with who we have PDA messsages from.
var/new_message = 0 //To remove hackish overlay check var/new_message = 0 //To remove hackish overlay check
var/new_news = 0 var/new_news = 0
var/touch_silent = 0 //If 1, no beeps on interacting.
var/active_feed // The selected feed var/active_feed // The selected feed
var/list/warrant // The warrant as we last knew it var/list/warrant // The warrant as we last knew it
@@ -90,7 +91,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
//Bloop when using: //Bloop when using:
/obj/item/device/pda/CouldUseTopic(var/mob/user) /obj/item/device/pda/CouldUseTopic(var/mob/user)
..() ..()
if(iscarbon(user)) if(iscarbon(user) && !touch_silent)
playsound(src, 'sound/machines/pda_click.ogg', 20) playsound(src, 'sound/machines/pda_click.ogg', 20)
/obj/item/device/pda/medical /obj/item/device/pda/medical
@@ -504,6 +505,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
data["note"] = note // current pda notes data["note"] = note // current pda notes
data["message_silent"] = message_silent // does the pda make noise when it receives a message? data["message_silent"] = message_silent // does the pda make noise when it receives a message?
data["news_silent"] = news_silent // does the pda make noise when it receives news? data["news_silent"] = news_silent // does the pda make noise when it receives news?
data["touch_silent"] = touch_silent // does the pda make noise when it receives news?
data["toff"] = toff // is the messenger function turned off? data["toff"] = toff // is the messenger function turned off?
data["active_conversation"] = active_conversation // Which conversation are we following right now? data["active_conversation"] = active_conversation // Which conversation are we following right now?
@@ -773,6 +775,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
scanmode = 0 scanmode = 0
else if((!isnull(cartridge)) && (cartridge.access_atmos)) else if((!isnull(cartridge)) && (cartridge.access_atmos))
scanmode = 5 scanmode = 5
if("Toggle Beeping")
touch_silent = !touch_silent
//MESSENGER/NOTE FUNCTIONS=================================== //MESSENGER/NOTE FUNCTIONS===================================

1
nano/templates/pda.tmpl
View File

@@ -165,6 +165,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{/if}} {{/if}}
{{/if}} {{/if}}
{{:helper.link('Atmospheric Scan', 'gear', {'choice' : "3"}, null, 'fixedLeftWide')}} {{:helper.link('Atmospheric Scan', 'gear', {'choice' : "3"}, null, 'fixedLeftWide')}}
{{:helper.link(data.touch_silent==1 ? 'Enable Beeping' : 'Disable Beeping', 'gear', {'choice' : "Toggle Beeping"}, null,'fixedLeftWide')}}
{{:helper.link(data.fon==1 ? 'Disable Flashlight' : 'Enable Flashlight', 'lightbulb', {'choice' : "Light"}, null,'fixedLeftWide')}} {{:helper.link(data.fon==1 ? 'Disable Flashlight' : 'Enable Flashlight', 'lightbulb', {'choice' : "Light"}, null,'fixedLeftWide')}}
</div> </div>
</div> </div>