mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-09 16:07:40 +00:00
fixes
This commit is contained in:
@@ -17,7 +17,7 @@ GLOBAL_VAR_INIT(glide_size_multiplier, 1.0)
|
||||
|
||||
/// Enables smooth movement
|
||||
#ifndef SMOOTH_MOVEMENT
|
||||
#define SMOOTH_MOVEMENT TRUE
|
||||
#define SMOOTH_MOVEMENT FALSE
|
||||
#endif
|
||||
|
||||
/// Set appearance flags in vars
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
///Changes the user direction to (try) keep match the pointer.
|
||||
/datum/component/combat_mode/proc/on_move(atom/movable/source, dir, atom/oldloc, forced)
|
||||
var/mob/living/L = source
|
||||
if(mode_flags & COMBAT_MODE_ACTIVE && L.client && lastmousedir && lastmousedir != dir)
|
||||
if((mode_flags & COMBAT_MODE_ACTIVE) && L.client)
|
||||
L.setDir(lastmousedir, ismousemovement = TRUE)
|
||||
|
||||
/// Added movement delay if moving backward.
|
||||
|
||||
@@ -124,6 +124,7 @@
|
||||
last_move = 0
|
||||
return
|
||||
|
||||
setDir(direct)
|
||||
if(.)
|
||||
Moved(oldloc, direct)
|
||||
if(. && pulling && pulling == pullee && pulling != moving_from_pull) //we were pulling a thing and didn't lose it during our move.
|
||||
@@ -145,7 +146,6 @@
|
||||
set_glide_size(glide_size_override, FALSE)
|
||||
|
||||
last_move = direct
|
||||
setDir(direct)
|
||||
if(. && has_buckled_mobs() && !handle_buckled_mob_movement(loc, direct, glide_size_override)) //movement failed due to buckled mob(s)
|
||||
return FALSE
|
||||
|
||||
|
||||
@@ -217,10 +217,9 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
|
||||
else
|
||||
continue
|
||||
. = M.apply_multiplicative(., src)
|
||||
var/old = cached_multiplicative_slowdown // CITAEDL EDIT - To make things a bit less jarring, when in situations where
|
||||
// your delay decreases, "give" the delay back to the client
|
||||
cached_multiplicative_slowdown = .
|
||||
var/diff = old - cached_multiplicative_slowdown
|
||||
var/diff = (client.last_move - client.move_delay) - cached_multiplicative_slowdown
|
||||
if((diff > 0) && client)
|
||||
if(client.move_delay > world.time + 1.5)
|
||||
client.move_delay -= diff
|
||||
@@ -236,7 +235,6 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
|
||||
var/pixels_per_tick = pixels_moved / ticks_allowed
|
||||
set_glide_size(pixels_per_tick * GLOB.glide_size_multiplier, TRUE)
|
||||
|
||||
|
||||
/// Get the move speed modifiers list of the mob
|
||||
/mob/proc/get_movespeed_modifiers()
|
||||
. = LAZYCOPY(movespeed_modification)
|
||||
|
||||
Reference in New Issue
Block a user