Merge pull request #10242 from Certhic/radiochannels

refactor radio magic numbers
2025-12-21 07:42:21 +00:00 · 2018-11-16 23:51:53 +08:00
parent a1c274459a e3f852dff6
commit 2f26dc1d11
22 changed files with 62 additions and 87 deletions
--- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
@@ -23,7 +23,7 @@
 	var/input_pressure_min = 0
 	var/output_pressure_max = 0

-	var/frequency = 1439
+	var/frequency = ATMOS_VENTSCRUB
 	var/id_tag = null
 	var/datum/radio_frequency/radio_connection
 	var/advcontrol = 0//does this device listen to the AAC
@@ -249,7 +249,7 @@
 /obj/machinery/atmospherics/binary/dp_vent_pump/multitool_menu(var/mob/user,var/obj/item/multitool/P)
 	return {"
 	<ul>
-		<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[1439]">Reset</a>)</li>
+		<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[ATMOS_VENTSCRUB]">Reset</a>)</li>
 		<li><b>ID Tag:</b> <a href="?src=[UID()];set_id=1">[id_tag]</a></li>
 		<li><b>AAC Acces:</b> <a href="?src=[UID()];toggleadvcontrol=1">[advcontrol ? "Allowed" : "Blocked"]</a></li>
 	</ul>
--- a/code/ATMOSPHERICS/components/binary_devices/valve.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm
@@ -66,7 +66,7 @@
 	desc = "A digitally controlled valve."
 	icon = 'icons/atmos/digital_valve.dmi'

-	var/frequency = 1439
+	var/frequency = ATMOS_VENTSCRUB
 	var/id_tag = null
 	var/datum/radio_frequency/radio_connection
 	settagwhitelist = list("id_tag")
@@ -149,7 +149,7 @@
 /obj/machinery/atmospherics/binary/valve/digital/multitool_menu(var/mob/user,var/obj/item/multitool/P)
 	return {"
 		<ul>
-			<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[1439]">Reset</a>)</li>
+			<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[ATMOS_VENTSCRUB]">Reset</a>)</li>
 			<li>[format_tag("ID Tag","id_tag","set_id")]</a></li>
 		</ul>
 		"}
--- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
@@ -167,7 +167,7 @@
 /obj/machinery/atmospherics/unary/outlet_injector/multitool_menu(var/mob/user,var/obj/item/multitool/P)
 	return {"
 	<ul>
-		<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[1439]">Reset</a>)</li>
+		<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[ATMOS_VENTSCRUB]">Reset</a>)</li>
 		<li>[format_tag("ID Tag","id_tag","set_id")]</a></li>
 	</ul>
 "}
--- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
@@ -37,7 +37,7 @@

 	var/welded = 0 // Added for aliens -- TLE

-	var/frequency = 1439
+	var/frequency = ATMOS_VENTSCRUB
 	var/datum/radio_frequency/radio_connection
 	Mtoollink = 1
 	var/advcontrol = 0//does this device listen to the AAC
@@ -184,7 +184,7 @@
 	frequency = new_frequency
 	if(frequency)
 		radio_connection = radio_controller.add_object(src, frequency,radio_filter_in)
-	if(frequency != 1439)
+	if(frequency != ATMOS_VENTSCRUB)
 		initial_loc.air_vent_info -= id_tag
 		initial_loc.air_vent_names -= id_tag
 		name = "vent pump"
@@ -211,7 +211,7 @@
 		"timestamp" = world.time,
 		"sigtype" = "status"
 	)
-	if(frequency == 1439)//We're on the frequency the air alarms and stuff use
+	if(frequency == ATMOS_VENTSCRUB)
 		if(!initial_loc.air_vent_names[id_tag])
 			var/new_name = "[initial_loc.name] Vent Pump #[initial_loc.air_vent_names.len+1]"
 			initial_loc.air_vent_names[id_tag] = new_name
@@ -227,8 +227,8 @@
 	..()

 	//some vents work his own special way
-	radio_filter_in = frequency==1439?(RADIO_FROM_AIRALARM):null
-	radio_filter_out = frequency==1439?(RADIO_TO_AIRALARM):null
+	radio_filter_in = frequency==ATMOS_VENTSCRUB?(RADIO_FROM_AIRALARM):null
+	radio_filter_out = frequency==ATMOS_VENTSCRUB?(RADIO_TO_AIRALARM):null
 	if(frequency)
 		set_frequency(frequency)
 		src.broadcast_status()
@@ -404,7 +404,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/multitool_menu(var/mob/user,var/obj/item/multitool/P)
 	return {"
 	<ul>
-		<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[1439]">Reset</a>)</li>
+		<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[ATMOS_VENTSCRUB]">Reset</a>)</li>
 		<li>[format_tag("ID Tag","id_tag","set_id")]</li>
 		<li><b>AAC Acces:</b> <a href="?src=[UID()];toggleadvcontrol=1">[advcontrol ? "Allowed" : "Blocked"]</a>
 		</ul>
@@ -419,7 +419,7 @@
 		var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, src.id_tag) as null|text), 1, MAX_MESSAGE_LEN)
 		if(!newid)
 			return
-		if(frequency == 1439)
+		if(frequency == ATMOS_VENTSCRUB)
 			initial_loc.air_vent_info -= id_tag
 			initial_loc.air_vent_names -= id_tag

--- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
@@ -15,7 +15,7 @@

 	var/area/initial_loc
 	var/id_tag = null
-	var/frequency = 1439
+	var/frequency = ATMOS_VENTSCRUB
 	var/datum/radio_frequency/radio_connection
 	var/advcontrol = 0//does this device listen to the AAC?

@@ -50,7 +50,7 @@
 		id_tag = num2text(uid)

 /obj/machinery/atmospherics/unary/vent_scrubber/Destroy()
-	if(initial_loc && frequency == 1439)
+	if(initial_loc && frequency == ATMOS_VENTSCRUB)
 		initial_loc.air_scrub_info -= id_tag
 		initial_loc.air_scrub_names -= id_tag
 	if(radio_controller)
@@ -130,7 +130,7 @@
 	radio_controller.remove_object(src, frequency)
 	frequency = new_frequency
 	radio_connection = radio_controller.add_object(src, frequency, radio_filter_in)
-	if(frequency != 1439)
+	if(frequency != ATMOS_VENTSCRUB)
 		initial_loc.air_scrub_info -= id_tag
 		initial_loc.air_scrub_names -= id_tag
 		name = "air Scrubber"
@@ -159,7 +159,7 @@
 		"filter_n2o" = scrub_N2O,
 		"sigtype" = "status"
 	)
-	if(frequency == 1439)//We're on the frequency the air alarms and stuff use
+	if(frequency == ATMOS_VENTSCRUB)
 		if(!initial_loc.air_scrub_names[id_tag])
 			var/new_name = "[initial_loc.name] Air Scrubber #[initial_loc.air_scrub_names.len+1]"
 			initial_loc.air_scrub_names[id_tag] = new_name
@@ -342,7 +342,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/multitool_menu(var/mob/user,var/obj/item/multitool/P)
 	return {"
 	<ul>
-		<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[1439]">Reset</a>)</li>
+		<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[ATMOS_VENTSCRUB]">Reset</a>)</li>
 		<li>[format_tag("ID Tag","id_tag", "set_id")]</li>
 		<li><b>AAC Acces:</b> <a href="?src=[UID()];toggleadvcontrol=1">[advcontrol ? "Allowed" : "Blocked"]</a>
 	</ul>
@@ -358,7 +358,7 @@
 		if(!newid)
 			return

-		if(frequency == 1439)
+		if(frequency == ATMOS_VENTSCRUB)
 			initial_loc.air_scrub_info -= id_tag
 			initial_loc.air_scrub_names -= id_tag

--- a/code/controllers/communications.dm
+++ b/code/controllers/communications.dm
@@ -61,63 +61,40 @@

 */

-/*
-Frequency range: 1200 to 1600
-Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency, even during mapmaking)
+var/const/DISPLAY_FREQ = 1435 //status displays
+var/const/ATMOS_FIRE_FREQ = 1437 //air alarms
+var/const/ENGINE_FREQ = 1438 //engine components
+var/const/ATMOS_VENTSCRUB = 1439 //vents, scrubbers, atmos control
+var/const/ATMOS_DISTRO_FREQ = 1443 //distro loop
+var/const/ATMOS_TANKS_FREQ = 1441  //atmos supply tanks
+var/const/BOT_BEACON_FREQ = 1445 //bot navigation beacons
+var/const/AIRLOCK_FREQ = 1449 //airlock controls, electropack, magnets

-Radio:
-1459 - standard radio chat
-1351 - Science
-1353 - Command
-1355 - Medical
-1357 - Engineering
-1359 - Security
-1341 - Special Operations
-1443 - Confession Intercom
-1347 - Cargo
-1349 - Service
+var/const/RSD_FREQ = 1457 //radio signal device
+var/const/IMPL_FREQ = 1451 //tracking implant

-Devices:
-1451 - Tracking Implant
-1457 - RSD Default
-
-On the map:
-1311 for prison shuttle console (in fact, it is not used)
-1435 for status displays
-1437 for atmospherics/fire alerts
-1438 for engine components
-1439 for air pumps, air scrubbers, atmo control
-1441 for atmospherics - supply tanks
-1443 for atmospherics - distribution loop/mixed air tank
-1445 for bot nav beacons
-1447 for mulebot, secbot and ed209 control
-1449 for airlock controls, electropack, magnets
-1451 for toxin lab access
-1453 for engineering access
-1455 for AI access
-*/
-
-var/const/RADIO_LOW_FREQ	= 1200
-var/const/PUBLIC_LOW_FREQ	= 1441
-var/const/PUBLIC_HIGH_FREQ	= 1489
-var/const/RADIO_HIGH_FREQ	= 1600
+var/const/RADIO_LOW_FREQ	= 1200 //minimum radio freq
+var/const/PUBLIC_LOW_FREQ	= 1441 //minimum radio chat freq
+var/const/PUBLIC_HIGH_FREQ	= 1489 //maximum radio chat freq
+var/const/RADIO_HIGH_FREQ	= 1600 //maximum radio freq

 var/const/SYND_FREQ = 1213
 var/const/SYNDTEAM_FREQ = 1244
-var/const/DTH_FREQ = 1341
+var/const/DTH_FREQ = 1341 //Special Operations
 var/const/AI_FREQ	= 1343
 var/const/ERT_FREQ = 1345
-var/const/COMM_FREQ = 1353
-var/const/BOT_FREQ = 1447
+var/const/COMM_FREQ = 1353 //Command
+var/const/BOT_FREQ = 1447 //mulebot, secbot, ed209
+

 // department channels
-var/const/PUB_FREQ = 1459
-var/const/SEC_FREQ = 1359
-var/const/ENG_FREQ = 1357
-var/const/SCI_FREQ = 1351
-var/const/MED_FREQ = 1355
-var/const/SUP_FREQ = 1347
-var/const/SRV_FREQ = 1349
+var/const/PUB_FREQ = 1459 //standard radio chat
+var/const/SEC_FREQ = 1359 //security
+var/const/ENG_FREQ = 1357 //engineering
+var/const/SCI_FREQ = 1351 //science
+var/const/MED_FREQ = 1355 //medical
+var/const/SUP_FREQ = 1347 //cargo
+var/const/SRV_FREQ = 1349 //service

 // internal department channels
 var/const/MED_I_FREQ = 1485
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -82,9 +82,9 @@
 	req_one_access = list(access_atmospherics, access_engine_equip)
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100)
 	var/alarm_id = null
-	var/frequency = 1439
+	var/frequency = ATMOS_VENTSCRUB
 	//var/skipprocess = 0 //Experimenting
-	var/alarm_frequency = 1437
+	var/alarm_frequency = ATMOS_FIRE_FREQ
 	var/remote_control = 0
 	var/rcon_setting = 2
 	var/rcon_time = 0
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -9,7 +9,7 @@
 	var/bolts = 1

 	var/id_tag
-	var/frequency = 1439
+	var/frequency = ATMOS_VENTSCRUB
 	Mtoollink = 1
 	settagwhitelist = list("id_tag")

@@ -147,7 +147,7 @@

 	name = "Computer"

-	var/frequency = 1439
+	var/frequency = ATMOS_VENTSCRUB
 	var/show_sensors=1
 	var/list/sensors = list()
 	Mtoollink = 1
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -27,7 +27,6 @@
 	var/centcomm_message_cooldown = 0
 	var/tmp_alertlevel = 0

-	var/status_display_freq = "1435"
 	var/stat_msg1
 	var/stat_msg2
 	var/display_type="blank"
@@ -510,7 +509,7 @@

 /proc/post_status(command, data1, data2, mob/user = null)

-	var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435)
+	var/datum/radio_frequency/frequency = radio_controller.return_frequency(DISPLAY_FREQ)

 	if(!frequency) return

--- a/code/game/machinery/doors/airlock_control.dm
+++ b/code/game/machinery/doors/airlock_control.dm
@@ -236,7 +236,7 @@
 	power_channel = ENVIRON

 	var/master_tag
-	var/frequency = 1449
+	var/frequency = AIRLOCK_FREQ
 	var/command = "cycle"

 	var/datum/radio_frequency/radio_connection
--- a/code/game/machinery/doors/alarmlock.dm
+++ b/code/game/machinery/doors/alarmlock.dm
@@ -6,7 +6,7 @@
 	glass = 1
 	autoclose = 0
 	var/datum/radio_frequency/air_connection
-	var/air_frequency = 1437
+	var/air_frequency = ATMOS_FIRE_FREQ

 /obj/machinery/door/airlock/alarmlock/New()
 	..()
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -16,7 +16,7 @@
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 50

-	var/freq = 1449		// radio frequency
+	var/freq = AIRLOCK_FREQ		// radio frequency
 	var/electricity_level = 1 // intensity of the magnetic pull
 	var/magnetic_field = 1 // the range of magnetic attraction
 	var/code = 0 // frequency code, they should be different unless you have a group of magnets working together or something
@@ -181,7 +181,7 @@
 	anchored = 1.0
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 45
-	var/frequency = 1449
+	var/frequency = AIRLOCK_FREQ
 	var/code = 0
 	var/list/magnets = list()
 	var/title = "Magnetic Control Console"
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -30,7 +30,7 @@
 	var/index1			// display index for scrolling messages or 0 if non-scrolling
 	var/index2

-	var/frequency = 1435		// radio frequency
+	var/frequency = DISPLAY_FREQ		// radio frequency

 	var/friendc = 0      // track if Friend Computer mode
 	var/ignore_friendc = 0
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -3,7 +3,7 @@
 	desc = "Dance my monkeys! DANCE!!!"
 	icon_state = "electropack0"
 	item_state = "electropack"
-	frequency = 1449
+	frequency = AIRLOCK_FREQ
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
 	w_class = WEIGHT_CLASS_HUGE
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -18,7 +18,7 @@

 /obj/item/radio/intercom/interrogation
 	name = "station intercom (Interrogation)"
-	frequency  = 1449
+	frequency  = AIRLOCK_FREQ

 /obj/item/radio/intercom/private
 	name = "station intercom (Private)"
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -13,7 +13,7 @@
 	bomb_name = "remote-control bomb"

 	var/code = 30
-	var/frequency = 1457
+	var/frequency = RSD_FREQ
 	var/delay = 0
 	var/datum/radio_frequency/radio_connection
 	var/airlock_wire = null
--- a/code/modules/atmos_automation/console.dm
+++ b/code/modules/atmos_automation/console.dm
@@ -228,7 +228,7 @@
 	var/injector_tag="inc_in"
 	var/output_tag="inc_out"
 	var/sensor_tag="inc_sensor"
-	frequency=1449
+	frequency=AIRLOCK_FREQ
 	var/temperature=1000

 /obj/machinery/computer/general_air_control/atmos_automation/burnchamber/New()
@@ -310,7 +310,7 @@
 	var/o2_injector_tag="air_o2_in"
 	var/output_tag="air_out"
 	var/sensor_tag="air_sensor"
-	frequency=1443
+	frequency=ATMOS_DISTRO_FREQ
 	var/temperature=1000

 /obj/machinery/computer/general_air_control/atmos_automation/air_mixing/New()
--- a/code/modules/modular_computers/file_system/programs/command/comms.dm
+++ b/code/modules/modular_computers/file_system/programs/command/comms.dm
@@ -20,7 +20,6 @@
 	var/centcomm_message_cooldown = 0
 	var/tmp_alertlevel = 0

-	var/status_display_freq = "1435"
 	var/stat_msg1
 	var/stat_msg2
 	var/display_type="blank"
--- a/code/modules/pda/cart_apps.dm
+++ b/code/modules/pda/cart_apps.dm
@@ -28,7 +28,7 @@
 					post_status(href_list["statdisp"])

 /datum/data/pda/app/status_display/proc/post_status(var/command, var/data1, var/data2)
-	var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435)
+	var/datum/radio_frequency/frequency = radio_controller.return_frequency(DISPLAY_FREQ)
 	if(!frequency)
 		return

--- a/code/modules/pda/radio.dm
+++ b/code/modules/pda/radio.dm
@@ -162,7 +162,7 @@


 /obj/item/integrated_radio/signal
-	var/frequency = 1457
+	var/frequency = RSD_FREQ
 	var/code = 30.0
 	var/last_transmission
 	var/datum/radio_frequency/radio_connection
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -89,7 +89,7 @@
 /obj/machinery/power/emitter/multitool_menu(var/mob/user,var/obj/item/multitool/P)
 	return {"
 	<ul>
-		<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[1439]">Reset</a>)</li>
+		<li><b>Frequency:</b> <a href="?src=[UID()];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=[UID()];set_freq=[ENGINE_FREQ]">Reset</a>)</li>
 		<li>[format_tag("ID Tag","id_tag","set_id")]</a></li>
 	</ul>
 	"}
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -739,7 +739,7 @@
 	return 1

 /obj/machinery/computer/supplycomp/proc/post_signal(var/command)
-	var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435)
+	var/datum/radio_frequency/frequency = radio_controller.return_frequency(DISPLAY_FREQ)

 	if(!frequency) return