cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 10:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Starts work on unbreaking CanPass()

Browse Source
This commit is contained in:
Neerti
2019-02-09 20:45:49 -05:00
parent 33efaed83c
commit d880379bbf
10 changed files with 91 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/blob2/blobs/base_blob.dm
View File

@@ -47,20 +47,27 @@ var/list/blobs = list()
set_light(0)
/obj/structure/blob/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
world << "/obj/structure/blob/CanPass(mover=[mover], target=[target], height=[height], air_group=[air_group]) called on [src]."
if(air_group || (height==0))
world << "Returned true due to being air group or having height=0"
return TRUE
if(istype(mover) && mover.checkpass(PASSBLOB))
world << "Returned true due to having PASSBLOB."
return TRUE
else if(istype(mover, /mob/living))
var/mob/living/L = mover
if(L.faction == "blob")
world << "Returned true due to being in blob faction."
return TRUE
else if(istype(mover, /obj/item/projectile))
var/obj/item/projectile/P = mover
if(P.firer && P.firer.faction == "blob")
world << "Returned true due to being a projectile fired by someone in blob faction."
return TRUE
world << "Returned false due to being a projectile, with firer not in faction."
return FALSE
else
world << "Returned false."
return FALSE
// return ..()

6
code/modules/mob/living/living_movement.dm
View File

@@ -1,7 +1,4 @@
/mob/CanPass(atom/movable/mover, turf/target, height, air_group)
if(air_group || (height == 0))
return TRUE
if(ismob(mover))
var/mob/moving_mob = mover
if ((other_mobs && moving_mob.other_mobs))
@@ -10,3 +7,6 @@
var/obj/item/projectile/P = mover
return !P.can_hit_target(src, P.permutated, src == P.original, TRUE)
return (!mover.density || !density || lying)
/mob/CanZASPass(turf/T, is_zone)
return TRUE