cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Landmine fixes (#11683)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-18 13:44:22 -07:00
committed by GitHub
parent c663a72b96
commit d27275cced
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,8 +97,12 @@
if(istype(M, /obj/mecha)) if(istype(M, /obj/mecha))
explode(M) explode(M)
if(istype(M, /obj/vehicle))
explode(M)
if(istype(M, /mob/living/)) if(istype(M, /mob/living/))
if(!M.hovering) //CHOMPedit: let's not make wings ignore mines because we use those here. var/mob/living/mob = M
if(!(mob.hovering || mob.flying || mob.is_incorporeal() || mob.mob_size <= MOB_TINY))
explode(M) explode(M)
/obj/effect/mine/attackby(obj/item/W as obj, mob/living/user as mob) /obj/effect/mine/attackby(obj/item/W as obj, mob/living/user as mob)
@@ -430,6 +434,6 @@
// This tells AI mobs to not be dumb and step on mines willingly. // This tells AI mobs to not be dumb and step on mines willingly.
/obj/item/mine/is_safe_to_step(mob/living/L) /obj/item/mine/is_safe_to_step(mob/living/L)
if(!L.hovering) //CHOMPedit: Let's not trivialize mines. if(!(L.hovering || L.flying || L.is_incorporeal() || L.mob_size <= MOB_TINY))
return FALSE return FALSE
return ..() return ..()