[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/_machinery.dm

@@ -477,14 +477,17 @@ Class Procs:
 // Hook for html_interface module to prevent updates to clients who don't have this as their active machine.
 /obj/machinery/proc/hiIsValidClient(datum/html_interface_client/hclient, datum/html_interface/hi)
 	if (hclient.client.mob && (hclient.client.mob.stat == 0 || IsAdminGhost(hclient.client.mob)))
-		if (isAI(hclient.client.mob) || IsAdminGhost(hclient.client.mob)) return TRUE
-		else                          return hclient.client.mob.machine == src && Adjacent(hclient.client.mob)
+		if (isAI(hclient.client.mob) || IsAdminGhost(hclient.client.mob))
+			return TRUE
+		else
+			return hclient.client.mob.machine == src && Adjacent(hclient.client.mob)
 	else
 		return FALSE
 
 // Hook for html_interface module to unset the active machine when the window is closed by the player.
 /obj/machinery/proc/hiOnHide(datum/html_interface_client/hclient)
-	if (hclient.client.mob && hclient.client.mob.machine == src) hclient.client.mob.unset_machine()
+	if (hclient.client.mob && hclient.client.mob.machine == src)
+		hclient.client.mob.unset_machine()
 
 /obj/machinery/proc/can_be_overridden()
 	. = 1

code/game/machinery/airlock_control.dm

@@ -8,9 +8,11 @@
 
 
 /obj/machinery/door/airlock/receive_signal(datum/signal/signal)
-	if(!signal || signal.encryption) return
+	if(!signal || signal.encryption)
+		return
 
-	if(id_tag != signal.data["tag"] || !signal.data["command"]) return
+	if(id_tag != signal.data["tag"] || !signal.data["command"])
+		return
 
 	switch(signal.data["command"])
 		if("open")
@@ -63,12 +65,14 @@
 
 /obj/machinery/door/airlock/open(surpress_send)
 	. = ..()
-	if(!surpress_send) send_status()
+	if(!surpress_send)
+		send_status()
 
 
 /obj/machinery/door/airlock/close(surpress_send)
 	. = ..()
-	if(!surpress_send) send_status()
+	if(!surpress_send)
+		send_status()
 
 
 /obj/machinery/door/airlock/proc/set_frequency(new_frequency)
@@ -148,4 +152,4 @@
 
 /obj/machinery/airlock_sensor/Destroy()
 	SSradio.remove_object(src,frequency)
-	return ..()
+	return ..()

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)

code/game/machinery/computer/atmos_alert.dm

@@ -60,12 +60,14 @@
 	radio_connection = SSradio.add_object(src, receive_frequency, GLOB.RADIO_ATMOSIA)
 
 /obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal)
-	if(!signal || signal.encryption) return
+	if(!signal || signal.encryption)
+		return
 
 	var/zone = signal.data["zone"]
 	var/severity = signal.data["alert"]
 
-	if(!zone || !severity) return
+	if(!zone || !severity)
+		return
 
 	minor_alarms -= zone
 	priority_alarms -= zone

code/game/machinery/computer/buildandrepair.dm

@@ -24,7 +24,8 @@
 				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You start deconstructing the frame...</span>")
 				if(do_after(user, 20*P.toolspeed, target = src))
-					if(!src || !WT.isOn()) return
+					if(!src || !WT.isOn())
+						return
 					to_chat(user, "<span class='notice'>You deconstruct the frame.</span>")
 					var/obj/item/stack/sheet/metal/M = new (loc, 5)
 					M.add_fingerprint(user)

code/game/machinery/computer/communications.dm

@@ -103,9 +103,12 @@
 			if (I && istype(I))
 				if(ACCESS_CAPTAIN in I.access)
 					var/old_level = GLOB.security_level
-					if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN
-					if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN
-					if(tmp_alertlevel > SEC_LEVEL_BLUE) tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this
+					if(!tmp_alertlevel)
+						tmp_alertlevel = SEC_LEVEL_GREEN
+					if(tmp_alertlevel < SEC_LEVEL_GREEN)
+						tmp_alertlevel = SEC_LEVEL_GREEN
+					if(tmp_alertlevel > SEC_LEVEL_BLUE)
+						tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this
 					set_security_level(tmp_alertlevel)
 					if(GLOB.security_level != old_level)
 						to_chat(usr, "<span class='notice'>Authorization confirmed. Modifying security level.</span>")
@@ -230,7 +233,8 @@
 
 		if("securitylevel")
 			src.tmp_alertlevel = text2num( href_list["newalertlevel"] )
-			if(!tmp_alertlevel) tmp_alertlevel = 0
+			if(!tmp_alertlevel)
+				tmp_alertlevel = 0
 			state = STATE_CONFIRM_LEVEL
 		if("changeseclevel")
 			state = STATE_ALERT_LEVEL
@@ -356,11 +360,15 @@
 			make_announcement(usr, 1)
 		if("ai-securitylevel")
 			src.tmp_alertlevel = text2num( href_list["newalertlevel"] )
-			if(!tmp_alertlevel) tmp_alertlevel = 0
+			if(!tmp_alertlevel)
+				tmp_alertlevel = 0
 			var/old_level = GLOB.security_level
-			if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN
-			if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN
-			if(tmp_alertlevel > SEC_LEVEL_BLUE) tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this
+			if(!tmp_alertlevel)
+				tmp_alertlevel = SEC_LEVEL_GREEN
+			if(tmp_alertlevel < SEC_LEVEL_GREEN)
+				tmp_alertlevel = SEC_LEVEL_GREEN
+			if(tmp_alertlevel > SEC_LEVEL_BLUE)
+				tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this
 			set_security_level(tmp_alertlevel)
 			if(GLOB.security_level != old_level)
 				//Only notify the admins if an actual change happened
@@ -670,7 +678,8 @@
 
 	var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
 
-	if(!frequency) return
+	if(!frequency)
+		return
 
 	var/datum/signal/status_signal = new
 	status_signal.source = src

code/game/machinery/computer/crew.dm

@@ -93,7 +93,8 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 /datum/crewmonitor/proc/show(mob/mob, z)
 	if (mob.client)
 		sendResources(mob.client)
-	if (!z) z = mob.z
+	if (!z)
+		z = mob.z
 
 	if (z > 0 && src.interfaces)
 		var/datum/html_interface/hi
@@ -160,7 +161,8 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 						pos = H.z == 0 || U.sensor_mode == SENSOR_COORDS ? get_turf(H) : null
 
 						// Special case: If the mob is inside an object confirm the z-level on turf level.
-						if (H.z == 0 && (!pos || pos.z != z)) continue
+						if (H.z == 0 && (!pos || pos.z != z))
+							continue
 
 						I = H.wear_id ? H.wear_id.GetID() : null
 
@@ -173,8 +175,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 							assignment = ""
 							ijob = 80
 
-						if (U.sensor_mode >= SENSOR_LIVING) life_status = (!H.stat ? "true" : "false")
-						else                    life_status = null
+						if (U.sensor_mode >= SENSOR_LIVING)
+							life_status = (!H.stat ? "true" : "false")
+						else
+							life_status = null
 
 						if (U.sensor_mode >= SENSOR_VITALS)
 							dam1 = round(H.getOxyLoss(),1)
@@ -188,7 +192,8 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 							dam4 = null
 
 						if (U.sensor_mode >= SENSOR_COORDS)
-							if (!pos) pos = get_turf(H)
+							if (!pos)
+								pos = get_turf(H)
 							var/area/player_area = get_area(H)
 
 							area = format_text(player_area.name)
@@ -208,13 +213,15 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 	var/z = ""
 
 	for (z in src.interfaces)
-		if (src.interfaces[z] == hi) break
+		if (src.interfaces[z] == hi)
+			break
 
 	if(hclient.client.mob && IsAdminGhost(hclient.client.mob))
 		return TRUE
 
 	if (hclient.client.mob && hclient.client.mob.stat == 0 && hclient.client.mob.z == text2num(z))
-		if (isAI(hclient.client.mob)) return TRUE
+		if (isAI(hclient.client.mob))
+			return TRUE
 		else if (iscyborg(hclient.client.mob))
 			return (locate(/obj/machinery/computer/crew, range(world.view, hclient.client.mob))) || (locate(/obj/item/device/sensor_device, hclient.client.mob.contents))
 		else
@@ -238,8 +245,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 
 					var/obj/machinery/camera/C = locate(/obj/machinery/camera) in range(5, tile)
 
-					if (!C) C = locate(/obj/machinery/camera) in urange(10, tile)
-					if (!C) C = locate(/obj/machinery/camera) in urange(15, tile)
+					if (!C)
+						C = locate(/obj/machinery/camera) in urange(10, tile)
+					if (!C)
+						C = locate(/obj/machinery/camera) in urange(15, tile)
 
 					if (C)
 						addtimer(CALLBACK(src, .proc/update_ai, AI, C, AI.eyeobj.loc), min(30, get_dist(get_turf(C), AI.eyeobj) / 4))
@@ -254,7 +263,8 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 
 		. = ..()
 
-		if (old_z != src.z) GLOB.crewmonitor.queueUpdate(old_z)
+		if (old_z != src.z)
+			GLOB.crewmonitor.queueUpdate(old_z)
 		GLOB.crewmonitor.queueUpdate(src.z)
 	else
 		return ..()

code/game/machinery/computer/dna_console.dm

@@ -66,7 +66,8 @@
 	ShowInterface(user)
 
 /obj/machinery/computer/scan_consolenew/proc/ShowInterface(mob/user, last_change)
-	if(!user) return
+	if(!user)
+		return
 	var/datum/browser/popup = new(user, "scannernew", "DNA Modifier Console", 800, 630) // Set up the popup browser window
 	if(!(in_range(src, user) || issilicon(user)))
 		popup.close()

code/game/machinery/computer/message.dm

@@ -82,7 +82,8 @@
 	if(hacking || emagged)
 		screen = 2
 	else if(!auth || !linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
-		if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN))) message = noserver
+		if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
+			message = noserver
 		screen = 0
 
 	switch(screen)
@@ -267,7 +268,8 @@
 
 		//Turn the server on/off.
 		if (href_list["active"])
-			if(auth) linkedServer.active = !linkedServer.active
+			if(auth)
+				linkedServer.active = !linkedServer.active
 		//Find a server
 		if (href_list["find"])
 			if(GLOB.message_servers && GLOB.message_servers.len > 1)
@@ -468,4 +470,4 @@
 					info = "<center><h2>Daily Key Reset</h2></center><br>The new message monitor key is '[server.decryptkey]'.<br>Please keep this a secret and away from the clown.<br>If necessary, change the password to a more secure one."
 					info_links = info
 					add_overlay("paper_words")
-					break
+					break

code/game/machinery/computer/prisoner.dm

@@ -95,7 +95,8 @@
 					if(!usr.transferItemToLoc(I, src))
 						return
 					inserted_id = I
-				else to_chat(usr, "<span class='danger'>No valid ID.</span>")
+				else
+					to_chat(usr, "<span class='danger'>No valid ID.</span>")
 			else if(inserted_id)
 				switch(href_list["id"])
 					if("eject")

code/game/machinery/embedded_controller/airlock_controller.dm

@@ -19,7 +19,8 @@
 
 /datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param)
 	var/receive_tag = signal.data["tag"]
-	if(!receive_tag) return
+	if(!receive_tag)
+		return
 
 	if(receive_tag==sensor_tag)
 		if(signal.data["pressure"])
@@ -206,7 +207,7 @@
 	icon_state = "airlock_control_standby"
 
 	name = "airlock console"
-	density = FALSE
+	density = FALSE
 
 	frequency = 1449
 	power_channel = ENVIRON
@@ -220,7 +221,7 @@
 	var/sanitize_external
 
 /obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload)
-	. = ..()
+	. = ..()
 	if(!mapload)
 		return
 
@@ -292,4 +293,4 @@
 </div>
 [state_options]"}
 
-	return output
+	return output

code/game/machinery/embedded_controller/embedded_controller_base.dm

@@ -21,10 +21,10 @@
 	var/datum/computer/file/embedded_program/program
 
 	name = "embedded controller"
-	density = FALSE
-	anchored = TRUE
+	density = FALSE
+	anchored = TRUE
 
-	var/on = TRUE
+	var/on = TRUE
 
 /obj/machinery/embedded_controller/interact(mob/user)
 	user.set_machine(src)
@@ -44,7 +44,8 @@
 	return 0
 
 /obj/machinery/embedded_controller/receive_signal(datum/signal/signal, receive_method, receive_param)
-	if(!signal || signal.encryption) return
+	if(!signal || signal.encryption)
+		return
 
 	if(program)
 		program.receive_signal(signal, receive_method, receive_param)
@@ -73,11 +74,11 @@
 	var/datum/radio_frequency/radio_connection
 
 /obj/machinery/embedded_controller/radio/Destroy()
-	SSradio.remove_object(src,frequency)
+	SSradio.remove_object(src,frequency)
 	return ..()
 
 /obj/machinery/embedded_controller/radio/Initialize()
-	. = ..()
+	. = ..()
 	set_frequency(frequency)
 
 /obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal)

code/game/machinery/magnet.dm

@@ -166,7 +166,8 @@
 
 
 /obj/machinery/magnetic_module/proc/magnetic_process() // proc that actually does the pulling
-	if(pulling) return
+	if(pulling)
+		return
 	while(on)
 
 		pulling = 1
@@ -333,7 +334,8 @@
 	updateUsrDialog()
 
 /obj/machinery/magnetic_controller/proc/MagnetMove()
-	if(looping) return
+	if(looping)
+		return
 
 	while(moving && rpath.len >= 1)
 

code/game/machinery/requests_console.dm

@@ -343,7 +343,8 @@ GLOBAL_LIST_EMPTY(allConsoles)
 		if (sending)
 			var/pass = 0
 			for (var/obj/machinery/message_server/MS in GLOB.machines)
-				if(!MS.active) continue
+				if(!MS.active)
+					continue
 				MS.send_rc_message(href_list["department"],department,log_msg,msgStamped,msgVerified,priority)
 				pass = 1
 

code/game/machinery/syndicatebeacon.dm

@@ -7,8 +7,8 @@
 	icon = 'icons/obj/singularity.dmi'
 	icon_state = "beacon"
 
-	anchored = FALSE
-	density = TRUE
+	anchored = FALSE
+	density = TRUE
 	layer = BELOW_MOB_LAYER //so people can't hide it and it's REALLY OBVIOUS
 	stat = 0
 	verb_say = "states"
@@ -20,7 +20,8 @@
 
 /obj/machinery/power/singularity_beacon/proc/Activate(mob/user = null)
 	if(surplus() < 1500)
-		if(user) to_chat(user, "<span class='notice'>The connected wire doesn't have enough current.</span>")
+		if(user)
+			to_chat(user, "<span class='notice'>The connected wire doesn't have enough current.</span>")
 		return
 	for(var/obj/singularity/singulo in GLOB.singularities)
 		if(singulo.z == z)
@@ -54,13 +55,13 @@
 
 
 /obj/machinery/power/singularity_beacon/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/screwdriver))
+	if(istype(W, /obj/item/screwdriver))
 		if(active)
 			to_chat(user, "<span class='warning'>You need to deactivate the beacon first!</span>")
 			return
 
 		if(anchored)
-			anchored = FALSE
+			anchored = FALSE
 			to_chat(user, "<span class='notice'>You unscrew the beacon from the floor.</span>")
 			disconnect_from_network()
 			return
@@ -68,7 +69,7 @@
 			if(!connect_to_network())
 				to_chat(user, "<span class='warning'>This device must be placed over an exposed, powered cable node!</span>")
 				return
-			anchored = TRUE
+			anchored = TRUE
 			to_chat(user, "<span class='notice'>You screw the beacon to the floor and attach the cable.</span>")
 			return
 	else
@@ -105,8 +106,8 @@
 	name = "suspicious beacon"
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "beacon"
-	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	desc = "A label on it reads: <i>Warning: Activating this device will send a special beacon to your location</i>."
 	origin_tech = "bluespace=6;syndicate=5"
 	w_class = WEIGHT_CLASS_SMALL

code/game/machinery/telecomms/machine_interactions.dm

@@ -60,7 +60,8 @@
 			dat += "<br>Identification String: <a href='?src=\ref[src];input=id'>NULL</a>"
 		dat += "<br>Network: <a href='?src=\ref[src];input=network'>[network]</a>"
 		dat += "<br>Prefabrication: [autolinkers.len ? "TRUE" : "FALSE"]"
-		if(hide) dat += "<br>Shadow Link: ACTIVE</a>"
+		if(hide)
+			dat += "<br>Shadow Link: ACTIVE</a>"
 
 		//Show additional options for certain machines.
 		dat += Options_Menu()