[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
@@ -76,7 +76,8 @@

 // This is necessary for storage items not on your person.
 /obj/item/Adjacent(var/atom/neighbor, var/recurse = 1)
-	if(neighbor == loc) return 1
+	if(neighbor == loc)
+		return 1
 	if(isitem(loc))
 		if(recurse > 0)
 			return loc.Adjacent(neighbor,recurse - 1)