Merge branch 'master' into upstream-merge-32757

2017-11-15 13:01:55 -06:00
parent ab21f8d5ed c97af9719f
commit 30394c5da5
80 changed files with 911 additions and 720 deletions
@@ -21,7 +21,6 @@
 		/////////
 	var/datum/preferences/prefs = null
 	var/move_delay		= 1
-	var/moving			= null

 	var/area			= null