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

Merge pull request #7105 from VOREStation/pol-telenano

Browse Source 
Redo teleporter control in nanoui
This commit is contained in:
Atermonera
2020-05-10 15:39:29 -07:00
committed by GitHub
parent 54577cc012 ffe54ca240
commit c2b0769143
4 changed files with 185 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/teleportation.dm
+3 -3
View File
@@ -147,11 +147,11 @@ Frequency:
if(com)
break
break
if (istype(com, /obj/machinery/computer/teleporter) && com.locked && !com.one_time_use)
if (istype(com, /obj/machinery/computer/teleporter) && com.teleport_control.locked && !com.one_time_use)
if(R.icon_state == "tele1")
L["[com.id] (Active)"] = com.locked
L["[com.id] (Active)"] = com.teleport_control.locked
else
L["[com.id] (Inactive)"] = com.locked
L["[com.id] (Inactive)"] = com.teleport_control.locked
var/list/turfs = list( )
for(var/turf/T in orange(10))
if(T.x>world.maxx-8 || T.x<8) continue //putting them at the edge is dumb