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

Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-12-10 10:12:45 +00:00 · 2025-08-11 23:42:30 -07:00
parent b4093af838
commit 645e09dcde
6 changed files with 51 additions and 69 deletions
--- a/code/_helpers/global_lists.dm
+++ b/code/_helpers/global_lists.dm
@@ -703,32 +703,42 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	num2text(MED_I_FREQ) = list()
 ))

-GLOBAL_LIST_INIT(valid_ringtones, list(
-		"beep",
-		"boom",
-		"slip",
-		"honk",
-		"SKREE",
-		"xeno",
-		"dust", // CHOMPEdit - Keeps dust as ringtone
-		"spark",
-		"rad",
-		"servo",
-		// "buh-boop", // CHOMPEdit - No.
-		"trombone",
-		"whistle",
-		"chirp",
-		"slurp",
-		"pwing",
-		"clack",
-		"bzzt",
-		"chimes",
-		"prbt",
-		"bark",
-		"bork",
-		"roark",
-		"chitter",
-		"squish"
+GLOBAL_LIST_INIT(device_ringtones, 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',
+										"dust" = 'sound/effects/supermatter.ogg', // CHOMPEdit
+										"spark" = 'sound/effects/sparks4.ogg',
+										"rad" = 'sound/items/geiger/high1.ogg',
+										"servo" = 'sound/machines/rig/rigservo.ogg',
+										// "buh-boop" = 'sound/misc/buh-boop.ogg', // CHOMPRemove
+										"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',
+										"bubble"= 'sound/effects/bubbles.ogg',
+										"silly" = 'sound/effects/whistle.ogg',
+										// "frog" = 'sound/voice/Croak.ogg',
+										"peep" = 'sound/voice/peep.ogg',
+										"quack" = 'sound/voice/quack.ogg',
+										// "ough" = 'sound/misc/ough.ogg',
+										"stamp" = 'sound/bureaucracy/stamp.ogg',
+										"gnome" = 'sound/items/hooh.ogg',
+										"ratchet" = 'sound/items/Ratchet.ogg',
+										"tether" = 'sound/items/tinytether.ogg'
 										))

 GLOBAL_LIST_EMPTY(seen_citizenships)
--- a/code/game/objects/items/devices/communicator/communicator.dm
+++ b/code/game/objects/items/devices/communicator/communicator.dm
@@ -77,17 +77,6 @@

 	// Ringtones! (Based on the PDA ones)
 	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',
-								"dust" = 'sound/effects/supermatter.ogg',
-								"spark" = 'sound/effects/sparks4.ogg',
-								"rad" = 'sound/items/geiger/high1.ogg',
-								"servo" = 'sound/machines/rig/rigservo.ogg')
 	pickup_sound = 'sound/items/pickup/device.ogg'
 	drop_sound = 'sound/items/drop/device.ogg'

--- a/code/game/objects/items/devices/communicator/messaging.dm
+++ b/code/game/objects/items/devices/communicator/messaging.dm
@@ -77,8 +77,8 @@

 	if(ringer)
 		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'

--- a/code/modules/client/preference_setup/loadout/01_equipment.dm
+++ b/code/modules/client/preference_setup/loadout/01_equipment.dm
@@ -208,7 +208,7 @@
 			return TOPIC_REFRESH

 		if("set_ringtone")
-			var/choice = tgui_input_list(user, "Please select a ringtone. All of these choices come with an associated preset sound. Alternately, select \"Other\" to specify manually.", "Character Preference", GLOB.valid_ringtones + "Other", pref.ringtone)
+			var/choice = tgui_input_list(user, "Please select a ringtone. All of these choices come with an associated preset sound. Alternately, select \"Other\" to specify manually.", "Character Preference", GLOB.device_ringtones + "Other", pref.ringtone)
 			if(!choice)
 				return TOPIC_NOACTION
 			if(choice == "Other")
@@ -219,6 +219,13 @@
 				pref.ringtone = choice
 			return TOPIC_REFRESH

+		if("test_ringtone")
+			var/S = 'sound/machines/twobeep.ogg'
+			if(pref.ringtone in GLOB.device_ringtones)
+				S = GLOB.device_ringtones[pref.ringtone]
+			SEND_SOUND(user.client, S)
+			return TOPIC_NOACTION
+
 		// if("toggle_shoes")
 		// 	pref.shoe_hater = !pref.shoe_hater
 		// 	return TOPIC_REFRESH
--- a/code/modules/pda/pda.dm
+++ b/code/modules/pda/pda.dm
@@ -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)
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/bay_prefs/loadout/SubtabEquipment.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/bay_prefs/loadout/SubtabEquipment.tsx
@@ -61,7 +61,7 @@ export const SubtabEquipment = (props: {
              ))}
            </LabeledList.Item>
          ))}
-          <LabeledList.Item label="Communicator Visibile">
+          <LabeledList.Item label="Communicator Visible">
            <Button onClick={() => act('toggle_comm_visibility')}>
              {communicator_visibility ? 'Yes' : 'No'}
            </Button>
@@ -70,6 +70,7 @@ export const SubtabEquipment = (props: {
            <Button onClick={() => act('set_ringtone')}>
              {ringtone || 'None'}
            </Button>
+            <Button icon="volume-high" onClick={() => act('test_ringtone')}/>
          </LabeledList.Item>
          {/* <LabeledList.Item label="Spawn With Shoes">
            <Button onClick={() => act('toggle_shoes')}>