diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index fb2168181e3..40667f5e2c1 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -134,12 +134,7 @@
useMS.send_pda_message("[P.owner]", "[command_name()] Payroll", msg)
// BUT NOPE, NEED TO DO THIS BULLSHIT.
- P.tnote += "← From [command_name()] (Payroll):
[msg]
"
-
- if (!P.silent)
- playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for (var/mob/O in hearers(3, P.loc))
- if(!P.silent) O.show_message(text("\icon[P] *[P.ttone]*"))
+ P.play_ringtone()
//Search for holder of the PDA.
var/mob/living/L = null
if(P.loc && isliving(P.loc))
diff --git a/code/game/gamemodes/mutiny/mutiny.dm b/code/game/gamemodes/mutiny/mutiny.dm
index 150ff09f5fe..ad4513e6709 100644
--- a/code/game/gamemodes/mutiny/mutiny.dm
+++ b/code/game/gamemodes/mutiny/mutiny.dm
@@ -105,10 +105,7 @@ datum/game_mode/mutiny
if (!pda)
return 0
- if (!pda.silent)
- playsound(pda.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for (var/mob/O in hearers(3, pda.loc))
- O.show_message(text("\icon[pda] *[pda.ttone]*"))
+ pda.play_ringtone()
head_mutineer.current << fluff.get_pda_body()
return 1
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index 8a7d4d170a8..3099d738a70 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -446,16 +446,13 @@
//Sender isn't faking as someone who exists
if(isnull(PDARec))
src.linkedServer.send_pda_message("[customrecepient.owner]", "[customsender]","[custommessage]")
- if (!customrecepient.silent)
- playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for (var/mob/O in hearers(3, customrecepient.loc))
- O.show_message(text("\icon[customrecepient] *[customrecepient.ttone]*"))
- if( customrecepient.loc && ishuman(customrecepient.loc) )
- var/mob/living/carbon/human/H = customrecepient.loc
- H << "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)"
- log_pda("[usr] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]")
- customrecepient.overlays.Cut()
- customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r")
+ customrecepient.play_ringtone()
+ if( customrecepient.loc && ishuman(customrecepient.loc) )
+ var/mob/living/carbon/human/H = customrecepient.loc
+ H << "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)"
+ log_pda("[usr] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]")
+ customrecepient.overlays.Cut()
+ customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r")
//Sender is faking as someone who exists
else
src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]")
@@ -464,16 +461,13 @@
if(!customrecepient.conversations.Find("\ref[PDARec]"))
customrecepient.conversations.Add("\ref[PDARec]")
- if (!customrecepient.silent)
- playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for (var/mob/O in hearers(3, customrecepient.loc))
- O.show_message(text("\icon[customrecepient] *[customrecepient.ttone]*"))
- if( customrecepient.loc && ishuman(customrecepient.loc) )
- var/mob/living/carbon/human/H = customrecepient.loc
- H << "\icon[customrecepient] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)"
- log_pda("[usr] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]")
- customrecepient.overlays.Cut()
- customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r")
+ customrecepient.play_ringtone()
+ if( customrecepient.loc && ishuman(customrecepient.loc) )
+ var/mob/living/carbon/human/H = customrecepient.loc
+ H << "\icon[customrecepient] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)"
+ log_pda("[usr] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]")
+ customrecepient.overlays.Cut()
+ customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r")
//Finally..
ResetMessage()
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 6f743230357..74c1f2f51ff 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -921,14 +921,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
ai.show_message("Intercepted message from [who]: [t]")
*/
- if (!P.silent)
- 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]*"))
+ P.play_ringtone()
//Search for holder of the PDA.
var/mob/living/L = null
if(P.loc && isliving(P.loc))
@@ -951,6 +944,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
else
U << "ERROR: Messaging server is not responding."
+/obj/item/device/pda/proc/play_ringtone()
+ if (!silent)
+ var/sound/S = sound('sound/machines/twobeep.ogg')
+
+ if(ttone in ttone_sound)
+ S = ttone_sound[ttone]
+ playsound(loc, S, 50, 1)
+ for (var/mob/O in hearers(3, loc))
+ if(!silent) O.show_message(text("\icon[src] *[ttone]*"))
/obj/item/device/pda/verb/verb_remove_id()
set category = null
diff --git a/code/modules/events/money_spam.dm b/code/modules/events/money_spam.dm
index 07f68b9b5c6..198b483ee10 100644
--- a/code/modules/events/money_spam.dm
+++ b/code/modules/events/money_spam.dm
@@ -104,10 +104,7 @@
//Commented out because we don't send messages like this anymore. Instead it will just popup in their chat window.
//P.tnote += "← From [sender] (Unknown / spam?):
[message]
"
- if (!P.silent)
- playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for (var/mob/O in hearers(3, P.loc))
- if(!P.silent) O.show_message(text("\icon[P] *[P.ttone]*"))
+ P.play_ringtone()
//Search for holder of the PDA.
var/mob/living/L = null
if(P.loc && isliving(P.loc))
diff --git a/code/modules/ninja/suit/SpiderOS.dm b/code/modules/ninja/suit/SpiderOS.dm
index 8b030b11ffb..fed3c2bd1f9 100644
--- a/code/modules/ninja/suit/SpiderOS.dm
+++ b/code/modules/ninja/suit/SpiderOS.dm
@@ -216,10 +216,17 @@
display_to << "Error: unable to deliver message."
display_spideros()
return
- P.tnote += "← From an unknown source:
[t]
"
- if (!P.silent)
- playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1)
- P.audible_message("\icon[P] *[P.ttone]*", null, 3)
+ //Search for holder of the PDA.
+ var/mob/living/L = null
+ if(P.loc && isliving(P.loc))
+ L = P.loc
+ //Maybe they are a pAI!
+ else
+ L = get(P, /mob/living/silicon)
+
+ if(L)
+ L << "\icon[P] Message from unknown source: \"[t]\" (Unable to Reply)"
+ P.play_ringtone()
P.overlays.Cut()
P.overlays += image('icons/obj/pda.dmi', "pda-r")