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

Fixes conflict

Browse Source
This commit is contained in:
Novacat
2020-04-28 09:31:05 -04:00
committed by GitHub
parent b98027d050
commit 194f73ad98
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/radio.dm
-5
View File
@@ -523,13 +523,8 @@ 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)