Teleporter computer now shows renamed beacons (#41407)

I suspect this was intended, since the beacon already has code for renaming it
via pen and a "renamed" variable that gets updated when the beacon is renamed.
In any case, it's now consistent with tracking implants, which already show the
name of the person implanted.

This change only affects the list popup. Once the beacon is selected, the TGUI
window shows the actual destination (also just like tracking implants)
This commit is contained in:
zxaber
2018-11-19 16:48:05 -08:00
committed by Tad Hardesty
parent c7beaca23b
commit f0e4f38850
+6 -3
View File
@@ -120,8 +120,11 @@
if(regime_set == "Teleporter")
for(var/obj/item/beacon/R in GLOB.teleportbeacons)
if(is_eligible(R))
var/area/A = get_area(R)
L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R
if(R.renamed)
L[avoid_assoc_duplicate_keys("[R.name] ([get_area(R)])", areaindex)] = R
else
var/area/A = get_area(R)
L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R
for(var/obj/item/implant/tracking/I in GLOB.tracked_implants)
if(!I.imp_in || !isliving(I.loc) || !I.allow_teleport)
@@ -132,7 +135,7 @@
if(M.timeofdeath + I.lifespan_postmortem < world.time)
continue
if(is_eligible(I))
L[avoid_assoc_duplicate_keys(M.real_name, areaindex)] = I
L[avoid_assoc_duplicate_keys("[M.real_name] ([get_area(M)])", areaindex)] = I
var/desc = input("Please select a location to lock in.", "Locking Computer") as null|anything in L
target = L[desc]