cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into byebye

Browse Source
This commit is contained in:
AffectedArc07
2020-06-22 20:02:11 +01:00
parent 8294741b50 c8a7607129
commit 456132f442
65 changed files with 171 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/teleportation.dm
+1 -1
View File
@@ -115,7 +115,7 @@ Frequency:
to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
return
var/list/L = list( )
for(var/obj/machinery/computer/teleporter/com in world)
for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
if(com.target)
if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
L["[com.id] (Active)"] = com.target
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -154,7 +154,7 @@
if(!E.teleporting)
var/list/L = list()
var/list/areaindex = list()
for(var/obj/machinery/telepad_cargo/R in world)
for(var/obj/machinery/telepad_cargo/R in GLOB.machines)
if(R.stage == 0)
var/turf/T = get_turf(R)
var/tmpname = T.loc.name
code/game/objects/structures/crates_lockers/crates.dm
+1 -1
View File
@@ -89,7 +89,7 @@
if(!E.teleporting)
var/list/L = list()
var/list/areaindex = list()
for(var/obj/machinery/telepad_cargo/R in world)
for(var/obj/machinery/telepad_cargo/R in GLOB.machines)
if(R.stage == 0)
var/turf/T = get_turf(R)
var/tmpname = T.loc.name