Skip to content

Commit

Permalink
common to announcements
Browse files Browse the repository at this point in the history
  • Loading branch information
carpotoxin committed Jan 23, 2025
1 parent 88678d1 commit d48a957
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/radio.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

//say based modes like binary are in living/say.dm

#define RADIO_CHANNEL_COMMON "Common"
#define RADIO_CHANNEL_COMMON "Announcements" // DOPPLER EDIT - Chat PDA - old code: "Common"
#define RADIO_KEY_COMMON ";"

#define RADIO_CHANNEL_SECURITY "Security"
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/blackbox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ SUBSYSTEM_DEF(blackbox)
return
switch(freq)
if(FREQ_COMMON)
record_feedback("tally", "radio_usage", 1, "common")
record_feedback("tally", "radio_usage", 1, "announcements") // DOPPLER EDIT - Chat on PDA - old code: record_feedback("tally", "radio_usage", 1, "common")
if(FREQ_SCIENCE)
record_feedback("tally", "radio_usage", 1, "science")
if(FREQ_COMMAND)
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/telecomms/machines/bus.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
id = "Bus 4"
network = "tcommsat"
freq_listening = list(FREQ_ENGINEERING)
autolinkers = list("processor4", "engineering", "common", "messaging")
autolinkers = list("processor4", "engineering", "announcements", "messaging") // DOPPLER EDIT - Chat on PDA - old code: autolinkers = list("processor4", "engineering", "common", "messaging")

/obj/machinery/telecomms/bus/preset_four/Initialize(mapload)
. = ..()
Expand All @@ -84,5 +84,5 @@

/obj/machinery/telecomms/bus/preset_one/birdstation
name = "Bus"
autolinkers = list("processor1", "common", "messaging")
autolinkers = list("processor1", "announcements", "messaging") // DOPPLER EDIT - Chat on PDA - old code: autolinkers = list("processor1", "common", "messaging")
freq_listening = list()
2 changes: 1 addition & 1 deletion code/game/machinery/telecomms/machines/hub.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"medical",
"supply",
"service",
"common",
"announcements", // DOPPLER EDIT - Chat on PDA - old code: "common",
"command",
"engineering",
"entertainment",
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/telecomms/machines/server.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@
autolinkers = list("service", "entertainment")

/obj/machinery/telecomms/server/presets/common
id = "Common Server"
id = "Announcements Server" // DOPPLER EDIT - Chat on PDA - old code: id = "Common Server"
freq_listening = list()
autolinkers = list("common")
autolinkers = list("announcements") // DOPPLER EDIT - Chat on PDA - old code: autolinkers = list("common")

/obj/machinery/telecomms/server/presets/common/Initialize(mapload)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences/uplink_location.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

data[CHOICED_PREFERENCE_DISPLAY_NAMES] = list(
UPLINK_PDA = "PDA",
UPLINK_RADIO = "Radio",
/* UPLINK_RADIO = "Radio", DOPPLER EDIT REMOVAL - Chat on PDA - temporary edit i'm sure */
UPLINK_PEN = "Pen",
UPLINK_IMPLANT = "Implant ([UPLINK_IMPLANT_TELECRYSTAL_COST]TC)",
)
Expand Down
5 changes: 5 additions & 0 deletions modular_doppler/common_radio/radio_overwrites.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// Some maps have pre-defined their intercom names to being 'common', this changes it to Announcements, albeit sloppily.
/obj/item/radio/intercom/Initialize(mapload, ndir, building)
. = ..()
if(name == "Common Channel")
name = "Announcements Channel"
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6656,6 +6656,7 @@
#include "modular_doppler\colony_fabricator\code\machines\thermomachine.dm"
#include "modular_doppler\colony_fabricator\code\tools\tools.dm"
#include "modular_doppler\common_bilingual\common_bilingual.dm"
#include "modular_doppler\common_radio\radio_overwrites.dm"
#include "modular_doppler\cryosleep\code\admin.dm"
#include "modular_doppler\cryosleep\code\ai.dm"
#include "modular_doppler\cryosleep\code\config.dm"
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export const RADIO_CHANNELS = [
color: '#d65d95',
},
{
name: 'Common',
name: 'Announcements', // DOPPLER EDIT - Chat on PDA - old code: name: 'Common',
freq: 1459,
color: '#1ecc43',
},
Expand Down

0 comments on commit d48a957

Please sign in to comment.