fix

PMC-Unga-Marines · Nov 28, 2024 · bb96345 · bb96345
1 parent 5d76a2e
commit bb96345
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -79,9 +79,6 @@
 /mob/living/carbon/human/return_mob_swap_mode(mob/living/target)
 	if(isxeno(target))
 		return NO_SWAP
-	// No allowed swap with teammate who was hugged
-	if(target.get_item_by_slot(SLOT_WEAR_MASK) == /obj/item/clothing/mask/facehugger/larval || target.move_resist > 1000)
-		return NO_SWAP
 	// the puller can always swap with its victim if on grab intent
 	if(target.pulledby == src && a_intent == INTENT_GRAB)
 		return SWAPPING

diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
@@ -540,7 +540,7 @@
 		return
 	log_combat(src, M, "attempted to remove [key_name(I)] ([slot_to_process])")
 
-	src.move_resist = src.move_resist + HUMAN_STRIP_DELAY
+	move_resist = move_resist + HUMAN_STRIP_DELAY
 	M.move_resist = M.move_resist + HUMAN_STRIP_DELAY
 
 	M.visible_message(span_danger("[src] tries to remove [M]'s [I.name]."), \
@@ -551,7 +551,7 @@
 			log_combat(src, M, "removed [key_name(I)] ([slot_to_process])")
 			if(isidcard(I))
 				message_admins("[ADMIN_TPMONTY(src)] took the [I] of [ADMIN_TPMONTY(M)].")
-	src.move_resist = src.move_resist - HUMAN_STRIP_DELAY
+	move_resist = move_resist - HUMAN_STRIP_DELAY
 	M.move_resist = M.move_resist - HUMAN_STRIP_DELAY