diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index ea839b87298..9c628b963e3 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -86,7 +86,7 @@ obj/item/check_airflow_movable(n) return if(src:shoes) if(istype(src:shoes, /obj/item/clothing/shoes/magboots)) - if(src:shoes:magpulse) + if(src:shoes.flags & NOSLIP) return src << "\red You are sucked away by airflow!" var/airflow_falloff = 9 - ul_FalloffAmount(airflow_dest) //It's a fast falloff calc. Very useful. diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 2c49dba8b45..d7327f87ec7 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -112,7 +112,7 @@ Class Procs: var/global/gl_uid = 1 var/custom_aghost_alerts=0 var/panel_open = 0 - var/area/myArea + var/myArea /obj/machinery/New() addAtProcessing() diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index f63a0fc2644..ebfdc10c312 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -56,17 +56,21 @@ /obj/machinery/proc/use_power(var/amount, var/chan = -1, var/autocalled = 0) // defaults to power_channel - var/area/A = getArea() + var/A = getArea() - if(!A || !isarea(A) || !A.master) + if(!A || !isarea(A)) return - if(chan == -1) + var/area/B = A + + if (!B.master) + return + + if (-1 == chan) chan = power_channel - A.master.use_power(amount, chan) - if(!autocalled) - A.master.powerupdate = 2 // Decremented by 2 each GC tick, since it's not auto power change we're going to update power twice. + + B.master.use_power(amount, chan) /obj/machinery/proc/power_change() // called whenever the power settings of the containing area change // by default, check equipment channel & set flag