From e514eb0f36be0b66178f4d0944bc3eb1a28b28f5 Mon Sep 17 00:00:00 2001 From: MrStonedOne Date: Mon, 4 Apr 2016 14:22:11 -0700 Subject: [PATCH] fixes some bugs with excited groups and ssair under duncmos --- code/controllers/subsystem/air.dm | 3 ++- .../environmental/LINDA_turf_tile.dm | 17 ++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 14c8022f51e..45b41960842 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -275,7 +275,8 @@ var/datum/subsystem/air/SSair continue var/turf/open/T = t - + if(!istype(T)) + continue T.excited = 0 T.update_visuals() diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index f0e0d3f67ad..2b549f55708 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -271,22 +271,25 @@ /datum/excited_group/proc/self_breakdown() var/datum/gas_mixture/A = new + + //make local for sanic speed var/list/A_gases = A.gases + var/list/turf_list = src.turf_list + var/turflen = turf_list.len for(var/t in turf_list) var/turf/open/T = t A.merge(T.air) + for(var/id in A_gases) + A_gases[id][MOLES] = A_gases[id][MOLES]/turflen + for(var/t in turf_list) var/turf/open/T = t - var/T_gases = T.air.gases - - for(var/id in A_gases) - T.air.assert_gas(id) - T_gases[id][MOLES] = A_gases[id][MOLES]/turf_list.len - + T.air.copy_from(A) T.update_visuals() - breakdown_cooldown = 0 + + breakdown_cooldown = 0 /datum/excited_group/proc/dismantle() for(var/t in turf_list)