Merge pull request #2096 from Aranclanos/SweetLindaNobodyWillTouchYou

Small fixes for Linda.
This commit is contained in:
Giacom
2013-12-21 13:57:15 -08:00
9 changed files with 30 additions and 22 deletions
+13 -6
View File
@@ -200,14 +200,21 @@ turf/CanPass(atom/movable/mover, turf/target, height=1.5,air_group=0)
T.atmos_adjacent_turfs &= ~counterdir
/atom/movable/proc/air_update_turf(var/command = 0)
if(istype(loc,/turf))
for(var/turf/T in locs) // used by double wide doors and other nonexistant multitile structures
if(command)
T.CalculateAdjacentTurfs()
if(air_master)
air_master.add_to_active(T,command)
if(!istype(loc,/turf) && command)
return
for(var/turf/T in locs) // used by double wide doors and other nonexistant multitile structures
T.air_update_turf(command)
/turf/proc/air_update_turf(var/command = 0)
if(command)
CalculateAdjacentTurfs()
if(air_master)
air_master.add_to_active(src,command)
/atom/movable/proc/move_update_air(var/turf/T)
if(istype(T,/turf))
T.air_update_turf(1)
air_update_turf(1)
/atom/movable/proc/atmos_spawn_air(var/text, var/amount) //because a lot of people loves to copy paste awful code lets just make a easy proc to spawn your plasma fires
var/turf/simulated/T = get_turf(src)
+2 -2
View File
@@ -67,9 +67,9 @@
return
/obj/machinery/door/Move()
air_update_turf(1)
var/turf/T = loc
..()
air_update_turf(1)
move_update_air(T)
/obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(air_group) return 0
+2 -2
View File
@@ -22,9 +22,9 @@
..()
/obj/machinery/shield/Move()
air_update_turf(1)
var/turf/T = loc
..()
air_update_turf(1)
move_update_air(T)
/obj/machinery/shield/CanPass(atom/movable/mover, turf/target, height, air_group)
if(!height || air_group) return 0
+2 -3
View File
@@ -35,10 +35,9 @@
return
/obj/structure/alien/resin/Move()
air_update_turf(1)
var/turf/T = loc
..()
air_update_turf(1)
return
move_update_air(T)
/obj/structure/alien/resin/CanAtmosPass()
return !density
+2 -2
View File
@@ -923,9 +923,9 @@ steam.start() -- spawns the effect
..()
Move()
air_update_turf(1)
var/turf/T = loc
..()
air_update_turf(1)
move_update_air(T)
proc/updateicon()
if(metal == 1)
@@ -30,9 +30,9 @@
return
Move()
air_update_turf(1)
var/turf/T = loc
..()
air_update_turf(1)
move_update_air(T)
Bumped(atom/user)
..()
@@ -37,9 +37,9 @@ obj/structure/windoor_assembly/Del()
..()
/obj/structure/windoor_assembly/Move()
air_update_turf(1)
var/turf/T = loc
..()
air_update_turf(1)
move_update_air(T)
/obj/structure/windoor_assembly/update_icon()
icon_state = "[facing]_[secure]windoor_assembly[state]"
+2 -2
View File
@@ -301,10 +301,10 @@
/obj/structure/window/Move()
air_update_turf(1)
var/turf/T = loc
..()
dir = ini_dir
air_update_turf(1)
move_update_air(T)
/obj/structure/window/CanAtmosPass(turf/T)
if(get_dir(loc, T) == dir)
+3 -1
View File
@@ -156,6 +156,7 @@
ground_zero.assume_air(air_contents)
ground_zero.hotspot_expose(1000, 125)
air_update_turf()
if(master)
del(master)
del(src)
@@ -165,4 +166,5 @@
var/turf/simulated/T = get_turf(src)
if(!T)
return
T.assume_air(removed)
T.assume_air(removed)
air_update_turf()