cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

transmission_method could probably be enumerated through #define. Is neater. (#10406)

Browse Source 
* transmission_method-could-probably-be-enumerated-through-define.would-be-neater

* removes changelog
This commit is contained in:
Jiří Barouš
2020-11-03 03:12:23 +01:00
committed by GitHub
parent 3b9eb3137a
commit 0fc1345ddd
25 changed files with 52 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+1 -1
View File
@@ -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(
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+1 -1
View File
@@ -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(
code/ATMOSPHERICS/components/binary_devices/pump.dm
+1 -1
View File
@@ -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(
code/ATMOSPHERICS/components/unary/outlet_injector.dm
+9 -9
View File
@@ -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(
code/ATMOSPHERICS/components/unary/vent_pump.dm
+1 -1
View File
@@ -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(
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+1 -3
View File
@@ -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.")
code/__defines/radio.dm
+5 -4
View File
@@ -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.
code/controllers/subsystems/arrivals.dm
+1 -1
View File
@@ -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)
code/datums/radio/signal.dm
+1 -4
View File
@@ -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
code/game/machinery/alarm.dm
+2 -2
View File
@@ -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"
code/game/machinery/atmo_control.dm
+7 -7
View File
@@ -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,
code/game/machinery/atmoalter/meter.dm
+1 -1
View File
@@ -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",
code/game/machinery/bots/mulebot.dm
+1 -1
View File
@@ -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"])
code/game/machinery/computer/prisonshuttle.dm
+1 -1
View File
@@ -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
code/game/machinery/doors/airlock_control.dm
+4 -4
View File
@@ -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
code/game/machinery/magnet.dm
+2 -2
View File
@@ -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
code/game/machinery/navbeacon.dm
+1 -1
View File
@@ -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)
code/game/machinery/telecomms/broadcaster.dm
+2 -4
View File
@@ -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
code/game/machinery/telecomms/telecomunications.dm
+2 -11
View File
@@ -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"
code/game/objects/items/devices/PDA/radio.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/radio/radio.dm
+2 -3
View File
@@ -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 */
code/modules/mob/living/bot/cleanbot.dm
+1 -1
View File
@@ -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
code/modules/mob/living/bot/secbot.dm
+1 -1
View File
@@ -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"])
code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm
+1 -1
View File
@@ -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)
code/modules/modular_computers/file_system/programs/command/comm.dm
+2 -2
View File
@@ -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
return