From e461db8e5ff227ac6d6e91e56c8ebc89c122f977 Mon Sep 17 00:00:00 2001 From: Emagged Date: Wed, 7 Feb 2024 01:41:42 +0100 Subject: [PATCH] naming --- code/controllers/subsystem/SSthrowing.dm | 8 ++++---- code/game/atoms_movable.dm | 2 +- code/modules/mob/mob_movement.dm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/controllers/subsystem/SSthrowing.dm b/code/controllers/subsystem/SSthrowing.dm index 2013d355a8c..f3de68e80ad 100644 --- a/code/controllers/subsystem/SSthrowing.dm +++ b/code/controllers/subsystem/SSthrowing.dm @@ -71,9 +71,9 @@ SUBSYSTEM_DEF(throwing) ///When this variable is false, non dense mobs will be hit by a thrown item. useful for things that you dont want to be cheesed by crawling, EG. gravitational anomalies var/dodgeable = TRUE /// Can a thrown mob move themselves to stop the throw? - var/block_movement = TRUE + var/should_block_movement = TRUE /// This is internal variable to support no gravity movement even if variable above is TRUE. This variable will change during throwing - var/block_movement_actual = TRUE + var/block_movement = TRUE /datum/thrownthing/proc/tick() var/atom/movable/AM = thrownthing @@ -104,9 +104,9 @@ SUBSYSTEM_DEF(throwing) gravity = has_gravity(AM, AM.loc) if(!gravity) - block_movement_actual = FALSE // you should be able to move if there is no gravity, supports jetpack movement during throw + block_movement = FALSE // you should be able to move if there is no gravity, supports jetpack movement during throw else - block_movement_actual = block_movement + block_movement = should_block_movement if((dist_travelled >= maxrange || AM.loc == target_turf) && gravity) hitcheck() //Just to be sure diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 724b25acdb5..c58cdd72d28 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -442,7 +442,7 @@ TT.diagonals_first = diagonals_first TT.callback = callback TT.dodgeable = dodgeable - TT.block_movement = block_movement + TT.should_block_movement = block_movement var/dist_x = abs(target.x - src.x) var/dist_y = abs(target.y - src.y) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index e5bc75847b8..117d256420e 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -68,7 +68,7 @@ if(mob.notransform) return 0 //This is sota the goto stop mobs from moving var - if(mob.throwing && mob.throwing.block_movement_actual) + if(mob.throwing && mob.throwing.block_movement) return if(mob.control_object)