diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index f95a2b5d934..9b71db347a6 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -408,14 +408,22 @@
return 0
return T.straight_table_check(direction)
+/obj/structure/table/verb/can_touch(var/mob/user)
+ if (!user)
+ return 0
+ if (usr.stat) //zombie goasts go away
+ return 0
+ if (issilicon(usr))
+ usr << "You need hands for this."
+ return 0
+ return 1
+
/obj/structure/table/verb/do_flip()
set name = "Flip table"
set desc = "Flips a non-reinforced table"
set category = "Object"
set src in oview(1)
-
- if (issilicon(usr))
- usr << "You need hands for this."
+ if (!can_touch(usr))
return
if(!flip(get_cardinal_dir(usr,src)))
usr << "It won't budge."
@@ -446,6 +454,9 @@
set category = "Object"
set src in oview(1)
+ if (!can_touch(usr))
+ return
+
if (!unflipping_check())
usr << "It won't budge."
return