[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/modules/spells/spell.dm

@@ -429,7 +429,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 								else
 									if(los_check(user,L))
 										M = L
-				if(M in view_or_range(range, user, selection_type)) targets += M
+				if(M in view_or_range(range, user, selection_type))
+					targets += M
 
 		else
 			var/list/possible_targets = list()

code/modules/spells/spell_types/ethereal_jaunt.dm

@@ -87,7 +87,8 @@
 	return ..()
 
 /obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
-	if ((movedelay > world.time) || reappearing || !direction) return
+	if ((movedelay > world.time) || reappearing || !direction)
+		return
 	var/turf/newLoc = get_step(src,direction)
 	setDir(direction)
 	if(!(newLoc.flags_1 & NOJAUNT_1))

code/modules/spells/spell_types/rightandwrong.dm

@@ -13,7 +13,7 @@
 		if(H.stat == DEAD || !(H.client))
 			continue
 		if(H.mind)
-			if(iswizard(H) || H.mind.special_role == "survivalist")
+			if(H.mind.special_role == "Wizard" || H.mind.special_role == "apprentice" || H.mind.special_role == "survivalist")
 				continue
 		if(prob(survivor_probability) && !(H.mind in SSticker.mode.traitors))
 			SSticker.mode.traitors += H.mind
@@ -218,4 +218,4 @@
 
 		SSevents.reschedule()
 		message_admins("Summon Events intensifies, events will now occur every [SSevents.frequency_lower / 600] to [SSevents.frequency_upper / 600] minutes.")
-		log_game("Summon Events was increased!")
+		log_game("Summon Events was increased!")

code/modules/spells/spell_types/turf_teleport.dm

@@ -16,9 +16,12 @@
 	for(var/mob/living/target in targets)
 		var/list/turfs = new/list()
 		for(var/turf/T in range(target,outer_tele_radius))
-			if(T in range(target,inner_tele_radius)) continue
-			if(isspaceturf(T) && !include_space) continue
-			if(T.density && !include_dense) continue
+			if(T in range(target,inner_tele_radius))
+				continue
+			if(isspaceturf(T) && !include_space)
+				continue
+			if(T.density && !include_dense)
+				continue
 			if(T.x>world.maxx-outer_tele_radius || T.x<outer_tele_radius)
 				continue	//putting them at the edge is dumb
 			if(T.y>world.maxy-outer_tele_radius || T.y<outer_tele_radius)