Merge pull request #4566 from Citadel-Station-13/upstream-merge-33881

[MIRROR] Makes reset_perspective handle turf as eye
2017-12-29 06:48:10 +00:00
parent fa8b710fde c018aa1f9f
commit 96543b5e63
2 changed files with 5 additions and 5 deletions
@@ -260,13 +260,13 @@
 			client.perspective = EYE_PERSPECTIVE
 			client.eye = A
 		else
-			if(isturf(loc))
+			if(isturf(loc) && (!A || loc == A))
 				client.eye = client.mob
 				client.perspective = MOB_PERSPECTIVE
 			else
 				client.perspective = EYE_PERSPECTIVE
-				client.eye = loc
-		return 1
+				client.eye = A
+		return 1 

 /mob/living/reset_perspective(atom/A)
 	if(..())