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

* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm

code/game/machinery/camera/motion.dm

@@ -57,7 +57,8 @@
 	return 1
 
 /obj/machinery/camera/proc/triggerAlarm()
-	if (!detectTime) return 0
+	if (!detectTime)
+		return 0
 	for (var/mob/living/silicon/aiPlayer in GLOB.player_list)
 		if (status)
 			aiPlayer.triggerAlarm("Motion", get_area(src), list(src), src)
@@ -69,4 +70,3 @@
 	if (!area_motion)
 		if(isliving(AM))
 			newTarget(AM)
-

code/game/machinery/camera/presets.dm

@@ -53,7 +53,8 @@
 	var/area/A = get_area(src)
 	if(A)
 		for(var/obj/machinery/camera/autoname/C in GLOB.machines)
-			if(C == src) continue
+			if(C == src)
+				continue
 			var/area/CA = get_area(C)
 			if(CA.type == A.type)
 				if(C.number)