cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 13:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8196 from comma/master

Browse Source 
Fixes ship deceleration for south/east directions
This commit is contained in:
PsiOmegaDelta
2015-02-22 16:48:31 +01:00
parent 54c3456c59 9e1a2315cd
commit 3e2133fd9e
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/modules/overmap/_defines.dm
View File

@@ -22,17 +22,18 @@ proc/toggle_move_stars(zlevel, direction)
if (moving_levels["zlevel"] != gen_dir) if (moving_levels["zlevel"] != gen_dir)
moving_levels["zlevel"] = gen_dir moving_levels["zlevel"] = gen_dir
for(var/turf/space/S in world) for(var/x = 1 to world.maxx)
if(S.z == zlevel) for(var/y = 1 to world.maxy)
spawn(0) spawn(0)
var/turf/T = S var/turf/space/T = locate(x,y,zlevel)
if(!gen_dir) if (T)
T.icon_state = "[((T.x + T.y) ^ ~(T.x * T.y) + T.z) % 25]" if(!gen_dir)
else T.icon_state = "[((T.x + T.y) ^ ~(T.x * T.y) + T.z) % 25]"
T.icon_state = "speedspace_[gen_dir]_[rand(1,15)]" else
for(var/atom/movable/AM in T) T.icon_state = "speedspace_[gen_dir]_[rand(1,15)]"
if (!AM.anchored) for(var/atom/movable/AM in T)
AM.throw_at(get_step(T,reverse_direction(direction)), 5, 1) if (!AM.anchored)
AM.throw_at(get_step(T,reverse_direction(direction)), 5, 1)
//list used to cache empty zlevels to avoid nedless map bloat //list used to cache empty zlevels to avoid nedless map bloat

4
code/modules/overmap/ships/ship.dm
View File

@@ -76,9 +76,9 @@
/obj/effect/map/ship/proc/decelerate() /obj/effect/map/ship/proc/decelerate()
if(!is_still() && can_burn()) if(!is_still() && can_burn())
if (speed[1]) if (speed[1])
adjust_speed(-SIGN(speed[1]) * min(get_acceleration(),speed[1]), 0) adjust_speed(-SIGN(speed[1]) * min(get_acceleration(),abs(speed[1])), 0)
if (speed[2]) if (speed[2])
adjust_speed(0, -SIGN(speed[2]) * min(get_acceleration(),speed[2])) adjust_speed(0, -SIGN(speed[2]) * min(get_acceleration(),abs(speed[2])))
last_burn = world.time last_burn = world.time
/obj/effect/map/ship/proc/accelerate(direction) /obj/effect/map/ship/proc/accelerate(direction)