[MIRROR] Does some code standardization/consistency. (#3161)

* Does some code standardization/consistency. * fixes merge conflict generation * Missed a few, oops * Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
parent 953a353ce7
commit adc2e46114
151 changed files with 970 additions and 524 deletions
@@ -137,7 +137,8 @@ Turf and target are separate in case you want to teleport some distance from a t
 				return
 			if(destination.y>world.maxy || destination.y<1)
 				return
-	else	return
+	else
+		return

 	return destination