Merge pull request #8 from AEV-Oxyd/move-fixes

Fix movement duplication

Author: MLGTASTICa

code/_compile_options.dm

@@ -76,6 +76,7 @@
 #define UNIT_TESTS
 #endif
 
+#define CITESTING
 #ifdef CITESTING
 #define TESTING
 #endif

code/game/atoms_movable.dm

@@ -398,8 +398,10 @@ GLOBAL_VAR_INIT(Debug,0)
 	else
 		var/atom/oldloc = src.loc
 		var/olddir = dir //we can't override this without sacrificing the rest of movable/New()
-
+		/// parent failed to enter ,movement wasn't succesfull.
 		. = ..()
+		if(!. || loc != NewLoc)
+			return FALSE
 
 		if(oldloc)
 			oldloc.recalculateWeights(-weight,src)
@@ -422,7 +424,6 @@ GLOBAL_VAR_INIT(Debug,0)
 			// if we wasn't on map OR our Z coord was changed
 			if( !isturf(oldloc) || (get_z(loc) != get_z(oldloc)) )
 				update_plane()
-
 		if(get_z(oldloc) != get_z(loc))
 			SEND_SIGNAL(src, COMSIG_MOVABLE_Z_CHANGED, get_z(oldloc), get_z(NewLoc))
 

code/modules/unit_tests/step_override.dm

@@ -11,8 +11,11 @@
 /datum/unit_test/step_override/proc/TestStep(type_to_test)
 	var/atom/movable/AM = allocate(type_to_test) // alloc spawns them at 20,20,1||20,21,1
 	var/turf/T = get_turf(AM)
+	var/turf/D = locate(T.x, T.y + 1, T.z)
+	T.ChangeTurf(/turf/simulated/floor)
+	D.ChangeTurf(/turf/simulated/floor)
 
 	. = step(AM, NORTH)
 	. = . && T.x == AM.x
-	. = . && T.y + 1 == AM.y // eh?
+	. = . && (T.y + 1) == AM.y // eh?
 	. = . && T.z == AM.z