From 9a5db8f91ea02278cffc11e91043a0a91f1a1ae3 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Wed, 11 Sep 2024 10:49:30 -0400 Subject: [PATCH] refactor: remove CanPass height arg (#26700) --- code/game/atoms_movable.dm | 4 ++-- .../gamemodes/miniantags/pulsedemon/pulsedemon.dm | 2 +- code/game/machinery/OpTable.dm | 4 +--- code/game/machinery/doors/airlock.dm | 2 +- code/game/machinery/doors/door.dm | 2 +- code/game/machinery/doors/firedoor.dm | 2 +- code/game/machinery/doors/windowdoor.dm | 2 +- code/game/machinery/shieldgen.dm | 14 +++----------- .../objects/effects/effect_system/effects_smoke.dm | 4 +--- code/game/objects/effects/spiders.dm | 4 +--- code/game/objects/structures/coathanger.dm | 2 +- .../objects/structures/crates_lockers/closets.dm | 4 ++-- code/game/objects/structures/girders.dm | 4 +--- code/game/objects/structures/grille.dm | 4 +--- code/game/objects/structures/inflatable.dm | 4 ++-- code/game/objects/structures/mineral_doors.dm | 2 +- code/game/objects/structures/morgue.dm | 4 +--- code/game/objects/structures/tables_racks.dm | 8 ++------ code/game/objects/structures/windoor_assembly.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/game/turfs/simulated/floor.dm | 6 ------ .../vampire/vampire_powers/hemomancer_powers.dm | 2 +- .../atmospherics/environmental/LINDA_system.dm | 10 +++++----- code/modules/events/blob/blob_mobs.dm | 2 +- .../events/blob/blob_structures/strong_blob.dm | 5 ++--- code/modules/events/blob/theblob.dm | 4 +--- code/modules/events/spacevine.dm | 2 +- code/modules/hydroponics/hydroponics_tray.dm | 5 +---- code/modules/mob/dead/observer/observer_base.dm | 2 +- .../living/simple_animal/hostile/syndicate_mobs.dm | 4 ++-- code/modules/mob/mob_movement.dm | 4 +--- .../power/engines/singularity/containment_field.dm | 2 +- code/modules/power/generators/turbine.dm | 6 ------ code/modules/recycling/disposal.dm | 4 ++-- code/modules/recycling/sortingmachinery.dm | 4 ++-- code/modules/vehicle/vehicle.dm | 2 +- 36 files changed, 48 insertions(+), 92 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 749f88d4841..3f6c50803ec 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -539,9 +539,9 @@ /atom/movable/proc/move_crushed(atom/movable/pusher, force = MOVE_FORCE_DEFAULT, direction) return FALSE -/atom/movable/CanPass(atom/movable/mover, turf/target, height=1.5) +/atom/movable/CanPass(atom/movable/mover, turf/target) // This condition is copied from atom to avoid an extra parent call, because this is a very hot proc. - if(!density || !height) + if(!density) return TRUE return LAZYIN(buckled_mobs, mover) diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm index 29af3fd3860..e05efa0c74a 100644 --- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm +++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm @@ -763,7 +763,7 @@ /mob/living/simple_animal/demon/pulse_demon/ex_act() return -/mob/living/simple_animal/demon/pulse_demon/CanPass(atom/movable/mover, turf/target, height) +/mob/living/simple_animal/demon/pulse_demon/CanPass(atom/movable/mover, turf/target) . = ..() if(istype(mover, /obj/item/projectile/ion)) return FALSE diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index b0a630087f7..ab86bc89afb 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -37,9 +37,7 @@ . = ..() . += "Click-drag someone to the table to place them on top of the table." -/obj/machinery/optable/CanPass(atom/movable/mover, turf/target, height=0) - if(height == 0) - return TRUE +/obj/machinery/optable/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSTABLE)) return TRUE if(isliving(mover)) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 1192eaf6ed1..a260b16f531 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -760,7 +760,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) if(user) attack_ai(user) -/obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target, height=0) +/obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target) if(istype(mover) && !locked) if(mover.checkpass(PASSDOOR)) return TRUE diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 1abf4875068..84ebb03663a 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -133,7 +133,7 @@ update_bounds() -/obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0) +/obj/machinery/door/CanPass(atom/movable/mover, turf/target) if(istype(mover)) if(mover.checkpass(PASSDOOR) && !locked) return TRUE diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index bee8a313d29..604cd02766f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -308,7 +308,7 @@ opacity = TRUE density = TRUE -/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 0ad0c170dc2..ec1a666d415 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -140,7 +140,7 @@ return mob_dir & unres_sides -/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 TRUE if(isliving(mover)) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index db9e46148d8..5c266789a88 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -27,11 +27,6 @@ ..() move_update_air(T) -/obj/machinery/shield/CanPass(atom/movable/mover, turf/target, height) - if(!height) - return FALSE - return ..() - /obj/machinery/shield/CanAtmosPass(direction) return !density @@ -547,10 +542,7 @@ return -/obj/machinery/shieldwall/CanPass(atom/movable/mover, turf/target, height=0) - if(height == 0) - return TRUE - +/obj/machinery/shieldwall/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSGLASS)) return prob(20) else @@ -565,14 +557,14 @@ desc = "A strange energy shield." icon_state = "shield-red" -/obj/machinery/shieldwall/syndicate/CanPass(atom/movable/mover, turf/target, height=0) +/obj/machinery/shieldwall/syndicate/CanPass(atom/movable/mover, turf/target) if(isliving(mover)) var/mob/living/M = mover if("syndicate" in M.faction) return TRUE if(isprojectile(mover)) return FALSE - return ..(mover, target, height) + return ..() /obj/machinery/shieldwall/syndicate/CanPathfindPass(to_dir, datum/can_pass_info/pass_info) if(pass_info.is_living && ("syndicate" in pass_info.factions)) diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index ca60beb0ca6..d46c09daa46 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -125,9 +125,7 @@ lifetime = 16 SECONDS_TO_LIFE_CYCLES causes_coughing = TRUE -/obj/effect/particle_effect/smoke/bad/CanPass(atom/movable/mover, turf/target, height = 0) - if(!height) - return TRUE +/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 3005942594c..d7a6d873f14 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -38,9 +38,7 @@ if(prob(50)) icon_state = "stickyweb2" -/obj/structure/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0) - if(height == 0) - return TRUE +/obj/structure/spider/stickyweb/CanPass(atom/movable/mover, turf/target) if(istype(mover, /mob/living/simple_animal/hostile/poison/giant_spider) || isterrorspider(mover)) return TRUE else if(isliving(mover)) diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 3bbabce64b0..40fa5b0ab36 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -29,7 +29,7 @@ return return ..() -/obj/structure/coatrack/CanPass(atom/movable/mover, turf/target, height=0) +/obj/structure/coatrack/CanPass(atom/movable/mover, turf/target) var/can_hang = FALSE for(var/T in allowed) if(istype(mover,T)) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index e0f619555e0..c6a04c649cb 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -62,8 +62,8 @@ dump_contents() return ..() -/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 TRUE return (!density) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 1a4ff3ae2a1..1bd26e78f0f 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -406,9 +406,7 @@ refundMetal(metalUsed) qdel(src) -/obj/structure/girder/CanPass(atom/movable/mover, turf/target, height=0) - if(!height) - return TRUE +/obj/structure/girder/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSGIRDER)) return TRUE if(istype(mover) && mover.checkpass(PASSGRILLE)) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 210dbed1bb9..a66d1399334 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -113,10 +113,8 @@ if(!shock(user, 70)) take_damage(20, BRUTE, MELEE, 1) -/obj/structure/grille/CanPass(atom/movable/mover, turf/target, height=0) +/obj/structure/grille/CanPass(atom/movable/mover, turf/target) . = !density - if(height==0) - return TRUE if(istype(mover) && mover.checkpass(PASSGRILLE)) return TRUE if(isprojectile(mover)) diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index a44a1b2ad80..32a3fbe71a7 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -42,7 +42,7 @@ . = ..() T.recalculate_atmos_connectivity() -/obj/structure/inflatable/CanPass(atom/movable/mover, turf/target, height=0) +/obj/structure/inflatable/CanPass(atom/movable/mover, turf/target) return /obj/structure/inflatable/CanAtmosPass(direction) @@ -116,7 +116,7 @@ /obj/structure/inflatable/door/attack_hand(mob/user as mob) return try_to_operate(user) -/obj/structure/inflatable/door/CanPass(atom/movable/mover, turf/target, height=0) +/obj/structure/inflatable/door/CanPass(atom/movable/mover, turf/target) if(istype(mover, /obj/effect/beam)) return !opacity return !density diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index d28a65a973e..dde36ebb6ce 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -59,7 +59,7 @@ if(user.can_advanced_admin_interact()) operate() -/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 1151f863eea..03c7147f7db 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -294,9 +294,7 @@ connected = null return ..() -/obj/structure/m_tray/CanPass(atom/movable/mover, turf/target, height=0) - if(height == 0) - return TRUE +/obj/structure/m_tray/CanPass(atom/movable/mover, turf/target) if(istype(mover)) if(mover.checkpass(PASSTABLE)) return TRUE diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 92dd37c15e1..b084ed71f87 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -126,9 +126,7 @@ /obj/structure/table/proc/item_placed(item) return -/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0) - if(height == 0) - return TRUE +/obj/structure/table/CanPass(atom/movable/mover, turf/target) if(istype(mover,/obj/item/projectile)) return (check_cover(mover,target)) if(ismob(mover)) @@ -901,9 +899,7 @@ . = ..() . += "It's held together by a couple of bolts." -/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(!density) //Because broken racks -Agouri |TODO: SPRITE!| return 1 if(istype(mover)) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index aa8047cf9d4..a5db59da8af 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -72,7 +72,7 @@ /obj/structure/windoor_assembly/update_icon_state() 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 eb38d8b4d5f..e625b8494cc 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -109,7 +109,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/floor.dm b/code/game/turfs/simulated/floor.dm index 3bdda3532c4..021c1709152 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -37,12 +37,6 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama else icon_regular_floor = icon_state -//turf/simulated/floor/CanPass(atom/movable/mover, turf/target, height=0) -// if((istype(mover, /obj/machinery/vehicle) && !(src.burnt))) -// if(!( locate(/obj/machinery/mass_driver, src))) -// return 0 -// return ..() - /turf/simulated/floor/ex_act(severity) if(is_shielded()) return diff --git a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm index 92811776021..b39832c1fbe 100644 --- a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm @@ -230,7 +230,7 @@ return ..() -/obj/structure/blood_barrier/CanPass(atom/movable/mover, turf/target, height) +/obj/structure/blood_barrier/CanPass(atom/movable/mover, turf/target) if(!isliving(mover)) return FALSE var/mob/living/L = mover diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm index 69975f0b658..ff4f57b01c8 100644 --- a/code/modules/atmospherics/environmental/LINDA_system.dm +++ b/code/modules/atmospherics/environmental/LINDA_system.dm @@ -18,10 +18,10 @@ /atom/movable/proc/CanAtmosPass() return TRUE -/atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5) - return (!density || !height) +/atom/proc/CanPass(atom/movable/mover, turf/target) + return !density -/turf/CanPass(atom/movable/mover, turf/target, height=1.5) +/turf/CanPass(atom/movable/mover, turf/target) if(!target) return 0 if(istype(mover)) // turf/Enter(...) will perform more advanced checks @@ -32,10 +32,10 @@ return 0 for(var/obj/obstacle in src) - if(!obstacle.CanPass(mover, target, height)) + if(!obstacle.CanPass(mover, target)) return 0 for(var/obj/obstacle in target) - if(!obstacle.CanPass(mover, src, height)) + if(!obstacle.CanPass(mover, src)) return 0 return 1 diff --git a/code/modules/events/blob/blob_mobs.dm b/code/modules/events/blob/blob_mobs.dm index 57d8dc3232b..aad976d3739 100644 --- a/code/modules/events/blob/blob_mobs.dm +++ b/code/modules/events/blob/blob_mobs.dm @@ -74,7 +74,7 @@ var/mob/living/carbon/human/oldguy var/is_zombie = FALSE -/mob/living/simple_animal/hostile/blob/blobspore/CanPass(atom/movable/mover, turf/target, height=0) +/mob/living/simple_animal/hostile/blob/blobspore/CanPass(atom/movable/mover, turf/target) if(istype(mover, /obj/structure/blob)) return 1 return ..() diff --git a/code/modules/events/blob/blob_structures/strong_blob.dm b/code/modules/events/blob/blob_structures/strong_blob.dm index be45e257194..7747686be6b 100644 --- a/code/modules/events/blob/blob_structures/strong_blob.dm +++ b/code/modules/events/blob/blob_structures/strong_blob.dm @@ -49,9 +49,8 @@ else icon_state = initial(icon_state) -/obj/structure/blob/shield/CanPass(atom/movable/mover, turf/target, height=0) - if(istype(mover) && mover.checkpass(PASSBLOB)) return 1 - return 0 +/obj/structure/blob/shield/CanPass(atom/movable/mover, turf/target) + return istype(mover) && mover.checkpass(PASSBLOB) /obj/structure/blob/shield/reflective name = "reflective blob" diff --git a/code/modules/events/blob/theblob.dm b/code/modules/events/blob/theblob.dm index 1e5fa1b2a24..6cd12653f99 100644 --- a/code/modules/events/blob/theblob.dm +++ b/code/modules/events/blob/theblob.dm @@ -49,9 +49,7 @@ GLOBAL_LIST_EMPTY(blob_minions) return FALSE return ..() -/obj/structure/blob/CanPass(atom/movable/mover, turf/target, height=0) - if(height == 0) - return TRUE +/obj/structure/blob/CanPass(atom/movable/mover, turf/target) return istype(mover) && mover.checkpass(PASSBLOB) /obj/structure/blob/CanAtmosPass(direction) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index c89a09fa13a..95f6203b205 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -705,7 +705,7 @@ if(!override) wither() -/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/hydroponics/hydroponics_tray.dm b/code/modules/hydroponics/hydroponics_tray.dm index c92834b604c..0c0f799fdbc 100644 --- a/code/modules/hydroponics/hydroponics_tray.dm +++ b/code/modules/hydroponics/hydroponics_tray.dm @@ -988,10 +988,7 @@ update_state() ///Diona Nymph Related Procs/// -/obj/machinery/hydroponics/CanPass(atom/movable/mover, turf/target, height=0) //So nymphs can climb over top of trays. - if(height==0) - return 1 - +/obj/machinery/hydroponics/CanPass(atom/movable/mover, turf/target) //So nymphs can climb over top of trays. if(istype(mover) && mover.checkpass(PASSTABLE)) return 1 else diff --git a/code/modules/mob/dead/observer/observer_base.dm b/code/modules/mob/dead/observer/observer_base.dm index 0a370d5b620..2e25e620b40 100644 --- a/code/modules/mob/dead/observer/observer_base.dm +++ b/code/modules/mob/dead/observer/observer_base.dm @@ -167,7 +167,7 @@ GLOBAL_DATUM_INIT(ghost_crew_monitor, /datum/ui_module/crew_monitor/ghost, new) MA.plane = GAME_PLANE . = MA -/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/syndicate_mobs.dm b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm index d2ec17104f3..c4a887baf23 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm @@ -237,12 +237,12 @@ new /obj/effect/gibspawner/human(get_turf(src)) return ..() -/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/CanPass(atom/movable/mover, turf/target, height=0) +/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/CanPass(atom/movable/mover, turf/target) if(isliving(mover)) var/mob/living/blocker = mover if(faction_check_mob(blocker)) return 1 - return ..(mover, target, height) + return ..() /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/officer diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index bd78c00c286..32e73d7d1a4 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -1,11 +1,9 @@ -/mob/CanPass(atom/movable/mover, turf/target, height=0) +/mob/CanPass(atom/movable/mover, turf/target) var/horizontal = FALSE if(isliving(src)) var/mob/living/L = src horizontal = IS_HORIZONTAL(L) - if(height==0) - return 1 if(isprojectile(mover)) return projectile_hit_check(mover) if(mover.throwing) diff --git a/code/modules/power/engines/singularity/containment_field.dm b/code/modules/power/engines/singularity/containment_field.dm index 13ddaa13d9f..e1c80554979 100644 --- a/code/modules/power/engines/singularity/containment_field.dm +++ b/code/modules/power/engines/singularity/containment_field.dm @@ -84,7 +84,7 @@ /obj/machinery/field var/hasShocked = 0 //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 0 if(isliving(mover)) // Don't let mobs through diff --git a/code/modules/power/generators/turbine.dm b/code/modules/power/generators/turbine.dm index 8e0ac11eddb..fb247a9f5bf 100644 --- a/code/modules/power/generators/turbine.dm +++ b/code/modules/power/generators/turbine.dm @@ -113,12 +113,6 @@ #define COMPFRICTION 5e5 #define COMPSTARTERLOAD 2800 - -// Crucial to make things work!!!! -// OLD FIX - explanation given down below. -// /obj/machinery/power/compressor/CanPass(atom/movable/mover, turf/target, height=0) -// return !density - /obj/machinery/power/compressor/locate_machinery() if(turbine) return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index c8627d290a1..f31c086481a 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -610,7 +610,7 @@ H.vent_gas(loc) qdel(H) -/obj/machinery/disposal/CanPass(atom/movable/mover, turf/target, height=0) +/obj/machinery/disposal/CanPass(atom/movable/mover, turf/target) if(isitem(mover) && mover.throwing) var/obj/item/I = mover if(isprojectile(I)) @@ -634,7 +634,7 @@ return else - return ..(mover, target, height) + return ..() /obj/machinery/disposal/get_remote_view_fullscreens(mob/user) if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS))) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index ec0ba2ac4c1..9351978962e 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -161,7 +161,7 @@ var/obj/target = A if(is_type_in_list(target, no_wrap)) return - + if(istype(target, /obj/item/stack/packageWrap) && user.a_intent != INTENT_HARM) return @@ -294,7 +294,7 @@ /obj/machinery/disposal/deliveryChute/update() return -/obj/machinery/disposal/deliveryChute/CanPass(atom/movable/mover, turf/target, height) +/obj/machinery/disposal/deliveryChute/CanPass(atom/movable/mover, turf/target) // If the mover is a thrownthing passing through space, remove its thrown datum, // ingest it like normal, and mark the chute as not passible. // This prevents the mover from Entering the chute's turf diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm index b62ee6a76cf..3a79e296f89 100644 --- a/code/modules/vehicle/vehicle.dm +++ b/code/modules/vehicle/vehicle.dm @@ -34,7 +34,7 @@ return ..() // So that beepsky can't push the janicart -/obj/vehicle/CanPass(atom/movable/mover, turf/target, height) +/obj/vehicle/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSMOB)) return TRUE else