Merge pull request #1128 from Fox-McCloud/LINDA-Fixes

More Linda Fixes
This commit is contained in:
ZomgPonies
2015-05-22 17:22:20 -04:00
10 changed files with 25 additions and 26 deletions
+2
View File
@@ -1034,11 +1034,13 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
if(toupdate.len)
for(var/turf/simulated/T1 in toupdate)
air_master.remove_from_active(T1)
T1.CalculateAdjacentTurfs()
air_master.add_to_active(T1,1)
if(fromupdate.len)
for(var/turf/simulated/T2 in fromupdate)
air_master.remove_from_active(T2)
T2.CalculateAdjacentTurfs()
air_master.add_to_active(T2,1)
+1 -1
View File
@@ -399,7 +399,7 @@
expel_gas = air_contents.remove(remove_amount)
expel_gas.temperature = T20C // Lets expel hot gas and see if that helps people not die as they are removed
loc.assume_air(expel_gas)
air_update_turf(1)
air_update_turf()
/obj/machinery/atmospherics/unary/cryo_cell/proc/go_out()
if(!( occupant ))
+1
View File
@@ -28,6 +28,7 @@
/obj/structure/alien/resin/New(location)
relativewall_neighbours()
..()
air_update_turf(1)
return
/obj/structure/alien/resin/Destroy()
+2 -2
View File
@@ -95,7 +95,7 @@ RCD
if(useResource(1, user))
user << "Building Floor..."
activate()
A:ChangeTurf(/turf/simulated/floor/plating/airless)
A:ChangeTurf(/turf/simulated/floor/plating)
return 1
return 0
@@ -134,7 +134,7 @@ RCD
if(do_after(user, 40))
if(!useResource(5, user)) return 0
activate()
A:ChangeTurf(/turf/simulated/floor/plating/airless)
A:ChangeTurf(/turf/simulated/floor/plating)
return 1
return 0
@@ -356,18 +356,12 @@
var/datum/gas_mixture/G = T.air
if(get_dist(T, src) < 2) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air
G.temperature = 2
air_update_turf()
var/hotspot = (locate(/obj/effect/hotspot) in T)
if(hotspot && !istype(T, /turf/space))
var/CT = 10
var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() )
lowertemp.temperature = max( min(lowertemp.temperature-(CT*1000),lowertemp.temperature / CT) ,0)
lowertemp.react()
T.assume_air(lowertemp)
qdel(hotspot)
if(G.toxins)
G.nitrogen += (G.toxins)
G.toxins = 0
T.air_update_turf()
for(var/obj/effect/hotspot/H in T)
H.Kill()
if(G.toxins)
G.nitrogen += (G.toxins)
G.toxins = 0
for(var/obj/machinery/atmospherics/unary/vent_pump/V in T)
V.welded = 1
V.update_icon()
@@ -90,7 +90,7 @@
state = 1
update_icon()
isSwitchingStates = 0
air_update_turf()
air_update_turf(1)
proc/Close()
isSwitchingStates = 1
@@ -102,7 +102,7 @@
state = 0
update_icon()
isSwitchingStates = 0
air_update_turf()
air_update_turf(1)
update_icon()
if(state)
+2 -2
View File
@@ -403,7 +403,7 @@ var/global/wcColored
/obj/structure/window/plasmabasic/New(Loc,re=0)
..()
ini_dir = dir
air_update_turf()
air_update_turf(1)
update_nearby_icons()
return
@@ -434,7 +434,7 @@ var/global/wcColored
/obj/structure/window/plasmareinforced/New(Loc,re=0)
..()
ini_dir = dir
air_update_turf()
air_update_turf(1)
update_nearby_icons()
return
+4 -4
View File
@@ -244,10 +244,6 @@
for(var/turf/space/S in range(W,1))
S.update_starlight()
W.levelupdate()
W.air_update_turf(1)
. = W
affecting_lights = old_affecting_lights
if((old_opacity != opacity) || (dynamic_lighting != old_dynamic_lighting))
reconsider_lights()
@@ -257,6 +253,10 @@
else
lighting_clear_overlays()
W.levelupdate()
W.air_update_turf(1)
return W
//////Assimilate Air//////
/turf/simulated/proc/Assimilate_Air()
if(air)
+2 -2
View File
@@ -158,8 +158,8 @@
air_update_turf()
if(master)
del(master)
del(src)
qdel(master)
qdel(src)
/obj/item/weapon/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out.
var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
+3 -1
View File
@@ -642,7 +642,9 @@
// called to vent all gas in holder to a location
proc/vent_gas(var/atom/location)
location.assume_air(gas) // vent all gas to turf
if(location)
location.assume_air(gas) // vent all gas to turf
air_update_turf()
return
// Disposal pipes