mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-31 07:57:47 +01:00
- Fixed issue 702 and issue 716
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4460 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
+24
-23
@@ -144,7 +144,9 @@
|
||||
var/to_be_destroyed = 0 //Used for fire, if a melting temperature was reached, it will be destroyed
|
||||
var/max_fire_temperature_sustained = 0 //The max temperature of the fire which it was subjected to
|
||||
|
||||
|
||||
/turf/simulated/New()
|
||||
..()
|
||||
levelupdate()
|
||||
|
||||
/turf/simulated/wall
|
||||
name = "wall"
|
||||
@@ -299,28 +301,27 @@
|
||||
/turf/unsimulated/wall/other
|
||||
icon_state = "r_wall"
|
||||
|
||||
/turf/proc
|
||||
AdjacentTurfs()
|
||||
var/L[] = new()
|
||||
for(var/turf/simulated/t in oview(src,1))
|
||||
if(!t.density)
|
||||
if(!LinkBlocked(src, t) && !TurfBlockedNonWindow(t))
|
||||
L.Add(t)
|
||||
return L
|
||||
Distance(turf/t)
|
||||
if(get_dist(src,t) == 1)
|
||||
var/cost = (src.x - t.x) * (src.x - t.x) + (src.y - t.y) * (src.y - t.y)
|
||||
cost *= (pathweight+t.pathweight)/2
|
||||
return cost
|
||||
else
|
||||
return get_dist(src,t)
|
||||
AdjacentTurfsSpace()
|
||||
var/L[] = new()
|
||||
for(var/turf/t in oview(src,1))
|
||||
if(!t.density)
|
||||
if(!LinkBlocked(src, t) && !TurfBlockedNonWindow(t))
|
||||
L.Add(t)
|
||||
return L
|
||||
/turf/proc/AdjacentTurfs()
|
||||
var/L[] = new()
|
||||
for(var/turf/simulated/t in oview(src,1))
|
||||
if(!t.density)
|
||||
if(!LinkBlocked(src, t) && !TurfBlockedNonWindow(t))
|
||||
L.Add(t)
|
||||
return L
|
||||
/turf/proc/Distance(turf/t)
|
||||
if(get_dist(src,t) == 1)
|
||||
var/cost = (src.x - t.x) * (src.x - t.x) + (src.y - t.y) * (src.y - t.y)
|
||||
cost *= (pathweight+t.pathweight)/2
|
||||
return cost
|
||||
else
|
||||
return get_dist(src,t)
|
||||
/turf/proc/AdjacentTurfsSpace()
|
||||
var/L[] = new()
|
||||
for(var/turf/t in oview(src,1))
|
||||
if(!t.density)
|
||||
if(!LinkBlocked(src, t) && !TurfBlockedNonWindow(t))
|
||||
L.Add(t)
|
||||
return L
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -234,6 +234,7 @@
|
||||
|
||||
E.dir = old_dir
|
||||
E.icon_state = "engine"
|
||||
E.levelupdate()
|
||||
|
||||
/turf/simulated/Entered(atom/A, atom/OL)
|
||||
if (istype(A,/mob/living/carbon))
|
||||
@@ -296,6 +297,7 @@
|
||||
var/old_dir = dir
|
||||
var/turf/space/S = new /turf/space( locate(src.x, src.y, src.z) )
|
||||
S.dir = old_dir
|
||||
S.levelupdate()
|
||||
return S
|
||||
|
||||
/turf/proc/ReplaceWithLattice()
|
||||
@@ -304,6 +306,7 @@
|
||||
S.dir = old_dir
|
||||
S.sd_LumReset()
|
||||
new /obj/structure/lattice( locate(src.x, src.y, src.z) )
|
||||
S.levelupdate()
|
||||
return S
|
||||
|
||||
/turf/proc/ReplaceWithWall()
|
||||
@@ -313,6 +316,7 @@
|
||||
S.opacity = 0
|
||||
S.sd_NewOpacity(1)
|
||||
S.sd_LumReset()
|
||||
S.levelupdate()
|
||||
return S
|
||||
|
||||
/turf/proc/ReplaceWithRWall()
|
||||
@@ -322,6 +326,7 @@
|
||||
S.opacity = 0
|
||||
S.sd_NewOpacity(1)
|
||||
S.sd_LumReset()
|
||||
S.levelupdate()
|
||||
return S
|
||||
|
||||
/turf/proc/ReplaceWithMineralWall(var/ore)
|
||||
@@ -333,6 +338,7 @@
|
||||
S.mineral = ore
|
||||
S.New()//Hackish as fuck, but what can you do? -Sieve
|
||||
S.sd_LumReset()
|
||||
S.levelupdate()
|
||||
return S
|
||||
|
||||
//turf/simulated/wall/New()
|
||||
|
||||
Reference in New Issue
Block a user