From 75f492f4165d1383b2eff52a89db7a07c427c779 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 30 Dec 2017 14:54:29 -0500 Subject: [PATCH 1/3] Always use the area name when selecting a teleport beacon --- code/game/machinery/computer/teleporter.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index 7261c44fc5..093f62c625 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -161,12 +161,18 @@ var/list/areaindex = list() if(regime_set == "Teleporter") for(var/obj/item/device/radio/beacon/R in GLOB.teleportbeacons) +<<<<<<< HEAD var/turf/T = get_turf(R) if(!T) continue if(T.z == ZLEVEL_CENTCOM || T.z > ZLEVEL_SPACEMAX) continue L[avoid_assoc_duplicate_keys(T.loc.name, areaindex)] = R +======= + if(is_eligible(R)) + var/area/A = get_area(R) + L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R +>>>>>>> 646672e... Merge pull request #33917 from AutomaticFrenzy/patch/beacon-name for(var/obj/item/implant/tracking/I in GLOB.tracked_implants) if(!I.imp_in || !ismob(I.loc)) @@ -192,12 +198,18 @@ to_chat(user, "No connected stations located.") return for(var/obj/machinery/teleport/station/R in S) +<<<<<<< HEAD var/turf/T = get_turf(R) if(!T || !R.teleporter_hub || !R.teleporter_console) continue if(T.z == ZLEVEL_CENTCOM || T.z > ZLEVEL_SPACEMAX) continue L[avoid_assoc_duplicate_keys(T.loc.name, areaindex)] = R +======= + if(is_eligible(R)) + var/area/A = get_area(R) + L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R +>>>>>>> 646672e... Merge pull request #33917 from AutomaticFrenzy/patch/beacon-name var/desc = input("Please select a station to lock in.", "Locking Computer") as null|anything in L target = L[desc] if(target) From 4899131230fff4d82891fb4ff15f18687e99e86d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 1 Jan 2018 04:06:14 -0600 Subject: [PATCH 2/3] Update teleporter.dm --- code/game/machinery/computer/teleporter.dm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index 093f62c625..63af21ffb7 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -161,18 +161,9 @@ var/list/areaindex = list() if(regime_set == "Teleporter") for(var/obj/item/device/radio/beacon/R in GLOB.teleportbeacons) -<<<<<<< HEAD - var/turf/T = get_turf(R) - if(!T) - continue - if(T.z == ZLEVEL_CENTCOM || T.z > ZLEVEL_SPACEMAX) - continue - L[avoid_assoc_duplicate_keys(T.loc.name, areaindex)] = R -======= if(is_eligible(R)) var/area/A = get_area(R) L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R ->>>>>>> 646672e... Merge pull request #33917 from AutomaticFrenzy/patch/beacon-name for(var/obj/item/implant/tracking/I in GLOB.tracked_implants) if(!I.imp_in || !ismob(I.loc)) @@ -221,4 +212,4 @@ trg.teleporter_hub.update_icon() if(trg.teleporter_console) trg.teleporter_console.stat &= ~NOPOWER - trg.teleporter_console.update_icon() \ No newline at end of file + trg.teleporter_console.update_icon() From 07adb3fdd636f2ac3845145e0d6e6adda8f862bc Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 1 Jan 2018 04:06:33 -0600 Subject: [PATCH 3/3] Update teleporter.dm --- code/game/machinery/computer/teleporter.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index 63af21ffb7..56a583fff6 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -189,18 +189,9 @@ to_chat(user, "No connected stations located.") return for(var/obj/machinery/teleport/station/R in S) -<<<<<<< HEAD - var/turf/T = get_turf(R) - if(!T || !R.teleporter_hub || !R.teleporter_console) - continue - if(T.z == ZLEVEL_CENTCOM || T.z > ZLEVEL_SPACEMAX) - continue - L[avoid_assoc_duplicate_keys(T.loc.name, areaindex)] = R -======= if(is_eligible(R)) var/area/A = get_area(R) L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R ->>>>>>> 646672e... Merge pull request #33917 from AutomaticFrenzy/patch/beacon-name var/desc = input("Please select a station to lock in.", "Locking Computer") as null|anything in L target = L[desc] if(target)