Quick sync (#2587)

* sync since the mirror was down * fucking byond * can't forget these
2017-09-04 04:38:49 -05:00
parent 241a10d88d
commit 92e055be97
20 changed files with 336 additions and 70 deletions
@@ -53,12 +53,12 @@
 #define ENGINE_COEFF_MAX 2
 #define ENGINE_DEFAULT_MAXSPEED_ENGINES 5

-//Docking error flags_1
+//Docking error flags
 #define DOCKING_SUCCESS 0
-#define DOCKING_COMPLETE 1
-#define DOCKING_BLOCKED 2
-#define DOCKING_IMMOBILIZED 4
-#define DOCKING_AREA_EMPTY 8
+#define DOCKING_BLOCKED 1
+#define DOCKING_IMMOBILIZED 2
+#define DOCKING_AREA_EMPTY 4
+

 //Docking turf movements
 #define MOVE_TURF 1