Merge pull request NebulaSS13#4832 from MistakeNot4892/devupdate

Updating dev from staging

Author: MistakeNot4892

code/__defines/flags.dm

@@ -86,6 +86,7 @@ The latter will result in a linter warning and will not work correctly.
 #define ITEM_FLAG_PADDED                    BITFLAG(13) // When set on gloves, will act like pulling punches in unarmed combat.
 #define ITEM_FLAG_CAN_TAPE                  BITFLAG(14) // Whether the item can be taped onto something using tape
 #define ITEM_FLAG_IS_WEAPON                 BITFLAG(15) // Item is considered a weapon. Currently only used for force-based worth calculation.
+#define ITEM_FLAG_MAGNETISED                BITFLAG(16) // When worn on feet and standing on an appropriate spot, will prevent slipping.
 
 // Flags for pass_flags (/atom/var/pass_flags)
 #define PASS_FLAG_TABLE                     BITFLAG(0)

code/__defines/misc.dm

@@ -382,5 +382,11 @@
 #define CRAYON_DRAW_LETTER   "letter"
 #define CRAYON_DRAW_ARROW    "arrow"
 
+// Enum for results of is_space_movement_permitted()
+#define SPACE_MOVE_SUPPORTED (-1)
+#define SPACE_MOVE_FORBIDDEN   0
+#define SPACE_MOVE_PERMITTED   1
+
 // Default UI style applied to client prefs.
 #define DEFAULT_UI_STYLE /decl/ui_style/midnight
+

code/_helpers/mobs.dm

@@ -40,7 +40,7 @@
 	var/user_loc = user.loc
 
 	var/drifting = 0
-	if(!user.Process_Spacemove(0) && user.inertia_dir)
+	if(user.is_space_movement_permitted() == SPACE_MOVE_FORBIDDEN && user.inertia_dir)
 		drifting = 1
 
 	var/target_loc = target.loc
@@ -101,7 +101,7 @@
 	var/atom/original_loc = user.loc
 
 	var/drifting = 0
-	if(!user.Process_Spacemove(0) && user.inertia_dir)
+	if(user.is_space_movement_permitted() == SPACE_MOVE_FORBIDDEN && user.inertia_dir)
 		drifting = 1
 
 	var/holding = user.get_active_held_item()

code/controllers/subsystems/spacedrift.dm

@@ -34,9 +34,9 @@ SUBSYSTEM_DEF(spacedrift)
 				return
 			continue
 
-		if (!AM.loc || AM.loc != AM.inertia_last_loc || AM.Process_Spacemove(0))
+		if (!AM.loc || AM.loc != AM.inertia_last_loc || AM.is_space_movement_permitted() != SPACE_MOVE_FORBIDDEN)
 			AM.inertia_dir = 0
-		
+
 		AM.inertia_ignore = null
 
 		if (!AM.inertia_dir)

code/datums/movement/mob.dm

@@ -62,21 +62,28 @@
 	return (MOVEMENT_PROCEED|MOVEMENT_HANDLED)
 
 /datum/movement_handler/mob/space
-	var/allow_move
+	var/last_space_move_result
+
+// Notes on space movement chain:
+// - owning mob calls MayMove() via normal movement handler chain
+// - MayMove() sets last_space_move_result based on is_space_movement_permitted() (checks for footing, magboots, etc)
+// - last_space_move_result is checked in DoMove() and passed to try_space_move() as a param, which returns TRUE/FALSE
+// - if the original move result was forbidden, or try_space_move() fails, the handler prevents movement.
+// - Otherwise it goes ahead and lets the mob move.
 
 // Space movement
 /datum/movement_handler/mob/space/DoMove(direction, mob/mover, is_external)
 	if(mob.has_gravity() || (IS_NOT_SELF(mover) && is_external))
 		return
-	if(!allow_move || !mob.space_do_move(allow_move, direction))
+	if(last_space_move_result == SPACE_MOVE_FORBIDDEN || !mob.try_space_move(last_space_move_result, direction))
 		return MOVEMENT_HANDLED
 
 /datum/movement_handler/mob/space/MayMove(mob/mover, is_external)
 	if(IS_NOT_SELF(mover) && is_external)
 		return MOVEMENT_PROCEED
 	if(!mob.has_gravity())
-		allow_move = mob.Process_Spacemove(1)
-		if(!allow_move)
+		last_space_move_result = mob.is_space_movement_permitted(allow_movement = TRUE)
+		if(last_space_move_result == SPACE_MOVE_FORBIDDEN)
 			return MOVEMENT_STOP
 	return MOVEMENT_PROCEED
 

code/datums/movement/robot.dm

@@ -16,8 +16,11 @@
 // Use power while moving.
 /datum/movement_handler/robot/use_power/DoMove(direction, mob/mover, is_external)
 	var/datum/robot_component/actuator/A = robot.get_component("actuator")
-	if(!robot.cell_use_power(A.active_usage * robot.power_efficiency))
+	if(!is_external && !robot.cell_use_power(A.active_usage * robot.power_efficiency))
 		return MOVEMENT_HANDLED
+	return MOVEMENT_PROCEED
 
 /datum/movement_handler/robot/use_power/MayMove(mob/mover, is_external)
-	return (!robot.lockcharge && robot.is_component_functioning("actuator")) ? MOVEMENT_PROCEED : MOVEMENT_STOP
+	if(is_external || (!robot.incapacitated() && !robot.lockcharge && robot.is_component_functioning("actuator")))
+		return MOVEMENT_PROCEED
+	return MOVEMENT_STOP

code/game/area/areas.dm

@@ -422,7 +422,7 @@ var/global/list/mob/living/forced_ambiance_list = new
 	if(isspaceturf(get_turf(mob))) // Can't fall onto nothing.
 		return
 
-	if(mob.Check_Shoegrip())
+	if(!mob.can_slip(magboots_only = TRUE))
 		return
 
 	if(ishuman(mob))

code/game/atoms.dm

@@ -1005,8 +1005,7 @@
 	return required_dexterity
 
 /atom/proc/immune_to_floor_hazards()
-	return !simulated
-
+	return !simulated || !has_gravity()
 /// The punctuation used for the "That's an X." string.
 /atom/proc/get_examine_punctuation()
 	// Could theoretically check if reagents in a coating are 'dangerous' or 'suspicious' (blood, acid, etc)

code/game/atoms_movable.dm

@@ -49,7 +49,7 @@
 
 //call this proc to start space drifting
 /atom/movable/proc/space_drift(direction)//move this down
-	if(!loc || direction & (UP|DOWN) || Process_Spacemove(0))
+	if(!loc || direction & (UP|DOWN) || is_space_movement_permitted() != SPACE_MOVE_FORBIDDEN)
 		inertia_dir = 0
 		inertia_ignore = null
 		return 0
@@ -62,29 +62,22 @@
 	return 1
 
 //return 0 to space drift, 1 to stop, -1 for mobs to handle space slips
-/atom/movable/proc/Process_Spacemove(var/allow_movement)
+/atom/movable/proc/is_space_movement_permitted(allow_movement = FALSE)
 	if(!simulated)
-		return 1
-
+		return SPACE_MOVE_PERMITTED
 	if(has_gravity())
-		return 1
-
+		return SPACE_MOVE_PERMITTED
 	if(length(grabbed_by))
-		return 1
-
+		return SPACE_MOVE_PERMITTED
 	if(throwing)
-		return 1
-
+		return SPACE_MOVE_PERMITTED
 	if(anchored)
-		return 1
-
+		return SPACE_MOVE_PERMITTED
 	if(!isturf(loc))
-		return 1
-
+		return SPACE_MOVE_PERMITTED
 	if(locate(/obj/structure/lattice) in range(1, get_turf(src))) //Not realistic but makes pushing things in space easier
-		return -1
-
-	return 0
+		return SPACE_MOVE_SUPPORTED
+	return SPACE_MOVE_FORBIDDEN
 
 /atom/movable/attack_hand(mob/user)
 	// Unbuckle anything buckled to us.

code/game/objects/items/weapons/extinguisher.dm

@@ -60,7 +60,7 @@
 		return
 	if(user.buckled && isobj(user.buckled))
 		addtimer(CALLBACK(src, PROC_REF(propel_object), user.buckled, user, get_dir(A, user)), 0)
-	else if(!user.check_space_footing())
+	else if(user.can_slip(magboots_only = TRUE))
 		var/old_dir = user.dir
 		step(user, get_dir(A, user))
 		user.set_dir(old_dir)