cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7494 from VOREStation/upstream-merge-6990

Browse Source 
[MIRROR] Refactor telecomms and consoles to operate on logical zlevels
This commit is contained in:
Aronai Sieyes
2020-04-29 11:40:20 -04:00
committed by GitHub
parent 6dfef88a3c c2ca984d18
commit 3daef7673f
7 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/telecomms/broadcaster.dm
View File

@@ -88,7 +88,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
signal.data["compression"], signal.data["level"], signal.frequency,
signal.data["verb"], forced_radios)
/** #### - Simple Broadcast - #### **/
if(signal.data["type"] == SIGNAL_SIMPLE)
@@ -346,7 +345,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
var/data, var/compression, var/list/level, var/freq, var/verbage = "says",
var/list/forced_radios)
/* ###### Prepare the radio connection ###### */
var/display_freq = freq

11
code/game/objects/items/devices/radio/radio.dm
View File

@@ -287,7 +287,7 @@ var/global/list/default_medbay_channels = list(
/obj/item/device/radio/proc/autosay(var/message, var/from, var/channel, var/list/zlevels) //BS12 EDIT
var/datum/radio_frequency/connection = null
if(channel && channels && channels.len > 0)
if (channel == "department")
if(channel == "department")
channel = channels[1]
connection = secure_radio_connections[channel]
else
@@ -304,7 +304,7 @@ var/global/list/default_medbay_channels = list(
Broadcast_Message(connection, A,
0, "*garbled automated announcement*", src,
message_to_multilingual(message), from, "Automated Announcement", from, "synthesized voice",
4, 0, zlevels, connection.frequency, "states")
DATA_FAKE, 0, zlevels, connection.frequency, "states")
// Interprets the message mode when talking into a radio, possibly returning a connection datum
/obj/item/device/radio/proc/handle_message_mode(mob/living/M as mob, list/message_pieces, message_mode)
@@ -363,8 +363,8 @@ var/global/list/default_medbay_channels = list(
if(!istype(message_mode, /datum/radio_frequency))
return FALSE
var/datum/radio_frequency/connection = message_mode
var/pos_z = get_z(src)
var/datum/radio_frequency/connection = message_mode
//#### Tagging the signal with all appropriate identity values ####//
@@ -479,7 +479,6 @@ var/global/list/default_medbay_channels = list(
signal.transmission_method = TRANSMISSION_SUBSPACE
//#### Sending the signal to all subspace receivers ####//
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
R.receive_signal(signal)
@@ -494,7 +493,7 @@ var/global/list/default_medbay_channels = list(
else if(adhoc_fallback) //Less huzzah, we have to fallback
to_chat(loc, "<span class='warning'>\The [src] pings as it falls back to local radio transmission.</span>")
subspace_transmission = FALSE
else //Oh well
return FALSE
@@ -536,8 +535,6 @@ var/global/list/default_medbay_channels = list(
if(get_dist(src, M) <= canhear_range)
talk_into(M, message_pieces, null, verb)
/obj/item/device/radio/proc/receive_range(freq, level)
// check if this radio can receive on the given frequency, and if so,
// what the range is in which mobs will hear the radio