Merge pull request #14501 from Seris02/betterresoze

fixes a problem with my stepping code
This commit is contained in:
Heroman3003
2023-02-18 04:50:53 +10:00
committed by GitHub
+3 -2
View File
@@ -272,13 +272,14 @@
var/mob/living/carbon/human/prey = tmob
var/can_pass = TRUE
var/size_ratio_needed = (a_intent == I_DISARM || a_intent == I_HURT) ? 0.75 : (a_intent == I_GRAB ? 0.5 : 0)
if (isturf(prey.loc))
for (var/atom/movable/M in prey.loc)
if (prey == M)
if (prey == M || pred == M)
continue
if (istype(M, /mob/living))
var/mob/living/L = M
if (!(M.CanPass(src, prey.loc) || get_effective_size(FALSE) - L.get_effective_size(TRUE) >= 0.75))
if (!M.CanPass(src, prey.loc) && !(get_effective_size(FALSE) - L.get_effective_size(TRUE) >= size_ratio_needed || L.lying))
can_pass = FALSE
continue
if (!M.CanPass(src, prey.loc))