diff --git a/code/__defines/radio.dm b/code/__defines/radio.dm index 1aa469c9ac..d352c73a26 100644 --- a/code/__defines/radio.dm +++ b/code/__defines/radio.dm @@ -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 diff --git a/code/_global_vars/radio.dm b/code/_global_vars/radio.dm index 9bcd368a57..def196cab0 100644 --- a/code/_global_vars/radio.dm +++ b/code/_global_vars/radio.dm @@ -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 diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index ee1ee988f8..5a3b247d74 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -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) diff --git a/code/controllers/subsystems/air_traffic.dm b/code/controllers/subsystems/air_traffic.dm index 2142c41449..36dadd1b29 100644 --- a/code/controllers/subsystems/air_traffic.dm +++ b/code/controllers/subsystems/air_traffic.dm @@ -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 diff --git a/code/controllers/subsystems/appreciation_messages.dm b/code/controllers/subsystems/appreciation_messages.dm index fd5dcbf206..a5d7b30da1 100644 --- a/code/controllers/subsystems/appreciation_messages.dm +++ b/code/controllers/subsystems/appreciation_messages.dm @@ -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 diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 42198a272b..1e656357d8 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -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) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 50a50070c6..428d89b837 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -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") diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index fab19e3fe5..75ee528133 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -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" = ( diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 7772a92c24..5cff35f8e7 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -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 diff --git a/maps/groundbase/groundbase_telecomm_defs.dm b/maps/groundbase/groundbase_telecomm_defs.dm index 40d077c7f0..6427a115ec 100644 --- a/maps/groundbase/groundbase_telecomm_defs.dm +++ b/maps/groundbase/groundbase_telecomm_defs.dm @@ -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" diff --git a/maps/groundbase/groundbase_telecomms.dm b/maps/groundbase/groundbase_telecomms.dm index 037fe5c8ed..97e39db914 100644 --- a/maps/groundbase/groundbase_telecomms.dm +++ b/maps/groundbase/groundbase_telecomms.dm @@ -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 diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index f0a81b496e..b0a83ea345 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -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 }, diff --git a/maps/stellar_delight/stellar_delight_telecomm_defs.dm b/maps/stellar_delight/stellar_delight_telecomm_defs.dm index 0e55590caf..4e5e7aa871 100644 --- a/maps/stellar_delight/stellar_delight_telecomm_defs.dm +++ b/maps/stellar_delight/stellar_delight_telecomm_defs.dm @@ -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" diff --git a/maps/stellar_delight/stellar_delight_telecomms.dm b/maps/stellar_delight/stellar_delight_telecomms.dm index b580412434..e34ce7a68a 100644 --- a/maps/stellar_delight/stellar_delight_telecomms.dm +++ b/maps/stellar_delight/stellar_delight_telecomms.dm @@ -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 diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index c34ea751ba..0afd692e8f 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -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 diff --git a/maps/tether/tether_telecomm_defs.dm b/maps/tether/tether_telecomm_defs.dm index cd3eacc491..0286af1142 100644 --- a/maps/tether/tether_telecomm_defs.dm +++ b/maps/tether/tether_telecomm_defs.dm @@ -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" diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index ac2a2fbc3a..ebd66fd2ca 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -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 diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 53c4922d5e..2f9f9b1b1a 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -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) diff --git a/modular_chomp/maps/common/common_presets.dm b/modular_chomp/maps/common/common_presets.dm index ffdfa91185..0df7251613 100644 --- a/modular_chomp/maps/common/common_presets.dm +++ b/modular_chomp/maps/common/common_presets.dm @@ -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),