mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 22:47:59 +01:00
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
This commit is contained in:
@@ -165,7 +165,7 @@
|
||||
var/turf/simulated/T = loc
|
||||
if(T.to_be_destroyed)
|
||||
var/chance_of_deletion
|
||||
if (T.heat_capacity) //beware of division by zero
|
||||
if(T.heat_capacity) //beware of division by zero
|
||||
chance_of_deletion = T.max_fire_temperature_sustained / T.heat_capacity * 8 //there is no problem with prob(23456), min() was redundant --rastaf0
|
||||
else
|
||||
chance_of_deletion = 100
|
||||
|
||||
@@ -83,35 +83,35 @@ turf/CanPass(atom/movable/mover, turf/target, height=1.5,air_group=0)
|
||||
//alldir includes adjacent diagonal tiles that can share
|
||||
// air with both of the related adjacent cardinal tiles
|
||||
/turf/proc/GetAtmosAdjacentTurfs(alldir = 0)
|
||||
if (!istype(src, /turf/simulated))
|
||||
if(!istype(src, /turf/simulated))
|
||||
return list()
|
||||
|
||||
var/adjacent_turfs = list()
|
||||
|
||||
var/turf/simulated/curloc = src
|
||||
for (var/direction in cardinal)
|
||||
for(var/direction in cardinal)
|
||||
if(!(curloc.atmos_adjacent_turfs & direction))
|
||||
continue
|
||||
|
||||
var/turf/simulated/S = get_step(curloc, direction)
|
||||
if (istype(S))
|
||||
if(istype(S))
|
||||
adjacent_turfs += S
|
||||
if (!alldir)
|
||||
if(!alldir)
|
||||
return adjacent_turfs
|
||||
|
||||
for (var/direction in diagonals)
|
||||
for(var/direction in diagonals)
|
||||
var/matchingDirections = 0
|
||||
var/turf/simulated/S = get_step(curloc, direction)
|
||||
|
||||
for (var/checkDirection in cardinal)
|
||||
for(var/checkDirection in cardinal)
|
||||
if(!(S.atmos_adjacent_turfs & checkDirection))
|
||||
continue
|
||||
var/turf/simulated/checkTurf = get_step(S, checkDirection)
|
||||
|
||||
if (checkTurf in adjacent_turfs)
|
||||
if(checkTurf in adjacent_turfs)
|
||||
matchingDirections++
|
||||
|
||||
if (matchingDirections >= 2)
|
||||
if(matchingDirections >= 2)
|
||||
adjacent_turfs += S
|
||||
break
|
||||
|
||||
|
||||
@@ -246,14 +246,14 @@
|
||||
overlays -= icemaster
|
||||
|
||||
var/new_overlay_type = tile_graphic()
|
||||
if (new_overlay_type == atmos_overlay_type)
|
||||
if(new_overlay_type == atmos_overlay_type)
|
||||
return
|
||||
var/atmos_overlay = get_atmos_overlay_by_name(atmos_overlay_type)
|
||||
if (atmos_overlay)
|
||||
if(atmos_overlay)
|
||||
overlays -= atmos_overlay
|
||||
|
||||
atmos_overlay = get_atmos_overlay_by_name(new_overlay_type)
|
||||
if (atmos_overlay)
|
||||
if(atmos_overlay)
|
||||
overlays += atmos_overlay
|
||||
atmos_overlay_type = new_overlay_type
|
||||
|
||||
|
||||
Reference in New Issue
Block a user