Adds some more protection to SSD mobs with lwaps and snipers (#28164)

* Adds some more protection to SSD mobs with lwaps and snipers * sorry AA * Update code/datums/status_effects/neutral.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> --------- Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
ParadiseSS13 · Feb 2, 2025 · 431656f · 431656f
1 parent c87143f
commit 431656f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
@@ -351,7 +351,7 @@
 		for(var/mob/living/L in range(10, our_scope.given_turf))
 			if(locks >= LWAP_LOCK_CAP)
 				return
-			if(L == owner || L.stat == DEAD || isslime(L) || ismonkeybasic(L) || L.invisibility > owner.see_invisible) //xenobio moment
+			if(L == owner || L.stat == DEAD || isslime(L) || ismonkeybasic(L) || L.invisibility > owner.see_invisible || isLivingSSD(L)) //xenobio moment
 				continue
 			new /obj/effect/temp_visual/single_user/lwap_ping(owner.loc, owner, L)
 			locks++

diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -842,7 +842,7 @@ emp_act
 	return TRUE
 
 /mob/living/carbon/human/projectile_hit_check(obj/item/projectile/P)
-	return (HAS_TRAIT(src, TRAIT_FLOORED) || HAS_TRAIT(src, TRAIT_NOKNOCKDOWNSLOWDOWN)) && !density && !(P.always_hit_living_nondense && (stat != DEAD)) // hit mobs that are intentionally lying down to prevent combat crawling.
+	return (HAS_TRAIT(src, TRAIT_FLOORED) || HAS_TRAIT(src, TRAIT_NOKNOCKDOWNSLOWDOWN)) && !density && !(P.always_hit_living_nondense && (stat != DEAD) && !isLivingSSD(src)) // hit mobs that are intentionally lying down to prevent combat crawling.
 
 /mob/living/carbon/human/canBeHandcuffed()
 	return has_left_hand() || has_right_hand()
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
@@ -21,7 +21,7 @@
 	return (!mover.density || !density || horizontal)
 
 /mob/proc/projectile_hit_check(obj/item/projectile/P)
-	return !(P.always_hit_living_nondense && (stat != DEAD)) && !density
+	return !(P.always_hit_living_nondense && (stat != DEAD) && !isLivingSSD(src)) && !density
 
 /client/verb/toggle_throw_mode()
 	set hidden = 1