Merge pull request #6565 from Mloc/bs12-fan

small fixes 2
This commit is contained in:
Chinsky
2014-10-01 13:39:35 +04:00
4 changed files with 17 additions and 9 deletions

View File

@@ -103,7 +103,7 @@ obj/item/check_airflow_movable(n)
density = 1
od = 1
while(airflow_speed > 0)
if(airflow_speed <= 0) return
if(airflow_speed <= 0) break
airflow_speed = min(airflow_speed,15)
airflow_speed -= vsc.airflow_speed_decay
if(airflow_speed > 7)
@@ -120,9 +120,9 @@ obj/item/check_airflow_movable(n)
if ((!( src.airflow_dest ) || src.loc == src.airflow_dest))
src.airflow_dest = locate(min(max(src.x + xo, 1), world.maxx), min(max(src.y + yo, 1), world.maxy), src.z)
if ((src.x == 1 || src.x == world.maxx || src.y == 1 || src.y == world.maxy))
return
break
if(!istype(loc, /turf))
return
break
step_towards(src, src.airflow_dest)
if(ismob(src) && src:client)
src:client:move_delay = world.time + vsc.airflow_mob_slowdown