[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/objects/items/devices/chameleonproj.dm

@@ -32,7 +32,8 @@
 	toggle()
 
 /obj/item/device/chameleon/afterattack(atom/target, mob/user , proximity)
-	if(!proximity) return
+	if(!proximity)
+		return
 	if(!check_sprite(target))
 		return
 	if(!active_dummy)
@@ -51,7 +52,8 @@
 	return FALSE
 
 /obj/item/device/chameleon/proc/toggle()
-	if(!can_use || !saved_appearance) return
+	if(!can_use || !saved_appearance)
+		return
 	if(active_dummy)
 		eject_all()
 		playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)