cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-21 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] ATC and Culture Channels (#12850)

Browse Source 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-07-18 20:39:33 -07:00
committed by GitHub
parent c677d6d080
commit 130bce9a9d
19 changed files with 101 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/radio.dm
+4
View File
@@ -2,6 +2,8 @@
#define CHANNEL_COMMON "Common"
#define CHANNEL_AI_PRIVATE "AI Private"
#define CHANNEL_ENTERTAINMENT "Entertainment"
#define CHANNEL_ATC "ATC"
#define CHANNEL_CULTURE "Culture"
// Departments
#define CHANNEL_COMMAND "Command"
@@ -90,6 +92,8 @@ On the map:
#define SYND_FREQ 1213
#define RAID_FREQ 1277
#define ENT_FREQ 1461 //entertainment frequency. This is not a diona exclusive frequency.
#define ATC_FREQ 1477
#define CULTURE_FREQ 1479
#define BDCM_FREQ 1483 // CHOMPAdd
#define OUT_FREQ 1367 // CHOMPAdd
code/_global_vars/radio.dm
+3 -1
View File
@@ -19,7 +19,9 @@ GLOBAL_LIST_INIT(radiochannels, list(
CHANNEL_SECURITY_1 = SEC_I_FREQ,
CHANNEL_TALON = TALON_FREQ, //VOREStation Add
CHANNEL_CASINO = CSN_FREQ,
CHANNEL_OUTSIDER = OUT_FREQ // CHOMPAdd
CHANNEL_OUTSIDER = OUT_FREQ, // CHOMPAdd
CHANNEL_ATC = ATC_FREQ,
CHANNEL_CULTURE = CULTURE_FREQ
))
// Hey, if anyone ever needs to update tgui/packages/tgui/constants.js with new radio channels
code/_helpers/global_lists.dm
+3 -1
View File
@@ -710,7 +710,9 @@ GLOBAL_LIST_INIT(radio_channels_by_freq, list(
num2text(SCI_FREQ) = CHANNEL_SCIENCE,
num2text(SUP_FREQ) = CHANNEL_SUPPLY,
num2text(SRV_FREQ) = CHANNEL_SERVICE,
num2text(EXP_FREQ) = CHANNEL_EXPLORATION
num2text(EXP_FREQ) = CHANNEL_EXPLORATION,
num2text(ATC_FREQ) = CHANNEL_ATC,
num2text(CULTURE_FREQ) = CHANNEL_CULTURE
))
GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard)
code/controllers/subsystems/air_traffic.dm
+1 -1
View File
@@ -77,7 +77,7 @@ SUBSYSTEM_DEF(atc)
/datum/controller/subsystem/atc/proc/msg(message,sender)
ASSERT(message)
GLOB.global_announcer.autosay("[message]", sender ? sender : "[using_map.dock_name] Control")
GLOB.global_announcer.autosay("[message]", sender ? sender : "[using_map.dock_name] Control", CHANNEL_ATC)
/datum/controller/subsystem/atc/proc/is_squelched()
return squelched
code/controllers/subsystems/appreciation_messages.dm
+1 -1
View File
@@ -98,7 +98,7 @@ SUBSYSTEM_DEF(appreciation)
/datum/controller/subsystem/appreciation/proc/msg(message,sender)
ASSERT(message)
GLOB.global_announcer.autosay("[message]", sender ? sender : "Cultural Awareness")
GLOB.global_announcer.autosay("[message]", sender ? sender : "Cultural Awareness", CHANNEL_CULTURE)
/datum/controller/subsystem/appreciation/proc/is_squelched()
return squelched
code/game/machinery/telecomms/presets.dm
+1 -2
View File
@@ -55,8 +55,7 @@
id = "Receiver A"
network = "tcommsat"
autolinkers = list("receiverA") // link to relay
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, BDCM_FREQ, ENT_FREQ) // CHOMPEdit
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, BDCM_FREQ, ENT_FREQ, ATC_FREQ, CULTURE_FREQ) // CHOMPEdit - Add BDCM_FREQ
//Common and other radio frequencies for people to freely use
/obj/machinery/telecomms/receiver/preset_right/Initialize(mapload)
code/game/objects/items/devices/radio/intercom.dm
+20
View File
@@ -82,6 +82,26 @@
name = "entertainment intercom"
frequency = ENT_FREQ
/obj/item/radio/intercom/atc
name = "Air Traffic Control intercom"
frequency = ATC_FREQ
/obj/item/radio/intercom/atc/Initialize(mapload)
. = ..()
internal_channels = list(
num2text(ATC_FREQ) = list()
)
/obj/item/radio/intercom/culture
name = "culture intercom"
frequency = CULTURE_FREQ
/obj/item/radio/intercom/culture/Initialize(mapload)
. = ..()
internal_channels = list(
num2text(CULTURE_FREQ) = list()
)
/obj/item/radio/intercom/science
name = "station intercom (Science)"
channels=list("Science")
maps/groundbase/gb-z1.dmm
+4
View File
@@ -14623,6 +14623,10 @@
"GR" = (
/obj/structure/table/marble,
/obj/machinery/chemical_dispenser/bar_alc/full,
/obj/item/radio/intercom/culture{
dir = 1;
pixel_y = 21
},
/turf/simulated/floor/lino,
/area/groundbase/civilian/bar)
"GS" = (
maps/groundbase/gb-z2.dmm
+24 -24
View File
@@ -76,7 +76,6 @@
/area/groundbase/science/rnd)
"ai" = (
/obj/machinery/door/airlock{
id_tag = null;
name = "Bathroom"
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -702,7 +701,6 @@
/area/groundbase/level2/nw)
"bn" = (
/obj/machinery/door/airlock{
id_tag = null;
name = "Unisex Restroom"
},
/obj/structure/cable/yellow{
@@ -1036,6 +1034,20 @@
},
/turf/simulated/floor/wood,
/area/groundbase/civilian/kitchen/backroom)
"cb" = (
/obj/structure/table/bench/padded,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/item/radio/intercom/culture{
dir = 1;
pixel_y = 24
},
/turf/simulated/floor/tiled/dark,
/area/groundbase/civilian/bar)
"cc" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/glass_research{
@@ -1833,8 +1845,7 @@
},
/obj/machinery/door/window/southleft{
dir = 1;
name = "shower door";
req_access = null
name = "shower door"
},
/turf/simulated/floor/tiled/white,
/area/groundbase/dorms/room1)
@@ -3249,7 +3260,6 @@
master_tag = "xenobio_airlock_control";
name = "Xenobiology Access Button";
pixel_x = -32;
req_access = null;
req_one_access = list(47,55)
},
/obj/structure/cable/yellow{
@@ -4595,8 +4605,7 @@
},
/obj/machinery/door/window/southleft{
dir = 1;
name = "shower door";
req_access = null
name = "shower door"
},
/turf/simulated/floor/tiled/white,
/area/groundbase/dorms/room5)
@@ -5361,7 +5370,6 @@
/area/groundbase/medical/lobby)
"oE" = (
/obj/machinery/door/airlock{
id_tag = null;
name = "Bathroom"
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -7222,7 +7230,6 @@
/area/groundbase/level2/nw)
"tP" = (
/obj/machinery/door/airlock{
id_tag = null;
name = "Bathroom"
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -10595,8 +10602,7 @@
/obj/machinery/door/window/brigdoor/westright{
dir = 4;
name = "Robotics Desk";
req_access = list(29,47);
req_one_access = null
req_access = list(29,47)
},
/obj/machinery/door/firedoor/glass,
/obj/structure/table/reinforced,
@@ -10994,8 +11000,7 @@
},
/obj/machinery/door/window/southleft{
dir = 1;
name = "shower door";
req_access = null
name = "shower door"
},
/turf/simulated/floor/tiled/white,
/area/groundbase/dorms/room3)
@@ -12161,8 +12166,7 @@
},
/obj/machinery/door/window/southleft{
dir = 1;
name = "shower door";
req_access = null
name = "shower door"
},
/obj/machinery/alarm{
dir = 4
@@ -13839,7 +13843,6 @@
/area/groundbase/dorms)
"Mr" = (
/obj/machinery/door/airlock{
id_tag = null;
name = "Bathroom"
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -15648,7 +15651,6 @@
master_tag = "xenobio_airlock_control";
name = "Xenobiology Access Button";
pixel_y = -32;
req_access = null;
req_one_access = list(47,55)
},
/obj/structure/cable/yellow{
@@ -16285,6 +16287,9 @@
dir = 8;
pixel_x = 30
},
/obj/item/radio/intercom/atc{
pixel_y = -24
},
/turf/simulated/floor/tiled/dark,
/area/groundbase/command/bridge)
"Tf" = (
@@ -16407,7 +16412,6 @@
/area/groundbase/science/circuits)
"Tz" = (
/obj/machinery/door/airlock{
id_tag = null;
name = "Bathroom"
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -16969,7 +16973,6 @@
/area/groundbase/civilian/library)
"Vq" = (
/obj/machinery/door/airlock{
id_tag = null;
name = "Bathroom"
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -17057,8 +17060,7 @@
/obj/machinery/door/window/brigdoor/westleft{
dir = 4;
name = "Robotics Desk";
req_access = list(29,47);
req_one_access = null
req_access = list(29,47)
},
/obj/machinery/door/firedoor/glass,
/obj/structure/table/reinforced,
@@ -17671,7 +17673,6 @@
/area/groundbase/science/rd)
"Xp" = (
/obj/machinery/door/airlock{
id_tag = null;
name = "Bathroom"
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -18074,7 +18075,6 @@
/area/groundbase/civilian/kitchen)
"YF" = (
/obj/machinery/door/airlock{
id_tag = null;
name = "Bathroom"
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -23713,7 +23713,7 @@ xE
xE
xE
FF
PS
cb
LS
Ny
YO
maps/groundbase/groundbase_telecomm_defs.dm
+1 -1
View File
@@ -10,7 +10,7 @@
/obj/machinery/telecomms/receiver/preset_right/groundbase
id = "groundbase_rx"
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, EXP_FREQ)
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, EXP_FREQ, ATC_FREQ, CULTURE_FREQ)
/obj/machinery/telecomms/broadcaster/preset_right/groundbase
id = "groundbase_tx"
maps/groundbase/groundbase_telecomms.dm
+4 -1
View File
@@ -20,7 +20,10 @@
num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
num2text(SUP_FREQ) = list(ACCESS_CARGO),
num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_HYDROPONICS),
num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
num2text(EXP_FREQ) = list(ACCESS_EXPLORER),
num2text(ATC_FREQ) = list(),
num2text(CULTURE_FREQ) = list()
)
/obj/item/multitool/station_buffered
maps/stellar_delight/stellar_delight2.dmm
+6 -1
View File
@@ -15350,6 +15350,11 @@
/obj/structure/bed/chair/bay/comfy/captain{
dir = 1
},
/obj/item/radio/intercom/atc{
dir = 1;
pixel_y = 19;
pixel_x = 32
},
/turf/simulated/floor/tiled/eris/dark/gray_platform,
/area/bridge)
"HM" = (
@@ -17840,7 +17845,7 @@
/turf/simulated/floor/tiled/eris/steel/brown_platform,
/area/quartermaster/storage)
"Nk" = (
/obj/item/radio/intercom{
/obj/item/radio/intercom/culture{
dir = 1;
pixel_y = 24
},
maps/stellar_delight/stellar_delight_telecomm_defs.dm
+1 -1
View File
@@ -10,7 +10,7 @@
/obj/machinery/telecomms/receiver/preset_right/sd
id = "sd_rx"
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, EXP_FREQ)
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, EXP_FREQ, ATC_FREQ, CULTURE_FREQ)
/obj/machinery/telecomms/broadcaster/preset_right/sd
id = "sd_tx"
maps/stellar_delight/stellar_delight_telecomms.dm
+3 -1
View File
@@ -20,7 +20,9 @@
num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
num2text(SUP_FREQ) = list(ACCESS_CARGO),
num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_HYDROPONICS),
num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
num2text(EXP_FREQ) = list(ACCESS_EXPLORER),
num2text(ATC_FREQ) = list(),
num2text(CULTURE_FREQ) = list()
)
/obj/item/multitool/station_buffered
maps/tether/tether-03-surface3.dmm
+15 -4
View File
@@ -2938,7 +2938,6 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner2,
/obj/machinery/door/airlock/multi_tile/glass{
dir = 1;
id_tag = null;
name = "Medbay Airlock";
req_access = list(5);
req_one_access = list(5)
@@ -6270,6 +6269,10 @@
/area/tether/surfacebase/outside/outside3)
"ajH" = (
/obj/machinery/computer/secure_data,
/obj/item/radio/intercom/atc{
dir = 1;
pixel_y = 24
},
/turf/simulated/floor/tiled/dark,
/area/bridge)
"ajI" = (
@@ -9956,6 +9959,16 @@
},
/turf/simulated/floor/tiled,
/area/rnd/xenobiology/xenoflora)
"aqm" = (
/obj/effect/floor_decal/spline/plain{
dir = 1
},
/obj/item/radio/intercom/culture{
dir = 1;
pixel_y = 21
},
/turf/simulated/floor/lino,
/area/crew_quarters/bar)
"aqn" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -36396,7 +36409,6 @@
/area/crew_quarters/pool)
"bmE" = (
/obj/machinery/door/airlock/multi_tile/glass{
id_tag = null;
name = "Medbay Storage";
req_access = list(5);
req_one_access = list(5)
@@ -46102,7 +46114,6 @@
},
/obj/machinery/door/airlock/glass{
name = "Tourbus Cockpit";
req_access = null;
req_one_access = list(67)
},
/obj/machinery/door/firedoor,
@@ -62345,7 +62356,7 @@ bge
bgA
bgA
aru
aGx
aqm
bgz
bgz
baX
maps/tether/tether_telecomm_defs.dm
+1 -1
View File
@@ -10,7 +10,7 @@
/obj/machinery/telecomms/receiver/preset_right/tether
id = "tether_rx"
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, EXP_FREQ)
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, EXP_FREQ, ATC_FREQ, CULTURE_FREQ)
/obj/machinery/telecomms/broadcaster/preset_right/tether
id = "tether_tx"
maps/tether/tether_telecomms.dm
+4 -1
View File
@@ -20,7 +20,10 @@
num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
num2text(SUP_FREQ) = list(ACCESS_CARGO),
num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_HYDROPONICS),
num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
num2text(EXP_FREQ) = list(ACCESS_EXPLORER),
num2text(ATC_FREQ) = list(),
num2text(CULTURE_FREQ) = list()
)
/obj/item/multitool/station_buffered
maps/~map_system/maps.dm
+2
View File
@@ -291,6 +291,8 @@ GLOBAL_LIST_EMPTY(all_maps)
num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
num2text(SUP_FREQ) = list(ACCESS_CARGO),
num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_HYDROPONICS),
num2text(ATC_FREQ) = list(),
num2text(CULTURE_FREQ) = list()
)
/datum/map/proc/get_skybox_datum(z)
modular_chomp/maps/common/common_presets.dm
+3 -1
View File
@@ -87,7 +87,7 @@
)
/obj/machinery/telecomms/receiver/preset_right/southerncross
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, BDCM_FREQ, EXP_FREQ)
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, BDCM_FREQ, EXP_FREQ, ATC_FREQ, CULTURE_FREQ)
/obj/machinery/telecomms/bus/preset_two/southerncross
freq_listening = list(SUP_FREQ, SRV_FREQ, EXP_FREQ)
@@ -99,6 +99,8 @@
/datum/map/southern_cross/default_internal_channels()
return list(
num2text(PUB_FREQ) = list(),
num2text(ATC_FREQ) = list(),
num2text(CULTURE_FREQ) = list(),
num2text(AI_FREQ) = list(ACCESS_SYNTH),
num2text(ENT_FREQ) = list(),
num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),