Skip to content

Commit

Permalink
let's float over crates and tables, okay?
Browse files Browse the repository at this point in the history
  • Loading branch information
Skies-Of-Blue committed Jun 11, 2024
1 parent 63b2ff9 commit 7b62165
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions code/game/objects/structures/crates_lockers/crates.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
return TRUE
if(!locatedcrate.opened) //otherwise, if the located crate is closed, allow entering
return TRUE
if(mover.movement_type & FLOATING)
return TRUE

/obj/structure/closet/crate/update_icon_state()
icon_state = "[initial(icon_state)][opened ? "open" : ""]"
Expand Down
4 changes: 3 additions & 1 deletion code/game/objects/structures/tables_racks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@
return TRUE
if(locate(/obj/structure/table) in get_turf(mover))
return TRUE
if(mover.movement_type & FLOATING)
return TRUE

/obj/structure/table/CanAStarPass(ID, dir, caller)
. = !density
Expand Down Expand Up @@ -372,7 +374,7 @@
check_break(M)

/obj/structure/table/glass/proc/check_break(mob/living/M)
if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & FLYING))
if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & (FLYING || FLOATING)))
table_shatter(M)

/obj/structure/table/glass/proc/table_shatter(mob/living/L)
Expand Down

0 comments on commit 7b62165

Please sign in to comment.