cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
silicons
2021-01-13 14:23:35 -07:00
parent 3fe2776a6a
commit 343ef7db2c
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/movement.dm
View File

@@ -17,7 +17,7 @@ GLOBAL_VAR_INIT(glide_size_multiplier, 1.0)
/// Enables smooth movement /// Enables smooth movement
#ifndef SMOOTH_MOVEMENT #ifndef SMOOTH_MOVEMENT
#define SMOOTH_MOVEMENT TRUE #define SMOOTH_MOVEMENT FALSE
#endif #endif
/// Set appearance flags in vars /// Set appearance flags in vars

2
code/datums/components/combat_mode.dm
View File

@@ -125,7 +125,7 @@
///Changes the user direction to (try) keep match the pointer. ///Changes the user direction to (try) keep match the pointer.
/datum/component/combat_mode/proc/on_move(atom/movable/source, dir, atom/oldloc, forced) /datum/component/combat_mode/proc/on_move(atom/movable/source, dir, atom/oldloc, forced)
var/mob/living/L = source 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) L.setDir(lastmousedir, ismousemovement = TRUE)
/// Added movement delay if moving backward. /// Added movement delay if moving backward.

2
code/game/atoms_movement.dm
View File

@@ -124,6 +124,7 @@
last_move = 0 last_move = 0
return return
setDir(direct)
if(.) if(.)
Moved(oldloc, direct) Moved(oldloc, direct)
if(. && pulling && pulling == pullee && pulling != moving_from_pull) //we were pulling a thing and didn't lose it during our move. 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) set_glide_size(glide_size_override, FALSE)
last_move = direct 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) if(. && has_buckled_mobs() && !handle_buckled_mob_movement(loc, direct, glide_size_override)) //movement failed due to buckled mob(s)
return FALSE return FALSE

4
code/modules/movespeed/_movespeed_modifier.dm
View File

@@ -217,10 +217,9 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
else else
continue continue
. = M.apply_multiplicative(., src) . = 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 // your delay decreases, "give" the delay back to the client
cached_multiplicative_slowdown = . 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((diff > 0) && client)
if(client.move_delay > world.time + 1.5) if(client.move_delay > world.time + 1.5)
client.move_delay -= diff client.move_delay -= diff
@@ -236,7 +235,6 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
var/pixels_per_tick = pixels_moved / ticks_allowed var/pixels_per_tick = pixels_moved / ticks_allowed
set_glide_size(pixels_per_tick * GLOB.glide_size_multiplier, TRUE) set_glide_size(pixels_per_tick * GLOB.glide_size_multiplier, TRUE)
/// Get the move speed modifiers list of the mob /// Get the move speed modifiers list of the mob
/mob/proc/get_movespeed_modifiers() /mob/proc/get_movespeed_modifiers()
. = LAZYCOPY(movespeed_modification) . = LAZYCOPY(movespeed_modification)