Skip to content

Commit 941891c

Browse files
Shodddshodd
and
shodd
authored
table flipping (#4714)
Co-authored-by: shodd <[email protected]>
1 parent c472aeb commit 941891c

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

monkestation/code/modules/blueshift/structures/flipped_table.dm

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
return COMPONENT_ATOM_BLOCK_EXIT
4949

5050
/obj/structure/flippedtable/CtrlShiftClick(mob/user)
51-
if(!istype(user) || iscorticalborer(user))
51+
if(!iscarbon(user) && !is_admin(user.client))
5252
return
5353
if(isobserver(user) && !is_admin(user.client)) //prevent ghosts from unflipping tables but still allows admins to fuck around
5454
return
@@ -72,13 +72,11 @@
7272

7373

7474
/obj/structure/table/CtrlShiftClick(mob/user)
75-
if(!istype(user) || iscorticalborer(user))
76-
return
77-
if(!can_flip)
75+
if(!iscarbon(user) && !is_admin(user.client))
7876
return
7977
if(isobserver(user) && !is_admin(user.client)) //prevent ghosts from flipping tables but still allows admins to fuck around
8078
return
81-
if(!user.CanReach(src)) //prevents certain kinds of fuckers on cameras from flipping tables THROUGH A FUCKING CAMERA. ... this is why we can't have nice things.
79+
if(!can_flip || !user.CanReach(src))
8280
return
8381
user.balloon_alert_to_viewers("flipping table...")
8482
if(!do_after(user, max_integrity * 0.25))

0 commit comments

Comments
 (0)