cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Objects that can pass over tables don't block table construction (#94834)

Browse Source 
## About The Pull Request

#94802 follow up

Dense objects that can pass over tables like microwaves shouldn't block
table construction

## Why It's Good For The Game

It's a bit annoying to have to work around tables for machines made to
be on tables

## Changelog

🆑 Melbert
qol: Objects that can pass over tables don't block table construction
qol: If table construction fails, it tells you what is blocking, rather
than "something is"
/🆑
This commit is contained in:
MrMelbert
2026-01-12 17:49:58 -05:00
committed by GitHub
parent 9c11db5c29
commit 026fff8853
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/table_frames.dm
+8 -4
View File
@@ -65,8 +65,10 @@
// Check if the turf is blocked by dense objects or objects that block construction
for(var/obj/object in loc)
if(object.density && !(object.obj_flags & IGNORE_DENSITY) || object.obj_flags & BLOCKS_CONSTRUCTION)
balloon_alert(user, "something is in the way!")
if(object.pass_flags & PASSTABLE)
continue
if((object.density && !(object.obj_flags & IGNORE_DENSITY)) || object.obj_flags & BLOCKS_CONSTRUCTION)
balloon_alert(user, "[object.name] is in the way!")
return ITEM_INTERACT_BLOCKING
balloon_alert(user, "constructing table...")
@@ -75,8 +77,10 @@
// Check again after the delay in case something was placed during construction
for(var/obj/object in loc)
if(object.density && !(object.obj_flags & IGNORE_DENSITY) || object.obj_flags & BLOCKS_CONSTRUCTION)
balloon_alert(user, "something is in the way!")
if(object.pass_flags & PASSTABLE)
continue
if((object.density && !(object.obj_flags & IGNORE_DENSITY)) || object.obj_flags & BLOCKS_CONSTRUCTION)
balloon_alert(user, "[object.name] is in the way!")
return ITEM_INTERACT_BLOCKING
if(!our_stack.use(1))