diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 4f1ddfd166f..6f743230357 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -31,7 +31,16 @@ var/global/list/obj/item/device/pda/PDAs = list() var/tnote[0] //Current Texts var/last_text //No text spamming var/last_honk //Also no honk spamming that's bad too + 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', + "holy" = 'sound/items/PDA/ambicha4-short.ogg', + "xeno" = 'sound/voice/hiss1.ogg') + var/lock_code = "" // Lockcode to unlock uplink var/honkamt = 0 //How many honks left when infected with honk.exe var/mimeamt = 0 //How many silence left when infected with mime.exe @@ -500,7 +509,7 @@ var/global/list/obj/item/device/pda/PDAs = list() data["manifest"] = list("__json_cache" = ManifestJSON) - + // update the ui if it exists, returns null if no ui is passed/found ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) @@ -828,8 +837,8 @@ var/global/list/obj/item/device/pda/PDAs = list() nanomanager.update_uis(src) usr << "You press the reset button on \the [src]." else - usr << "You cannot do this while restrained." - + usr << "You cannot do this while restrained." + /obj/item/device/pda/proc/remove_id() if (id) if (ismob(loc)) @@ -913,7 +922,11 @@ var/global/list/obj/item/device/pda/PDAs = list() */ if (!P.silent) - playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1) + var/sound/S = sound('sound/machines/twobeep.ogg') + + if(P.ttone in ttone_sound) + S = ttone_sound[P.ttone] + playsound(P.loc, S, 50, 1) for (var/mob/O in hearers(3, P.loc)) if(!P.silent) O.show_message(text("\icon[P] *[P.ttone]*")) //Search for holder of the PDA. diff --git a/sound/items/PDA/__credits.dm b/sound/items/PDA/__credits.dm new file mode 100644 index 00000000000..4814eb325b5 --- /dev/null +++ b/sound/items/PDA/__credits.dm @@ -0,0 +1,10 @@ +//Since there is space, and .ogg files show up in DM anyways, going to put the source of each file here. + +//example entry +//file-name.ogg +/*desc & credits +*/ + +//ambicha4-short.ogg +/*4-second excerpt from sound/ambience/ambicha4.ogg +*/ \ No newline at end of file diff --git a/sound/items/PDA/ambicha4-short.ogg b/sound/items/PDA/ambicha4-short.ogg new file mode 100644 index 00000000000..da7f21d777a Binary files /dev/null and b/sound/items/PDA/ambicha4-short.ogg differ