cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds PDA ringtone to character preferences (#27365)

Browse Source 
* Adds PDA ringtone to character preferences

* Two fixes

* Reset option

* Contra request

* DB update

* linter fix

* SQL update

* file rename

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Adri
2024-11-30 11:53:19 +01:00
committed by GitHub
parent c21be0b102
commit fca84e2e7e
12 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pda/PDA.dm
+2 -22
View File
@@ -36,26 +36,6 @@ GLOBAL_LIST_EMPTY(PDAs)
var/mimeamt = 0 //How many silence left when infected with mime.exe
var/detonate = TRUE // Can the PDA be blown up?
var/ttone = "beep" //The ringtone!
var/list/ttone_sound = list("beep" = 'sound/machines/twobeep.ogg',
"boop" = 'sound/machines/boop.ogg',
"electronic" = 'sound/machines/notif1.ogg',
"chime" = 'sound/machines/notif2.ogg',
"slip" = 'sound/misc/slip.ogg',
"honk" = 'sound/items/bikehorn.ogg',
"SKREE" = 'sound/voice/shriek1.ogg',
"holy" = 'sound/items/PDA/ambicha4-short.ogg',
"boom" = 'sound/effects/explosionfar.ogg',
"gavel" = 'sound/items/gavel.ogg',
"xeno" = 'sound/voice/hiss1.ogg',
"smoke" = 'sound/magic/smoke.ogg',
"shatter" = 'sound/effects/pylon_shatter.ogg',
"energy" = 'sound/weapons/egloves.ogg',
"flare" = 'sound/goonstation/misc/matchstick_light.ogg',
"interference" = 'sound/misc/interference.ogg',
"zap" = 'sound/effects/eleczap.ogg',
"disgusting" = 'sound/effects/blobattack.ogg',
"hungry" = 'sound/weapons/bite.ogg')
var/list/programs = list(
new/datum/data/pda/app/main_menu,
new/datum/data/pda/app/notekeeper,
@@ -377,8 +357,8 @@ GLOBAL_LIST_EMPTY(PDAs)
if(HAS_TRAIT(SSstation, STATION_TRAIT_PDA_GLITCHED))
playsound(src, pick('sound/machines/twobeep_voice1.ogg', 'sound/machines/twobeep_voice2.ogg'), 50, TRUE)
else
if(ttone in ttone_sound)
S = ttone_sound[ttone]
if(ttone in GLOB.pda_ringtone_choices)
S = GLOB.pda_ringtone_choices[ttone]
else
S = 'sound/machines/twobeep_high.ogg'
playsound(loc, S, 50, TRUE)
code/modules/pda/messenger.dm
+1 -1
View File
@@ -59,7 +59,7 @@
data["charges"] = pda.cartridge.charges ? pda.cartridge.charges : 0
data["ringtone"] = pda.ttone
data["ringtone_list"] = pda.ttone_sound
data["ringtone_list"] = GLOB.pda_ringtone_choices
/datum/data/pda/app/messenger/ui_act(action, list/params)
if(..())