fixes stupid idgiout mistake

gough
shiptest-ss13 · Dec 8, 2024 · 04d67c7 · 04d67c7
1 parent 769a733
commit 04d67c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/code/__DEFINES/timed_action.dm b/code/__DEFINES/timed_action.dm
@@ -8,3 +8,5 @@
 #define IGNORE_HELD_ITEM (1<<2)
 /// Can do the action even if the mob is incapacitated
 #define IGNORE_INCAPACITATED (1<<3)
+/// Can do the action even if the mob changes active hand
+#define IGNORE_HAND_CHANGE (1<<4)
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
@@ -307,6 +307,7 @@ GLOBAL_LIST_EMPTY(species_list)
 	if(!user.Process_Spacemove(0) && user.inertia_dir)
 		drifting = TRUE
 
+	var/holding = user.get_active_held_item()
 	var/whichhand = user.active_hand_index
 
 	delay *= user.do_after_coefficent()
@@ -337,7 +338,8 @@ GLOBAL_LIST_EMPTY(species_list)
 		// Check flags
 		if(QDELETED(user) \
 			|| (!(timed_action_flags & IGNORE_USER_LOC_CHANGE) && !drifting && user.loc != user_loc) \
-			|| (!(timed_action_flags & IGNORE_HELD_ITEM) && user.active_hand_index != whichhand) \
+			|| (!(timed_action_flags & IGNORE_HAND_CHANGE) && user.active_hand_index != whichhand) \
+			|| (!(timed_action_flags & IGNORE_HELD_ITEM) && user.get_active_held_item() != holding) \
 			|| (!(timed_action_flags & IGNORE_INCAPACITATED) && HAS_TRAIT(user, TRAIT_INCAPACITATED)) \
 			|| (extra_checks && !extra_checks.Invoke()))
 			. = FALSE