diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index e0b4c0b351..148a18108a 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -102,15 +102,14 @@
/atom/proc/handle_ricochet(obj/item/projectile/P)
return
-/atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5)
- return (!density || !height)
+/atom/proc/CanPass(atom/movable/mover, turf/target)
+ return !density
/atom/proc/onCentcom()
var/turf/T = get_turf(src)
if(!T)
return FALSE
-
if(T.z == ZLEVEL_TRANSIT)
for(var/A in SSshuttle.mobile)
var/obj/docking_port/mobile/M = A
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 2b8f52aa36..8062a5fccb 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -406,7 +406,7 @@
return 0
return 1
-/atom/movable/CanPass(atom/movable/mover, turf/target, height=1.5)
+/atom/movable/CanPass(atom/movable/mover, turf/target)
if(mover in buckled_mobs)
return 1
return ..()
diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm
index 4f36685439..d9e803f3a0 100644
--- a/code/game/gamemodes/blob/blobs/blob_mobs.dm
+++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm
@@ -46,7 +46,7 @@
else
adjustFireLoss(5)
-/mob/living/simple_animal/hostile/blob/CanPass(atom/movable/mover, turf/target, height = 0)
+/mob/living/simple_animal/hostile/blob/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /obj/structure/blob))
return 1
return ..()
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index 5fdec26563..0c216f1c38 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -73,9 +73,7 @@
/obj/structure/blob/BlockSuperconductivity()
return atmosblock
-/obj/structure/blob/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0)
- return 1
+/obj/structure/blob/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSBLOB))
return 1
return 0
@@ -179,11 +177,11 @@
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) //Let's give some feedback that we DID try to spawn in space, since players are used to it
ConsumeTile() //hit the tile we're in, making sure there are no border objects blocking us
- if(!T.CanPass(src, T, 5)) //is the target turf impassable
+ if(!T.CanPass(src, T)) //is the target turf impassable
make_blob = FALSE
T.blob_act(src) //hit the turf if it is
for(var/atom/A in T)
- if(!A.CanPass(src, T, 5)) //is anything in the turf impassable
+ if(!A.CanPass(src, T)) //is anything in the turf impassable
make_blob = FALSE
A.blob_act(src) //also hit everything in the turf
diff --git a/code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm b/code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm
index 3d96e35d06..e22c9f4450 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm
@@ -36,7 +36,7 @@
/obj/structure/destructible/clockwork/taunting_trail/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
playsound(src, 'sound/items/welder.ogg', 50, 1)
-/obj/structure/destructible/clockwork/taunting_trail/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/destructible/clockwork/taunting_trail/CanPass(atom/movable/mover, turf/target)
return TRUE
/obj/structure/destructible/clockwork/taunting_trail/Crossed(atom/movable/AM)
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
index 611edf6b0f..e0751cb2e0 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -279,7 +279,7 @@
to_chat(src, "You cannot use abilities from inside of a wall.")
return FALSE
for(var/obj/O in T)
- if(O.density && !O.CanPass(src, T, 5))
+ if(O.density && !O.CanPass(src, T))
to_chat(src, "You cannot use abilities inside of a dense object.")
return FALSE
if(inhibited)
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 382e5f6cd5..14b73c9a9f 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -37,9 +37,7 @@
else
return ..()
-/obj/structure/barricade/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff.
- if(height==0)
- return 1
+/obj/structure/barricade/CanPass(atom/movable/mover, turf/target)//So bullets will fly over and stuff.
if(locate(/obj/structure/barricade) in get_turf(mover))
return 1
else if(istype(mover, /obj/item/projectile))
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 396e706dc0..471da1ba0a 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -98,7 +98,7 @@
..()
move_update_air(T)
-/obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/machinery/door/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return !opacity
return !density
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index f2b4eb5451..90cb9c8942 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -212,7 +212,7 @@
flags = ON_BORDER
CanAtmosPass = ATMOS_PASS_PROC
-/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1
if(get_dir(loc, target) == dir) //Make sure looking at appropriate border
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 20a2808360..93fbd54e85 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -89,7 +89,7 @@
do_animate("deny")
return
-/obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/machinery/door/window/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1
if(get_dir(loc, target) == dir) //Make sure looking at appropriate border
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index e4e783435b..60342abaed 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -25,12 +25,6 @@
..()
move_update_air(T)
-/obj/structure/emergency_shield/CanPass(atom/movable/mover, turf/target, height)
- if(!height)
- return FALSE
- else
- return ..()
-
/obj/structure/emergency_shield/emp_act(severity)
switch(severity)
if(1)
@@ -440,10 +434,7 @@
if(gen_secondary) //using power may cause us to be destroyed
gen_secondary.use_stored_power(drain_amount*0.5)
-/obj/machinery/shieldwall/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0)
- return FALSE
-
+/obj/machinery/shieldwall/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return prob(20)
else
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index b4b093eeb1..3263af9e56 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -62,7 +62,7 @@
AM.loc = src.loc
do_transform(AM)
-/obj/machinery/transformer/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/machinery/transformer/CanPass(atom/movable/mover, turf/target)
// Allows items to go through,
// to stop them from blocking the conveyor belt.
if(!ishuman(mover))
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 0cf6d8c0d9..23ba467e4b 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -231,7 +231,7 @@
to_chat(user, "You hit [src] but bounce off it!")
playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1)
-/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target, height=1.5)
+/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target)
return !density
/obj/structure/foamedmetal/iron
@@ -273,7 +273,7 @@
for(var/obj/item/Item in O)
Item.extinguish()
-/obj/structure/foamedmetal/resin/CanPass(atom/movable/mover, turf/target, height)
+/obj/structure/foamedmetal/resin/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return TRUE
. = ..()
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index abcd5d9059..46fe4e5e8e 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -133,8 +133,7 @@
M.emote("cough")
return 1
-/obj/effect/particle_effect/smoke/bad/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0) return 1
+/obj/effect/particle_effect/smoke/bad/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /obj/item/projectile/beam))
var/obj/item/projectile/beam/B = mover
B.damage = (B.damage/2)
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 094492b3be..e3e7915ce6 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -35,8 +35,7 @@
icon_state = "stickyweb2"
. = ..()
-/obj/structure/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0) return 1
+/obj/structure/spider/stickyweb/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living/simple_animal/hostile/poison/giant_spider))
return 1
else if(isliving(mover))
diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm
index a55ecb3bac..c1127b2bd6 100644
--- a/code/game/objects/items/devices/forcefieldprojector.dm
+++ b/code/game/objects/items/devices/forcefieldprojector.dm
@@ -92,7 +92,7 @@
generator = null
return ..()
-/obj/structure/projected_forcefield/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/projected_forcefield/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1
return !density
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index 16c85f7e72..f86ad818de 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -98,7 +98,7 @@
return attack_hand(user)
-/obj/structure/alien/resin/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/alien/resin/CanPass(atom/movable/mover, turf/target)
return !density
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 097c631e8d..1d0bc26818 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -81,8 +81,8 @@
else if(secure && !opened)
to_chat(user, "Alt-click to [locked ? "unlock" : "lock"].")
-/obj/structure/closet/CanPass(atom/movable/mover, turf/target, height=0)
- if(height == 0 || wall_mounted)
+/obj/structure/closet/CanPass(atom/movable/mover, turf/target)
+ if(wall_mounted)
return 1
return !density
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index b3b83553c2..d5626bdcea 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -19,7 +19,7 @@
..()
update_icon()
-/obj/structure/closet/crate/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/closet/crate/CanPass(atom/movable/mover, turf/target)
if(!istype(mover, /obj/structure/closet))
var/obj/structure/closet/crate/locatedcrate = locate(/obj/structure/closet/crate) in get_turf(mover)
if(locatedcrate) //you can walk on it like tables, if you're not in an open crate trying to move to a closed crate
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 9035a79f2f..f152634e38 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -265,9 +265,7 @@
else
return ..()
-/obj/structure/girder/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0)
- return 1
+/obj/structure/girder/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGRILLE))
return prob(girderpasschance)
else
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index c223232754..e50fe4bc28 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -89,8 +89,7 @@
take_damage(20, BRUTE, "melee", 1)
-/obj/structure/grille/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0) return 1
+/obj/structure/grille/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGRILLE))
return 1
else
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index b909da8347..080356bff0 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -48,11 +48,9 @@
max_integrity = 20
var/allow_walk = 1 //can we pass through it on walk intent
-/obj/structure/holosign/barrier/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/obj/structure/holosign/barrier/CanPass(atom/movable/mover, turf/target)
if(!density)
return 1
- if(air_group || (height==0))
- return 1
if(mover.pass_flags & (PASSGLASS|PASSTABLE|PASSGRILLE))
return 1
if(iscarbon(mover))
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 62d6be6c05..97e1430979 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -55,7 +55,7 @@
/obj/structure/mineral_door/attack_hand(mob/user)
return TryToSwitchState(user)
-/obj/structure/mineral_door/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/mineral_door/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /obj/effect/beam))
return !opacity
return !density
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index e8dca19dfd..8e1574019f 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -306,10 +306,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
desc = "Apply corpse before closing."
icon_state = "morguet"
-/obj/structure/tray/m_tray/CanPass(atom/movable/mover, turf/target, height=0)
- if(height == 0)
- return 1
-
+/obj/structure/tray/m_tray/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSTABLE))
return 1
if(locate(/obj/structure/table) in get_turf(mover))
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index c7e31ca38f..c481393f2f 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -69,9 +69,7 @@
else
..()
-/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0)
- return 1
+/obj/structure/table/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSTABLE))
return 1
if(mover.throwing)
@@ -407,8 +405,7 @@
pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density.
max_integrity = 20
-/obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0) return 1
+/obj/structure/rack/CanPass(atom/movable/mover, turf/target)
if(src.density == 0) //Because broken racks -Agouri |TODO: SPRITE!|
return 1
if(istype(mover) && mover.checkpass(PASSTABLE))
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index e9834aceab..294a5cdbef 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -53,7 +53,7 @@
/obj/structure/windoor_assembly/update_icon()
icon_state = "[facing]_[secure ? "secure_" : ""]windoor_assembly[state]"
-/obj/structure/windoor_assembly/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/windoor_assembly/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1
if(get_dir(loc, target) == dir) //Make sure looking at appropriate border
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index c30a3f1092..df0d9450f4 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -114,7 +114,7 @@
else
..(FULLTILE_WINDOW_DIR)
-/obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/window/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1
if(dir == FULLTILE_WINDOW_DIR)
diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm
index 33083f582a..968e782984 100644
--- a/code/game/turfs/simulated/chasm.dm
+++ b/code/game/turfs/simulated/chasm.dm
@@ -189,11 +189,9 @@
-/turf/open/chasm/CanPass(atom/movable/mover, turf/target, height=0)
+/turf/open/chasm/CanPass(atom/movable/mover, turf/target)
return 1
-
-
//Jungle
/turf/open/chasm/jungle
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index b28007458a..02cd044304 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -96,24 +96,14 @@
return FALSE
-/turf/CanPass(atom/movable/mover, turf/target, height=1.5)
+/turf/CanPass(atom/movable/mover, turf/target)
if(!target) return FALSE
if(istype(mover)) // turf/Enter(...) will perform more advanced checks
return !density
- else // Now, doing more detailed checks for air movement and air group formation
- if(target.blocks_air||blocks_air)
- return FALSE
-
- for(var/obj/obstacle in src)
- if(!obstacle.CanPass(mover, target, height))
- return FALSE
- for(var/obj/obstacle in target)
- if(!obstacle.CanPass(mover, src, height))
- return FALSE
-
- return TRUE
+ stack_trace("Non movable passed to turf CanPass : [mover]")
+ return FALSE
/turf/Enter(atom/movable/mover as mob|obj, atom/forget as mob|obj|turf|area)
if (!mover)
@@ -127,6 +117,7 @@
return FALSE
var/list/large_dense = list()
+
//Next, check objects to block entry that are on the border
for(var/atom/movable/border_obstacle in src)
if(border_obstacle.flags & ON_BORDER)
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index d1c32c4026..290dfb1e94 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -579,7 +579,7 @@
if(!override)
qdel(src)
-/obj/structure/spacevine/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/spacevine/CanPass(atom/movable/mover, turf/target)
if(isvineimmune(mover))
. = TRUE
else
diff --git a/code/modules/fields/turf_objects.dm b/code/modules/fields/turf_objects.dm
index c68f50bbdb..e50be26ff1 100644
--- a/code/modules/fields/turf_objects.dm
+++ b/code/modules/fields/turf_objects.dm
@@ -23,7 +23,7 @@
name = "energy field"
desc = "Get off my turf!"
-/obj/effect/abstract/proximity_checker/advanced/field_turf/CanPass(atom/movable/AM, turf/target, height)
+/obj/effect/abstract/proximity_checker/advanced/field_turf/CanPass(atom/movable/AM, turf/target)
if(parent)
return parent.field_turf_canpass(AM, src, target)
return TRUE
@@ -47,7 +47,7 @@
name = "energy field edge"
desc = "Edgy description here."
-/obj/effect/abstract/proximity_checker/advanced/field_edge/CanPass(atom/movable/AM, turf/target, height)
+/obj/effect/abstract/proximity_checker/advanced/field_edge/CanPass(atom/movable/AM, turf/target)
if(parent)
return parent.field_edge_canpass(AM, src, target)
return TRUE
diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm
index c9e6e92699..ffae5026d4 100644
--- a/code/modules/holiday/halloween.dm
+++ b/code/modules/holiday/halloween.dm
@@ -171,7 +171,7 @@
/mob/living/simple_animal/shade/howling_ghost/adjustHealth()
. = 0
-/mob/living/simple_animal/shade/howling_ghost/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/mob/living/simple_animal/shade/howling_ghost/CanPass(atom/movable/mover, turf/target)
return 1
diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm
index 006f8f7ccc..8fd69096c3 100644
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -118,7 +118,7 @@
else
..()
-/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target)
if (isitem(mover) && mover.throwing)
var/obj/item/I = mover
if(istype(I, /obj/item/projectile))
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 7156eb38fb..c86c12476d 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -151,7 +151,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
updateallghostimages()
return ..()
-/mob/dead/CanPass(atom/movable/mover, turf/target, height=0)
+/mob/dead/CanPass(atom/movable/mover, turf/target)
return 1
/*
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 715da142be..252a1fedae 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -397,7 +397,7 @@ Difficulty: Hard
faction = list("mining", "boss")
weather_immunities = list("lava","ash")
-/mob/living/simple_animal/hostile/asteroid/hivelordbrood/slaughter/CanPass(atom/movable/mover, turf/target, height = 0)
+/mob/living/simple_animal/hostile/asteroid/hivelordbrood/slaughter/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living/simple_animal/hostile/megafauna/bubblegum))
return 1
return 0
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 5e963d1940..2e841722c8 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -467,7 +467,7 @@ Difficulty: Hard
queue_smooth_neighbors(src)
return ..()
-/obj/effect/temp_visual/hierophant/wall/CanPass(atom/movable/mover, turf/target, height = 0)
+/obj/effect/temp_visual/hierophant/wall/CanPass(atom/movable/mover, turf/target)
if(QDELETED(caster))
return FALSE
if(mover == caster.pulledby)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
index 782c802a33..951f52d021 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
@@ -70,7 +70,7 @@
return
//if it's not our target, we ignore it
-/mob/living/simple_animal/hostile/asteroid/curseblob/CanPass(atom/movable/mover, turf/target, height = 0)
+/mob/living/simple_animal/hostile/asteroid/curseblob/CanPass(atom/movable/mover, turf/target)
if(mover == set_target)
return FALSE
if(istype(mover, /obj/item/projectile))
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index da4618ff96..714627b2c9 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -1,6 +1,4 @@
-/mob/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0)
- return TRUE
+/mob/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /obj/item/projectile) || mover.throwing)
return (!density || lying)
if(mover.checkpass(PASSMOB))
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index c8da6ab8b3..468cf527a7 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -72,9 +72,7 @@
return ..()
-/obj/machinery/am_shielding/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0)
- return 1
+/obj/machinery/am_shielding/CanPass(atom/movable/mover, turf/target)
return 0
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index e12cc37d3c..ca25ce708f 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -86,7 +86,7 @@
/obj/machinery/field
var/hasShocked = FALSE //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.
-/obj/machinery/field/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/machinery/field/CanPass(atom/movable/mover, turf/target)
if(hasShocked)
return FALSE
if(isliving(mover)) // Don't let mobs through
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 4650f9652f..ea4dfd95db 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -98,7 +98,7 @@
// Crucial to make things work!!!!
// OLD FIX - explanation given down below.
-// /obj/machinery/power/compressor/CanPass(atom/movable/mover, turf/target, height=0)
+// /obj/machinery/power/compressor/CanPass(atom/movable/mover, turf/target)
// return !density
/obj/machinery/power/compressor/locate_machinery()
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
index f30dfa79e9..618a17e8d6 100644
--- a/code/modules/recycling/disposal-unit.dm
+++ b/code/modules/recycling/disposal-unit.dm
@@ -332,7 +332,7 @@
eject()
. = TRUE
-/obj/machinery/disposal/bin/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/machinery/disposal/bin/CanPass(atom/movable/mover, turf/target)
if (isitem(mover) && mover.throwing)
var/obj/item/I = mover
if(istype(I, /obj/item/projectile))
@@ -345,7 +345,7 @@
visible_message("[I] bounces off of [src]'s rim!")
return 0
else
- return ..(mover, target, height)
+ return ..(mover, target)
/obj/machinery/disposal/bin/flush()
..()
diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
index cf21217601..d8624dec47 100644
--- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
+++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
@@ -56,7 +56,7 @@
/obj/structure/necropolis_gate/singularity_pull()
return 0
-/obj/structure/necropolis_gate/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/necropolis_gate/CanPass(atom/movable/mover, turf/target)
if(get_dir(loc, target) == dir)
return !density
return 1
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index 0677a032df..48bac9b65a 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -76,9 +76,7 @@
icon = 'icons/mob/blob.dmi'
color = rgb(145, 150, 0)
-/obj/effect/gluttony/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff.
- if(height==0)
- return 1
+/obj/effect/gluttony/CanPass(atom/movable/mover, turf/target)//So bullets will fly over and stuff.
if(ishuman(mover))
var/mob/living/carbon/human/H = mover
if(H.nutrition >= NUTRITION_LEVEL_FAT)
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index cb9f475911..169d936015 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -216,7 +216,7 @@
var/threshold = 500
var/static/list/approved_passengers = list()
-/obj/effect/forcefield/luxury_shuttle/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/effect/forcefield/luxury_shuttle/CanPass(atom/movable/mover, turf/target)
if(mover in approved_passengers)
return 1
diff --git a/code/modules/spells/spell_types/forcewall.dm b/code/modules/spells/spell_types/forcewall.dm
index 7581ba5f3b..a9d13728a3 100644
--- a/code/modules/spells/spell_types/forcewall.dm
+++ b/code/modules/spells/spell_types/forcewall.dm
@@ -31,7 +31,7 @@
wizard = summoner
QDEL_IN(src, 300)
-/obj/effect/forcefield/wizard/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/effect/forcefield/wizard/CanPass(atom/movable/mover, turf/target)
if(mover == wizard)
return 1
return 0