Fixes canmove updating wrongly on movable chairs

(cherry picked from commit 6568533d0daa405ff18769928464d32f02fe53d7)
Cleans code up for easier editing

(cherry picked from commit a6e6a8939ff3e9a213477a3e309373327d7a3d4e)