cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5108 from CHOMPStation2/upstream-merge-13859

Browse Source 
[MIRROR] ALL TERRAIN WINGS
This commit is contained in:
Nadyr
2022-10-11 20:34:22 -04:00
committed by GitHub
parent dbf7b95687 39b30a4196
commit 2b8950a437
8 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/effects/mines.dm
View File

@@ -96,7 +96,7 @@
explode(M)
if(istype(M, /mob/living/))
if(!M.hovering)
if(!M.hovering) //CHOMPedit: let's not make wings ignore mines because we use those here.
explode(M)
/obj/effect/mine/attackby(obj/item/W as obj, mob/living/user as mob)
@@ -398,6 +398,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) //CHOMPedit: Let's not trivialize mines.
return FALSE
return ..()

4
code/game/objects/structures/cliff.dm
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)