cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

z6 mapmerge, teleportation.dm refactor, stop bluespace tomatoes working in tele_proof areas

Browse Source
This commit is contained in:
Kyep
2018-08-02 09:03:17 -07:00
parent 102ff67095
commit ce4775c6af
3 changed files with 850 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/teleportation.dm
+7 -4
View File
@@ -120,13 +120,16 @@ Frequency:
L["[com.id] (Active)"] = com.target
else
L["[com.id] (Inactive)"] = com.target
var/list/turfs = list( )
var/list/turfs = list()
var/area/A
for(var/turf/T in orange(10))
if(T.x>world.maxx-8 || T.x<8) continue //putting them at the edge is dumb
if(T.y>world.maxy-8 || T.y<8) continue
if(T.x>world.maxx-8 || T.x<8)
continue //putting them at the edge is dumb
if(T.y>world.maxy-8 || T.y<8)
continue
A = get_area(T)
if(A.tele_proof == 1) continue // Telescience-proofed areas require a beacon.
if(A.tele_proof == 1)
continue // Telescience-proofed areas require a beacon.
turfs += T
if(turfs.len)
L["None (Dangerous)"] = pick(turfs)