Merge pull request #3744 from Baystation12/dev-freeze

BYOND AKBAR
This commit is contained in:
Chinsky
2013-10-10 02:45:45 -07:00
224 changed files with 19615 additions and 14847 deletions
+7 -1
View File
@@ -15,4 +15,10 @@
/obj/effect/decal/spraystill
density = 0
anchored = 1
layer = 50
layer = 50
//Used by spraybottles.
/obj/effect/decal/chempuff
name = "chemicals"
icon = 'icons/obj/chempuff.dmi'
pass_flags = PASSTABLE | PASSGRILLE
+3 -12
View File
@@ -1030,19 +1030,10 @@ steam.start() -- spawns the effect
proc/update_nearby_tiles(need_rebuild)
if(!air_master) return 0
if(!air_master)
return 0
var/turf/simulated/source = get_turf(src)
var/turf/simulated/north = get_step(source,NORTH)
var/turf/simulated/south = get_step(source,SOUTH)
var/turf/simulated/east = get_step(source,EAST)
var/turf/simulated/west = get_step(source,WEST)
if(istype(source)) air_master.tiles_to_update |= source
if(istype(north)) air_master.tiles_to_update |= north
if(istype(south)) air_master.tiles_to_update |= south
if(istype(east)) air_master.tiles_to_update |= east
if(istype(west)) air_master.tiles_to_update |= west
air_master.AddTurfToUpdate(get_turf(src))
return 1