mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge pull request #5671 from CHOMPStation2/upstream-merge-14445
[MIRROR] makes it so you can't walk on small people when you shouldn't
This commit is contained in:
@@ -280,7 +280,19 @@
|
||||
return FALSE
|
||||
|
||||
var/mob/living/carbon/human/prey = tmob
|
||||
if(!istype(prey))
|
||||
var/can_pass = TRUE
|
||||
if (isturf(prey.loc))
|
||||
for (var/atom/movable/M in prey.loc)
|
||||
if (prey == 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))
|
||||
can_pass = FALSE
|
||||
continue
|
||||
if (!M.CanPass(src, prey.loc))
|
||||
can_pass = FALSE
|
||||
if(!istype(prey) || !can_pass)
|
||||
//If they're not human, steppy shouldn't happen
|
||||
return FALSE
|
||||
|
||||
|
||||
Reference in New Issue
Block a user