diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 4d5e66b58a7..d317a1565f6 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -175,7 +175,7 @@ return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = list( diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index fa332d243b0..fc2a0b7fcb7 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -112,7 +112,7 @@ return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = list( diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 252792e3ea6..6c3c28ae811 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -108,7 +108,7 @@ Thus, the two variables affect pump operation are set in New(): return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = list( diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm index 0f735145fae..9f5c645e2b7 100644 --- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm @@ -1,4 +1,4 @@ -//Basically a one way passive valve. If the pressure inside is greater than the environment then gas will flow passively, +//Basically a one way passive valve. If the pressure inside is greater than the environment then gas will flow passively, //but it does not permit gas to flow back from the environment into the injector. Can be turned off to prevent any gas flow. //When it receives the "inject" signal, it will try to pump it's entire contents into the environment regardless of pressure, using power. @@ -14,7 +14,7 @@ use_power = 0 idle_power_usage = 150 //internal circuitry, friction losses and stuff power_rating = 15000 //15000 W ~ 20 HP - + var/injecting = 0 var/volume_rate = 50 //flow rate limit @@ -29,7 +29,7 @@ /obj/machinery/atmospherics/unary/outlet_injector/Initialize() . = ..() - air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP + 500 //Give it a small reservoir for injecting. Also allows it to have a higher flow rate limit than vent pumps, to differentiate injectors a bit more. + air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP + 500 //Give it a small reservoir for injecting. Also allows it to have a higher flow rate limit than vent pumps, to differentiate injectors a bit more. /obj/machinery/atmospherics/unary/outlet_injector/update_icon() if(!powered()) @@ -66,18 +66,18 @@ var/power_draw = -1 var/datum/gas_mixture/environment = loc.return_air() - + if(environment && air_contents.temperature > 0) var/transfer_moles = (volume_rate/air_contents.volume)*air_contents.total_moles //apply flow rate limit power_draw = pump_gas(src, air_contents, environment, transfer_moles, power_rating) - + if (power_draw >= 0) last_power_draw = power_draw use_power(power_draw) - + if(network) network.update = 1 - + return 1 /obj/machinery/atmospherics/unary/outlet_injector/proc/inject() @@ -87,7 +87,7 @@ var/datum/gas_mixture/environment = loc.return_air() if (!environment) return 0 - + injecting = 1 if(air_contents.temperature > 0) @@ -110,7 +110,7 @@ return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = list( diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index f743bc990a3..cc24b43dec4 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -236,7 +236,7 @@ return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = list( diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index d09368e9fb4..7a756fda16b 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -104,7 +104,7 @@ return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = list( "area" = area_uid, @@ -341,5 +341,3 @@ to_chat(user, "You are too far away to read the gauge.") if(welded) to_chat(user, "It seems welded shut.") - - diff --git a/code/__defines/radio.dm b/code/__defines/radio.dm index 533f01d5a8b..e688506df50 100644 --- a/code/__defines/radio.dm +++ b/code/__defines/radio.dm @@ -54,7 +54,7 @@ var/list/radiochannels = list( // central command channels, i.e deathsquid & response teams var/list/CENT_FREQS = list( - ERT_FREQ, + ERT_FREQ, DTH_FREQ ) @@ -65,7 +65,7 @@ var/list/CENT_FREQS_ASSOC = list( // Antag channels, i.e. Syndicate var/list/ANTAG_FREQS = list( - SYND_FREQ, + SYND_FREQ, RAID_FREQ, NINJ_FREQ, BURG_FREQ @@ -103,8 +103,9 @@ var/list/DEPT_FREQS_ASSOC = list( "[ENT_FREQ]" = TRUE ) -#define TRANSMISSION_WIRE 0 -#define TRANSMISSION_RADIO 1 +#define TRANSMISSION_WIRE 0 // Wired transmission, unused at the moment +#define TRANSMISSION_RADIO 1 +#define TRANSMISSION_SUBSPACE 2 /* filters */ //When devices register with the radio controller, they might register under a certain filter. diff --git a/code/controllers/subsystems/arrivals.dm b/code/controllers/subsystems/arrivals.dm index 1e39083fd38..0285a511c05 100644 --- a/code/controllers/subsystems/arrivals.dm +++ b/code/controllers/subsystems/arrivals.dm @@ -91,7 +91,7 @@ var/datum/signal/status_signal = new status_signal.source = src - status_signal.transmission_method = 1 + status_signal.transmission_method = TRANSMISSION_RADIO status_signal.data["command"] = command frequency.post_signal(src, status_signal, RADIO_ARRIVALS) diff --git a/code/datums/radio/signal.dm b/code/datums/radio/signal.dm index f098dad49ee..39ce0e953eb 100644 --- a/code/datums/radio/signal.dm +++ b/code/datums/radio/signal.dm @@ -1,10 +1,7 @@ /datum/signal var/obj/source - var/transmission_method = 0 //unused at the moment - //0 = wire - //1 = radio transmission - //2 = subspace transmission + var/transmission_method = TRANSMISSION_WIRE var/list/data = list() var/encryption diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 342714fbd18..0cef2c02788 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -373,7 +373,7 @@ return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = command @@ -434,7 +434,7 @@ var/datum/signal/alert_signal = new alert_signal.source = src - alert_signal.transmission_method = 1 + alert_signal.transmission_method = TRANSMISSION_RADIO alert_signal.data["zone"] = alarm_area.name alert_signal.data["type"] = "Atmospheric" diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index b671335953f..76dbba1ff18 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -29,7 +29,7 @@ /obj/machinery/air_sensor/machinery_process() if(on) var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.data["tag"] = id_tag signal.data["timestamp"] = world.time @@ -185,7 +185,7 @@ obj/machinery/computer/general_air_control/Destroy() if(!radio_connection) return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src if(href_list["in_refresh_status"]) input_info = null @@ -271,7 +271,7 @@ obj/machinery/computer/general_air_control/Destroy() if(!radio_connection) return var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src if(href_list["in_refresh_status"]) input_info = null @@ -332,7 +332,7 @@ obj/machinery/computer/general_air_control/Destroy() injecting = 1 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = list( @@ -375,7 +375,7 @@ obj/machinery/computer/general_air_control/Destroy() return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = list( "tag" = device_tag, @@ -394,7 +394,7 @@ obj/machinery/computer/general_air_control/Destroy() return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = list( "tag" = device_tag, @@ -409,7 +409,7 @@ obj/machinery/computer/general_air_control/Destroy() return 0 var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.data = list( "tag" = device_tag, diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 5162cb0396b..42de388b611 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -54,7 +54,7 @@ var/datum/signal/signal = new signal.source = src - signal.transmission_method = 1 + signal.transmission_method = TRANSMISSION_RADIO signal.data = list( "tag" = id, "device" = "AM", diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index eb5f1fac0d9..ad181c21fd7 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -805,7 +805,7 @@ var/datum/signal/signal = new() signal.source = src - signal.transmission_method = 1 + signal.transmission_method = TRANSMISSION_RADIO signal.data = keyval if (signal.data["findbeacon"]) diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index bd690d8d7d6..3faab78468c 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -146,7 +146,7 @@ var/prison_shuttle_timeleft = 0 if(!frequency) return var/datum/signal/status_signal = new status_signal.source = src - status_signal.transmission_method = 1 + status_signal.transmission_method = TRANSMISSION_RADIO status_signal.data["command"] = command frequency.post_signal(src, status_signal) return diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 2ef8484c73c..6c9ae57b6c5 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -106,7 +106,7 @@ /obj/machinery/door/airlock/proc/send_status(var/bumped = 0) if(radio_connection) var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.data["tag"] = id_tag signal.data["timestamp"] = world.time @@ -184,7 +184,7 @@ /obj/machinery/airlock_sensor/attack_hand(mob/user) var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.data["tag"] = master_tag signal.data["command"] = command @@ -198,7 +198,7 @@ if(abs(pressure - previousPressure) > 0.001 || previousPressure == null) var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.data["tag"] = id_tag signal.data["timestamp"] = world.time signal.data["pressure"] = num2text(pressure) @@ -271,7 +271,7 @@ else if(radio_connection) var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal + signal.transmission_method = TRANSMISSION_RADIO signal.data["tag"] = master_tag signal.data["command"] = command diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index af304b2aaad..72eeaf55f71 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -275,7 +275,7 @@ // Prepare signal beforehand, because this is a radio operation var/datum/signal/signal = new - signal.transmission_method = 1 // radio transmission + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.frequency = frequency signal.data["code"] = code @@ -341,7 +341,7 @@ // Prepare the radio signal var/datum/signal/signal = new - signal.transmission_method = 1 // radio transmission + signal.transmission_method = TRANSMISSION_RADIO signal.source = src signal.frequency = frequency signal.data["code"] = code diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 3cec5671912..26696c68b49 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -93,7 +93,7 @@ var/global/list/navbeacons // no I don't like putting this in, but it will do var/datum/signal/signal = new() signal.source = src - signal.transmission_method = 1 + signal.transmission_method = TRANSMISSION_RADIO signal.data["beacon"] = location for(var/key in codes) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 99118a82321..09ef9b57b18 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -635,7 +635,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // First, we want to generate a new radio signal var/datum/signal/signal = new - signal.transmission_method = 2 // 2 would be a subspace transmission. + signal.transmission_method = TRANSMISSION_SUBSPACE var/turf/pos = get_turf(src) // --- Finally, tag the actual signal with the appropriate values --- @@ -666,7 +666,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // First, we want to generate a new radio signal var/datum/signal/signal = new - signal.transmission_method = 2 // 2 would be a subspace transmission. + signal.transmission_method = TRANSMISSION_SUBSPACE // --- Finally, tag the actual signal with the appropriate values --- signal.data = list( @@ -686,5 +686,3 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept R.receive_signal(signal) return signal - - diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index e775c2cf9dd..039561a75b7 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -63,7 +63,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() var/datum/signal/copy if(copysig) copy = new - copy.transmission_method = 2 + copy.transmission_method = TRANSMISSION_SUBSPACE copy.frequency = signal.frequency copy.data = signal.data.Copy() @@ -263,10 +263,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() if(!check_receive_level(signal)) return - if(signal.transmission_method == 2) - + if(signal.transmission_method == TRANSMISSION_SUBSPACE) if(is_freq_listening(signal)) // detect subspace signals - //Remove the level and then start adding levels that it is being broadcasted in. signal.data["level"] = list() @@ -628,10 +626,3 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() var/name = "data packet (#)" var/garbage_collector = 1 // if set to 0, will not be garbage collected var/input_type = "Speech File" - - - - - - - diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index 455f7efcd67..d4c2dc08790 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -24,7 +24,7 @@ var/datum/signal/signal = new() signal.source = src - signal.transmission_method = 1 + signal.transmission_method = TRANSMISSION_RADIO signal.data[key] = value if(key2) signal.data[key2] = value2 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 8ea33bfff20..2b4c4cc1554 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -408,8 +408,7 @@ var/global/list/default_medbay_channels = list( return // First, we want to generate a new radio signal var/datum/signal/signal = new - signal.transmission_method = 2 // 2 would be a subspace transmission. - // transmission_method could probably be enumerated through #define. Would be neater. + signal.transmission_method = TRANSMISSION_SUBSPACE // --- Finally, tag the actual signal with the appropriate values --- signal.data = list( @@ -466,7 +465,7 @@ var/global/list/default_medbay_channels = list( var/datum/signal/signal = new - signal.transmission_method = 2 + signal.transmission_method = TRANSMISSION_SUBSPACE /* --- Try to send a normal subspace broadcast first */ diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index 06773f32ed4..0a0aaf30f91 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -174,7 +174,7 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th var/datum/signal/signal = new() signal.source = src - signal.transmission_method = 1 + signal.transmission_method = TRANSMISSION_RADIO signal.data = list("findbeacon" = "patrol") frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS) signal_sent = world.time diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 939cfd66977..3ad3117875c 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -452,7 +452,7 @@ var/datum/signal/signal = new() signal.source = secbot - signal.transmission_method = 1 + signal.transmission_method = TRANSMISSION_RADIO signal.data = keyval.Copy() if(signal.data["findbeacon"]) diff --git a/code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm b/code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm index 67ada1d53bb..6b6d33ee2dd 100644 --- a/code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm +++ b/code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm @@ -258,7 +258,7 @@ var/datum/signal/status_signal = new status_signal.source = src - status_signal.transmission_method = 1 + status_signal.transmission_method = TRANSMISSION_RADIO status_signal.data["command"] = command frequency.post_signal(src, status_signal) diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index e51e4171b18..b9dab79d78b 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -343,7 +343,7 @@ Command action procs var/datum/signal/status_signal = new - status_signal.transmission_method = TRUE + status_signal.transmission_method = TRANSMISSION_RADIO status_signal.data["command"] = command switch(command) @@ -452,4 +452,4 @@ Command action procs log_game("[user? key_name(user) : "Autotransfer"] has called the shuttle.") message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1) - return \ No newline at end of file + return