cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Moves Ringtones To A Unified List (#11385)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-11 23:42:30 -07:00
committed by GitHub
parent b4093af838
commit 645e09dcde
6 changed files with 51 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
code/modules/pda/pda.dm
View File

@@ -26,31 +26,6 @@
var/mimeamt = 0 //How many silence left when infected with mime.exe
var/detonate = 1 // Can the PDA be blown up?
var/ttone = "beep" //The ringtone!
var/list/ttone_sound = list("beep" = 'sound/machines/twobeep.ogg',
"boom" = 'sound/effects/explosionfar.ogg',
"slip" = 'sound/misc/slip.ogg',
"honk" = 'sound/items/bikehorn.ogg',
"SKREE" = 'sound/voice/shriek1.ogg',
"xeno" = 'sound/voice/hiss1.ogg',
"dust" = 'sound/effects/supermatter.ogg', // CHOMPEdit - Keeps dust as ringtone
"spark" = 'sound/effects/sparks4.ogg',
"rad" = 'sound/items/geiger/high1.ogg',
"servo" = 'sound/machines/rig/rigservo.ogg',
// "buh-boop" = 'sound/misc/buh-boop.ogg', // CHOMPEdit - No.
"trombone" = 'sound/misc/sadtrombone.ogg',
"whistle" = 'sound/misc/boatswain.ogg',
"chirp" = 'sound/misc/nymphchirp.ogg',
"slurp" = 'sound/items/drink.ogg',
"pwing" = 'sound/items/nif_tone_good.ogg',
"clack" = 'sound/items/storage/toolbox.ogg',
"bzzt" = 'sound/misc/null.ogg', //vibrate mode
"chimes" = 'sound/misc/notice3.ogg',
"prbt" = 'sound/voice/prbt.ogg',
"bark" = 'sound/voice/bark2.ogg',
"bork" = 'sound/voice/bork.ogg',
"roark" = 'sound/voice/roarbark.ogg',
"chitter" = 'sound/voice/moth/moth_chitter.ogg',
"squish" = 'sound/effects/slime_squish.ogg')
var/hidden = 0 // Is the PDA hidden from the PDA list?
var/touch_silent = 0 //If 1, no beeps on interacting.
@@ -103,8 +78,8 @@
/obj/item/pda/proc/play_ringtone()
var/S
if(ttone in ttone_sound)
S = ttone_sound[ttone]
if(ttone in GLOB.device_ringtones)
S = GLOB.device_ringtones[ttone]
else
S = 'sound/machines/twobeep.ogg'
playsound(loc, S, 50, 1)