diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 7bd00aba222..7a9597d3f6a 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -7,9 +7,6 @@ */ -#define STATION_Z 1 -#define TELECOMM_Z 3 - /obj/machinery/telecomms var/temp = "" // output message var/construct_op = 0 @@ -102,7 +99,7 @@ var/obj/machinery/constructable_frame/machine_frame/F = new F.loc = src.loc qdel(src) - + update_icon() /obj/machinery/telecomms/attack_ai(var/mob/user as mob) @@ -176,26 +173,6 @@ user << browse(dat, "window=tcommachine;size=520x500;can_resize=0") onclose(user, "dormitory") - -// Off-Site Relays -// -// You are able to send/receive signals from the station's z level (changeable in the STATION_Z #define) if -// the relay is on the telecomm satellite (changable in the TELECOMM_Z #define) - - -/obj/machinery/telecomms/relay/proc/toggle_level() - - var/turf/position = get_turf(src) - - // Toggle on/off getting signals from the station or the current Z level - if(src.listening_level == STATION_Z) // equals the station - src.listening_level = position.z - return 1 - else if(position.z == TELECOMM_Z) - src.listening_level = STATION_Z - return 1 - return 0 - // Returns a multitool from a user depending on their mobtype. /obj/machinery/telecomms/proc/get_multitool(mob/user as mob) @@ -241,8 +218,6 @@ /obj/machinery/telecomms/relay/Options_Menu() var/dat = "" - if(src.z == TELECOMM_Z) - dat += "
Signal Locked to Station: [listening_level == STATION_Z ? "TRUE" : "FALSE"]" dat += "
Broadcasting: [broadcasting ? "YES" : "NO"]" dat += "
Receiving: [receiving ? "YES" : "NO"]" return dat @@ -255,15 +230,6 @@ if(href_list["broadcast"]) broadcasting = !broadcasting temp = "-% Broadcasting mode changed. %-" - if(href_list["change_listening"]) - //Lock to the station OR lock to the current position! - //You need at least two receivers and two broadcasters for this to work, this includes the machine. - var/result = toggle_level() - if(result) - temp = "-% [src]'s signal has been successfully changed." - else - temp = "-% [src] could not lock it's signal onto the station. Two broadcasters or receivers required." - // BUS /obj/machinery/telecomms/bus/Options_Menu() @@ -403,6 +369,3 @@ if(issilicon(user) || in_range(user, src)) return 1 return 0 - -#undef TELECOMM_Z -#undef STATION_Z diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 914590eac46..4e97453a2cb 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -64,7 +64,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() continue if(amount && send_count >= amount) break - if(machine.loc.z != listening_level) + if(!machine.loc.z in listening_level) if(long_range_link == 0 && machine.long_range_link == 0) continue // If we're sending a copy, be sure to create the copy for EACH machine and paste the data @@ -448,7 +448,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() idle_power_usage = 600 machinetype = 3 delay = 5 - long_range_link = 1 circuitboard = "/obj/item/weapon/circuitboard/telecomms/processor" var/process_mode = 1 // 1 = Uncompress Signals, 0 = Compress Signals