cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove CanPass height arg (#26700)

Browse Source
This commit is contained in:
warriorstar-orion
2024-09-11 14:49:30 +00:00
committed by GitHub
parent 9f8c2c219c
commit 9a5db8f91e
36 changed files with 48 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/coathanger.dm
+1 -1
View File
@@ -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))
code/game/objects/structures/crates_lockers/closets.dm
+2 -2
View File
@@ -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)
code/game/objects/structures/girders.dm
+1 -3
View File
@@ -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))
code/game/objects/structures/grille.dm
+1 -3
View File
@@ -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))
code/game/objects/structures/inflatable.dm
+2 -2
View File
@@ -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
code/game/objects/structures/mineral_doors.dm
+1 -1
View File
@@ -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
code/game/objects/structures/morgue.dm
+1 -3
View File
@@ -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
code/game/objects/structures/tables_racks.dm
+2 -6
View File
@@ -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 @@
. = ..()
. += "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>"
/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))
code/game/objects/structures/windoor_assembly.dm
+1 -1
View File
@@ -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
code/game/objects/structures/window.dm
+1 -1
View File
@@ -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)