From fdce68fe66202fc82b35d8acffeb956739d204e5 Mon Sep 17 00:00:00 2001 From: Segrain Date: Sun, 28 Jul 2013 14:31:23 +0300 Subject: [PATCH 1/2] Magboots fix. --- code/ZAS/Airflow.dm | 2 +- code/modules/clothing/spacesuits/alien.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 3fd0c372bc8..894dc92c72b 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -312,7 +312,7 @@ proc/AirflowSpace(zone/A) if(src:buckled) return if(src:shoes) - if(src:shoes.type == /obj/item/clothing/shoes/magboots) + if(istype(src:shoes, /obj/item/clothing/shoes/magboots)) if(src:shoes.flags & NOSLIP) return src << "\red You are pushed away by airflow!" diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index be5112c41eb..7e9b18f5ef9 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -130,8 +130,9 @@ icon_state = "boots-vox" toggle() - name = "Toggle Floor Grip" - + //set name = "Toggle Floor Grip" + if(usr.stat) + return if(src.magpulse) src.flags &= ~NOSLIP src.magpulse = 0 From cd72596249832280d1719909d71308c042b8b25a Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Sun, 28 Jul 2013 19:11:05 -0700 Subject: [PATCH 2/2] Fixes a bug with heat transfer. --- code/ZAS/ZAS_Zones.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/ZAS/ZAS_Zones.dm b/code/ZAS/ZAS_Zones.dm index 026f6e3d45c..bc432289821 100644 --- a/code/ZAS/ZAS_Zones.dm +++ b/code/ZAS/ZAS_Zones.dm @@ -263,6 +263,9 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs ShareRatio( air , Z.air , connected_zones[Z] + unsimulated_boost) for(var/zone/Z in closed_connection_zones) + //If that zone has already processed, skip it. + if(Z.last_update > last_update) + continue if(air && Z.air) if( abs(air.temperature - Z.air.temperature) > vsc.connection_temperature_delta ) ShareHeat(air, Z.air, closed_connection_zones[Z])