cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-30 16:47:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes while waiting on PR

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-27 10:48:04 -04:00
parent 3ae9a118b1
commit b98027d050
5 changed files with 573 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/radio.dm
+6 -1
View File
@@ -361,6 +361,7 @@ var/global/list/default_medbay_channels = list(
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 ####//
@@ -475,7 +476,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)
@@ -523,8 +523,13 @@ var/global/list/default_medbay_channels = list(
//Nothing handled any sort of remote radio-ing and returned before now, just squawk on this zlevel.
return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
<<<<<<< refs/remotes/origin/master
src, message_pieces, displayname, jobname, real_name, M.voice_name,
filter_type, signal.data["compression"], using_map.get_map_levels(pos_z), connection.frequency, verb)
=======
src, message_pieces, displayname, jobname, real_name, M.voice_name,
filter_type, signal.data["compression"], using_map.get_map_levels(pos_z), connection.frequency, verb)
>>>>>>> Various fixes while waiting on PR
/obj/item/device/radio/hear_talk(mob/M, list/message_pieces, verb)