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

 /obj/docking_port/proc/getDockedId()
 	var/obj/docking_port/P = get_docked()
-	if(P) return P.id
+	if(P)
+		return P.id

 /obj/docking_port/stationary
 	name = "dock"