Merge pull request #13859 from Cameron653/FLYING

ALL TERRAIN WINGS
This commit is contained in:
Casey
2022-10-09 23:02:50 -04:00
committed by GitHub
8 changed files with 23 additions and 12 deletions
+3 -2
View File
@@ -96,7 +96,8 @@
explode(M)
if(istype(M, /mob/living/))
if(!M.hovering)
var/mob/living/mob = M
if(!mob.hovering || !mob.flying)
explode(M)
/obj/effect/mine/attackby(obj/item/W as obj, mob/living/user as mob)
@@ -398,6 +399,6 @@
// This tells AI mobs to not be dumb and step on mines willingly.
/obj/item/weapon/mine/is_safe_to_step(mob/living/L)
if(!L.hovering)
if(!L.hovering || !L.flying)
return FALSE
return ..()
+2 -2
View File
@@ -153,7 +153,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
/obj/structure/cliff/CanPass(atom/movable/mover, turf/target)
if(isliving(mover))
var/mob/living/L = mover
if(L.hovering) // Flying mobs can always pass.
if(L.hovering || L.flying) // Flying mobs can always pass.
return TRUE
return ..()
@@ -174,7 +174,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
..()
/obj/structure/cliff/proc/should_fall(mob/living/L)
if(L.hovering)
if(L.hovering || L.flying)
return FALSE
var/turf/T = get_turf(L)