Merge conflict fix

code/modules/research/circuitprinter.dm

@@ -66,7 +66,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	efficiency_coeff = 2 ** (T - 1) //Only 1 manipulator here, you're making runtimes Razharas
 
 /obj/machinery/r_n_d/circuit_imprinter/blob_act()
-	if (prob(50))
+	if(prob(50))
 		qdel(src)
 
 
@@ -86,9 +86,9 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	return g_amount + gold_amount + diamond_amount
 
 /obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if (shocked)
+	if(shocked)
 		shock(user,50)
-	if (default_deconstruction_screwdriver(user, "circuit_imprinter_t", "circuit_imprinter", O))
+	if(default_deconstruction_screwdriver(user, "circuit_imprinter_t", "circuit_imprinter", O))
 		if(linked_console)
 			linked_console.linked_imprinter = null
 			linked_console = null
@@ -97,7 +97,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	if(exchange_parts(user, O))
 		return
 
-	if (panel_open)
+	if(panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
 			for(var/obj/I in component_parts)
 				if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
@@ -121,23 +121,23 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 		else
 			to_chat(user, "<span class='warning'>You can't load the [src.name] while it's opened.</span>")
 			return
-	if (disabled)
+	if(disabled)
 		return
-	if (!linked_console)
+	if(!linked_console)
 		to_chat(user, "<span class='warning'>The [name] must be linked to an R&D console first!</span>")
 		return 1
-	if (O.is_open_container())
+	if(O.is_open_container())
 		return
-	if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond))
+	if(!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond))
 		to_chat(user, "<span class='warning'>You cannot insert this item into the [name]!</span>")
 		return
-	if (stat)
+	if(stat)
 		return
-	if (busy)
+	if(busy)
 		to_chat(user, "<span class='warning'>The [name] is busy. Please wait for completion of previous operation.</span>")
 		return
 	var/obj/item/stack/sheet/stack = O
-	if ((TotalMaterials() + stack.perunit) > max_material_amount)
+	if((TotalMaterials() + stack.perunit) > max_material_amount)
 		to_chat(user, "<span class='warning'>The [name] is full. Please remove glass from the protolathe in order to insert more.</span>")
 		return
 

code/modules/research/destructive_analyzer.dm

@@ -47,9 +47,9 @@ Note: Must be placed within 3 tiles of the R&D Console
 
 
 /obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if (shocked)
+	if(shocked)
 		shock(user,50)
-	if (default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer", O))
+	if(default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer", O))
 		if(linked_console)
 			linked_console.linked_destroy = null
 			linked_console = null
@@ -60,20 +60,20 @@ Note: Must be placed within 3 tiles of the R&D Console
 
 	default_deconstruction_crowbar(O)
 
-	if (disabled)
+	if(disabled)
 		return
-	if (!linked_console)
+	if(!linked_console)
 		to_chat(user, "<span class='warning'>The [src.name] must be linked to an R&D console first!</span>")
 		return
-	if (busy)
+	if(busy)
 		to_chat(user, "<span class='warning'>The [src.name] is busy right now.</span>")
 		return
-	if (istype(O, /obj/item) && !loaded_item)
+	if(istype(O, /obj/item) && !loaded_item)
 		if(!O.origin_tech)
 			to_chat(user, "<span class='warning'>This doesn't seem to have a tech origin!</span>")
 			return
 		var/list/temp_tech = ConvertReqString2List(O.origin_tech)
-		if (temp_tech.len == 0)
+		if(temp_tech.len == 0)
 			to_chat(user, "<span class='warning'>You cannot deconstruct this item!</span>")
 			return
 		if(!user.drop_item())

code/modules/research/experimentor.dm

@@ -113,10 +113,10 @@
 	return TRUE
 
 /obj/machinery/r_n_d/experimentor/attackby(obj/item/O, mob/user, params)
-	if (shocked)
+	if(shocked)
 		shock(user,50)
 
-	if (default_deconstruction_screwdriver(user, "h_lathe_maint", "h_lathe", O))
+	if(default_deconstruction_screwdriver(user, "h_lathe_maint", "h_lathe", O))
 		if(linked_console)
 			linked_console.linked_destroy = null
 			linked_console = null
@@ -133,20 +133,20 @@
 		to_chat(user, "<span class='warning'>The [O] is not yet valid for the [src] and must be completed!</span>")
 		return
 
-	if (disabled)
+	if(disabled)
 		return
-	if (!linked_console)
+	if(!linked_console)
 		to_chat(user, "<span class='warning'>The [src] must be linked to an R&D console first!</span>")
 		return
-	if (loaded_item)
+	if(loaded_item)
 		to_chat(user, "<span class='warning'>The [src] is already loaded.</span>")
 		return
-	if (istype(O, /obj/item))
+	if(istype(O, /obj/item))
 		if(!O.origin_tech)
 			to_chat(user, "<span class='warning'>This doesn't seem to have a tech origin!</span>")
 			return
 		var/list/temp_tech = ConvertReqString2List(O.origin_tech)
-		if (temp_tech.len == 0)
+		if(temp_tech.len == 0)
 			to_chat(user, "<span class='warning'>You cannot experiment on this item!</span>")
 			return
 		if(O.reliability < 90 && O.crit_fail == 0)

code/modules/research/message_server.dm

@@ -87,12 +87,12 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 /obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
 	rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
 	var/authmsg = "[message]<br>"
-	if (id_auth)
+	if(id_auth)
 		authmsg += "[id_auth]<br>"
-	if (stamp)
+	if(stamp)
 		authmsg += "[stamp]<br>"
-	for (var/obj/machinery/requests_console/Console in allConsoles)
-		if (ckey(Console.department) == ckey(recipient))
+	for(var/obj/machinery/requests_console/Console in allConsoles)
+		if(ckey(Console.department) == ckey(recipient))
 			if(Console.inoperable())
 				Console.message_log += "<B>Message lost due to console failure.</B><BR>Please contact [station_name()] system adminsitrator or AI for technical assistance.<BR>"
 				continue
@@ -123,7 +123,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 /obj/machinery/message_server/update_icon()
 	if((stat & (BROKEN|NOPOWER)))
 		icon_state = "server-nopower"
-	else if (!active)
+	else if(!active)
 		icon_state = "server-off"
 	else
 		icon_state = "server-on"

code/modules/research/protolathe.dm

@@ -87,9 +87,9 @@ Note: Must be placed west/left of and R&D console to function.
 	return A
 
 /obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if (shocked)
+	if(shocked)
 		shock(user,50)
-	if (default_deconstruction_screwdriver(user, "protolathe_t", "protolathe", O))
+	if(default_deconstruction_screwdriver(user, "protolathe_t", "protolathe", O))
 		if(linked_console)
 			linked_console.linked_lathe = null
 			linked_console = null
@@ -98,7 +98,7 @@ Note: Must be placed west/left of and R&D console to function.
 	if(exchange_parts(user, O))
 		return
 
-	if (panel_open)
+	if(panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
 			for(var/obj/I in component_parts)
 				if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
@@ -114,17 +114,17 @@ Note: Must be placed west/left of and R&D console to function.
 		else
 			to_chat(user, "<span class='warning'>You can't load the [src.name] while it's opened.</span>")
 			return 1
-	if (disabled)
+	if(disabled)
 		return
-	if (!linked_console)
+	if(!linked_console)
 		to_chat(user, "<span class='warning'> The [src.name] must be linked to an R&D console first!</span>")
 		return 1
-	if (busy)
+	if(busy)
 		to_chat(user, "<span class='warning'>The [src.name] is busy. Please wait for completion of previous operation.</span>")
 		return 1
-	if (O.is_open_container())
+	if(O.is_open_container())
 		return
-	if (stat)
+	if(stat)
 		return 1
 	if(!istype(O,/obj/item/stack/sheet))
 		return 1

code/modules/research/rdconsole.dm

@@ -76,7 +76,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 proc/CallMaterialName(ID)
 	var/datum/reagent/temp_reagent
 	var/return_name = null
-	if (copytext(ID, 1, 2) == "$")
+	if(copytext(ID, 1, 2) == "$")
 		return_name = copytext(ID, 2)
 		switch(return_name)
 			if("metal")
@@ -168,7 +168,7 @@ proc/CallMaterialName(ID)
 			return
 
 		if(istype(D, /obj/item/weapon/disk/tech_disk)) t_disk = D
-		else if (istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D
+		else if(istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D
 		else
 			to_chat(user, "<span class='danger'>Machine cannot accept disks in that format.</span>")
 			return
@@ -432,13 +432,13 @@ proc/CallMaterialName(ID)
 				if(linked_lathe.busy)
 					g2g = 0
 				var/key = usr.key	//so we don't lose the info during the spawn delay
-				if (!(being_built.build_type & PROTOLATHE))
+				if(!(being_built.build_type & PROTOLATHE))
 					g2g = 0
 					message_admins("Protolathe exploit attempted by [key_name(usr, usr.client)]!")
 
 
 
-				if (g2g) //If input is incorrect, nothing happens
+				if(g2g) //If input is incorrect, nothing happens
 					var/enough_materials = 1
 					linked_lathe.busy = 1
 					flick("protolathe_n",linked_lathe)
@@ -509,13 +509,13 @@ proc/CallMaterialName(ID)
 					power += round(being_built.materials[M] / 5)
 				power = max(2000, power)
 				wait_message = "Imprinting Circuit. Please Wait..."
-				if (linked_imprinter.busy)
+				if(linked_imprinter.busy)
 					g2g = 0
-				if (!(being_built.build_type & IMPRINTER))
+				if(!(being_built.build_type & IMPRINTER))
 					g2g = 0
 					message_admins("Circuit imprinter exploit attempted by [key_name(usr, usr.client)]!")
 
-				if (g2g) //Again, if input is wrong, do nothing
+				if(g2g) //Again, if input is wrong, do nothing
 					linked_imprinter.busy = 1
 					flick("circuit_imprinter_ani",linked_imprinter)
 					use_power(power)
@@ -559,10 +559,10 @@ proc/CallMaterialName(ID)
 
 	else if(href_list["lathe_ejectsheet"] && linked_lathe) //Causes the protolathe to eject a sheet of material
 		var/desired_num_sheets
-		if (href_list["lathe_ejectsheet_amt"] == "custom")
+		if(href_list["lathe_ejectsheet_amt"] == "custom")
 			desired_num_sheets = input("How many sheets would you like to eject from the machine?", "How much?", 1) as null|num
 			desired_num_sheets = max(0,desired_num_sheets) // If you input too high of a number, the mineral datum will take care of it either way
-			if (!desired_num_sheets)
+			if(!desired_num_sheets)
 				return
 			desired_num_sheets = round(desired_num_sheets) // No partial-sheet goofery
 		else
@@ -571,10 +571,10 @@ proc/CallMaterialName(ID)
 
 	else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the protolathe to eject a sheet of material
 		var/desired_num_sheets = text2num(href_list["imprinter_ejectsheet_amt"])
-		if (href_list["imprinter_ejectsheet_amt"] == "custom")
+		if(href_list["imprinter_ejectsheet_amt"] == "custom")
 			desired_num_sheets = input("How many sheets would you like to eject from the machine?", "How much?", 1) as null|num
 			desired_num_sheets = max(0,desired_num_sheets) // for the imprinter they have something hacky, that still will guard against shenanigans. eh
-			if (!desired_num_sheets)
+			if(!desired_num_sheets)
 				return
 			desired_num_sheets = round(desired_num_sheets) // No partial-sheet goofery
 		else
@@ -846,7 +846,7 @@ proc/CallMaterialName(ID)
 					materials_list[++materials_list.len] = material_list
 					material_list["name"] = CallMaterialName(M)
 					material_list["amount"] = D.materials[M] / coeff
-					if (!linked_imprinter.check_mat(D, M))
+					if(!linked_imprinter.check_mat(D, M))
 						check_materials = 0
 						material_list["is_red"] = 1
 					else
@@ -869,7 +869,7 @@ proc/CallMaterialName(ID)
 				loaded_chemical["id"] = R.id
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "r_n_d.tmpl", src.name, 800, 550)
 		ui.set_initial_data(data)
 		ui.open()

code/modules/research/rdmachines.dm

@@ -36,7 +36,7 @@
 	w -= src.disable_wire
 
 /obj/machinery/r_n_d/attack_hand(mob/user as mob)
-	if (shocked)
+	if(shocked)
 		shock(user,50)
 	if(panel_open)
 		var/dat as text
@@ -58,7 +58,7 @@
 	src.add_fingerprint(usr)
 	if(href_list["pulse"])
 		var/temp_wire = href_list["wire"]
-		if (!istype(usr.get_active_hand(), /obj/item/device/multitool))
+		if(!istype(usr.get_active_hand(), /obj/item/device/multitool))
 			to_chat(usr, "You need a multitool!")
 		else
 			if(src.wires[temp_wire])
@@ -76,7 +76,7 @@
 					src.shock(usr,50)
 					spawn(100) src.shocked = !src.shocked
 	if(href_list["cut"])
-		if (!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters))
+		if(!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters))
 			to_chat(usr, "You need wirecutters!")
 		else
 			var/temp_wire = href_list["wire"]

code/modules/research/server.dm

@@ -132,10 +132,10 @@
 				air_update_turf()
 
 /obj/machinery/r_n_d/server/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	if (disabled)
+	if(disabled)
 		return
 
-	if (shocked)
+	if(shocked)
 		shock(user,50)
 
 	if(istype(O, /obj/item/weapon/screwdriver))
@@ -145,17 +145,17 @@
 	if(exchange_parts(user, O))
 		return 1
 
-	if (panel_open)
+	if(panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
 			griefProtection()
 			default_deconstruction_crowbar(O)
 			return 1
 
 /obj/machinery/r_n_d/server/attack_hand(mob/user as mob)
-	if (disabled)
+	if(disabled)
 		return
 
-	if (shocked)
+	if(shocked)
 		shock(user,50)
 	return
 

code/modules/research/xenoarchaeology/artifact/artifact.dm

@@ -63,7 +63,7 @@
 			M.selected.action(src)
 
 /obj/structure/boulder/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/device/core_sampler))
+	if(istype(W, /obj/item/device/core_sampler))
 		if(geological_data)
 			src.geological_data.artifact_distance = rand(-100,100) / 100
 			src.geological_data.artifact_id = artifact_find.artifact_id
@@ -72,19 +72,19 @@
 		C.sample_item(src, user)
 		return
 
-	if (istype(W, /obj/item/device/depth_scanner))
+	if(istype(W, /obj/item/device/depth_scanner))
 		var/obj/item/device/depth_scanner/C = W
 		C.scan_atom(user, src)
 		return
 
-	if (istype(W, /obj/item/device/measuring_tape))
+	if(istype(W, /obj/item/device/measuring_tape))
 		var/obj/item/device/measuring_tape/P = W
 		user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].")
 		if(do_after(user,40, target = src))
 			to_chat(user, "\blue [bicon(P)] [src] has been excavated to a depth of [2*src.excavation_level]cm.")
 		return
 
-	if (istype(W, /obj/item/weapon/pickaxe))
+	if(istype(W, /obj/item/weapon/pickaxe))
 		var/obj/item/weapon/pickaxe/P = W
 
 		to_chat(user, "\red You start [P.drill_verb] [src].")

code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm

@@ -220,7 +220,7 @@ var/list/valid_secondary_effect_types = list(\
 			secondary_effect.ToggleActivate(0)
 
 /obj/machinery/artifact/attack_hand(var/mob/user as mob)
-	if (get_dist(user, src) > 1)
+	if(get_dist(user, src) > 1)
 		to_chat(user, "\red You can't reach [src] from here.")
 		return
 	if(ishuman(user) && user:gloves)
@@ -238,7 +238,7 @@ var/list/valid_secondary_effect_types = list(\
 	if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH)
 		secondary_effect.ToggleActivate(0)
 
-	if (my_effect.effect == EFFECT_TOUCH)
+	if(my_effect.effect == EFFECT_TOUCH)
 		my_effect.DoEffectTouch(user)
 
 	if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated)
@@ -246,7 +246,7 @@ var/list/valid_secondary_effect_types = list(\
 
 /obj/machinery/artifact/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params)
 
-	if (istype(W, /obj/item/weapon/reagent_containers/))
+	if(istype(W, /obj/item/weapon/reagent_containers/))
 		if(W.reagents.has_reagent("hydrogen", 1) || W.reagents.has_reagent("water", 1))
 			if(my_effect.trigger == TRIGGER_WATER)
 				my_effect.ToggleActivate()
@@ -272,12 +272,12 @@ var/list/valid_secondary_effect_types = list(\
 			istype(W,/obj/item/weapon/melee/cultblade) ||\
 			istype(W,/obj/item/weapon/card/emag) ||\
 			istype(W,/obj/item/device/multitool))
-		if (my_effect.trigger == TRIGGER_ENERGY)
+		if(my_effect.trigger == TRIGGER_ENERGY)
 			my_effect.ToggleActivate()
 		if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25))
 			secondary_effect.ToggleActivate(0)
 
-	else if (istype(W,/obj/item/weapon/match) && W:lit ||\
+	else if(istype(W,/obj/item/weapon/match) && W:lit ||\
 			istype(W,/obj/item/weapon/weldingtool) && W:welding ||\
 			istype(W,/obj/item/weapon/lighter) && W:lit)
 		if(my_effect.trigger == TRIGGER_HEAT)
@@ -286,7 +286,7 @@ var/list/valid_secondary_effect_types = list(\
 			secondary_effect.ToggleActivate(0)
 	else
 		..()
-		if (my_effect.trigger == TRIGGER_FORCE && W.force >= 10)
+		if(my_effect.trigger == TRIGGER_FORCE && W.force >= 10)
 			my_effect.ToggleActivate()
 		if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
 			secondary_effect.ToggleActivate(0)
@@ -302,14 +302,14 @@ var/list/valid_secondary_effect_types = list(\
 	else if(ishuman(M) && !istype(M:gloves,/obj/item/clothing/gloves))
 		var/warn = 0
 
-		if (my_effect.trigger == TRIGGER_TOUCH && prob(50))
+		if(my_effect.trigger == TRIGGER_TOUCH && prob(50))
 			my_effect.ToggleActivate()
 			warn = 1
 		if(secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH && prob(25))
 			secondary_effect.ToggleActivate(0)
 			warn = 1
 
-		if (my_effect.effect == EFFECT_TOUCH && prob(50))
+		if(my_effect.effect == EFFECT_TOUCH && prob(50))
 			my_effect.DoEffectTouch(M)
 			warn = 1
 		if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated && prob(50))
@@ -340,7 +340,7 @@ var/list/valid_secondary_effect_types = list(\
 	switch(severity)
 		if(1.0) qdel(src)
 		if(2.0)
-			if (prob(50))
+			if(prob(50))
 				qdel(src)
 			else
 				if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
@@ -348,7 +348,7 @@ var/list/valid_secondary_effect_types = list(\
 				if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25))
 					secondary_effect.ToggleActivate(0)
 		if(3.0)
-			if (my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
+			if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
 				my_effect.ToggleActivate()
 			if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25))
 				secondary_effect.ToggleActivate(0)

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm

@@ -28,7 +28,7 @@
 
 /datum/artifact_effect/badfeeling/DoEffectTouch(var/mob/user)
 	if(user)
-		if (istype(user, /mob/living/carbon/human))
+		if(istype(user, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = user
 			if(prob(50))
 				if(prob(75))
@@ -42,7 +42,7 @@
 /datum/artifact_effect/badfeeling/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+		for(var/mob/living/carbon/human/H in range(src.effectrange,T))
 			if(prob(5))
 				if(prob(75))
 					to_chat(H, "<font color='red'>[pick(messages)]</font>")
@@ -56,7 +56,7 @@
 /datum/artifact_effect/badfeeling/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+		for(var/mob/living/carbon/human/H in range(src.effectrange,T))
 			if(prob(50))
 				if(prob(95))
 					to_chat(H, "<font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm

@@ -8,7 +8,7 @@
 	if(user)
 		if(istype(user, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/R = user
-			for (var/obj/item/weapon/stock_parts/cell/D in R.contents)
+			for(var/obj/item/weapon/stock_parts/cell/D in R.contents)
 				D.charge += rand() * 100 + 50
 				to_chat(R, "\blue SYSTEM ALERT: Large energy boost detected!")
 			return 1
@@ -16,13 +16,13 @@
 /datum/artifact_effect/cellcharge/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/obj/machinery/power/apc/C in range(200, T))
-			for (var/obj/item/weapon/stock_parts/cell/B in C.contents)
+		for(var/obj/machinery/power/apc/C in range(200, T))
+			for(var/obj/item/weapon/stock_parts/cell/B in C.contents)
 				B.charge += 25
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for(var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge += 25
-		for (var/mob/living/silicon/robot/M in mob_list)
-			for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
+		for(var/mob/living/silicon/robot/M in mob_list)
+			for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
 				D.charge += 25
 				to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!")
 		return 1
@@ -30,13 +30,13 @@
 /datum/artifact_effect/cellcharge/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/obj/machinery/power/apc/C in range(200, T))
-			for (var/obj/item/weapon/stock_parts/cell/B in C.contents)
+		for(var/obj/machinery/power/apc/C in range(200, T))
+			for(var/obj/item/weapon/stock_parts/cell/B in C.contents)
 				B.charge += rand() * 100
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for(var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge += 250
-		for (var/mob/living/silicon/robot/M in mob_list)
-			for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
+		for(var/mob/living/silicon/robot/M in mob_list)
+			for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
 				D.charge += rand() * 100
 				to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!")
 		return 1

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm

@@ -8,7 +8,7 @@
 	if(user)
 		if(istype(user, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/R = user
-			for (var/obj/item/weapon/stock_parts/cell/D in R.contents)
+			for(var/obj/item/weapon/stock_parts/cell/D in R.contents)
 				D.charge = max(D.charge - rand() * 100, 0)
 				to_chat(R, "\blue SYSTEM ALERT: Energy drain detected!")
 			return 1
@@ -18,13 +18,13 @@
 /datum/artifact_effect/celldrain/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/obj/machinery/power/apc/C in range(200, T))
-			for (var/obj/item/weapon/stock_parts/cell/B in C.contents)
+		for(var/obj/machinery/power/apc/C in range(200, T))
+			for(var/obj/item/weapon/stock_parts/cell/B in C.contents)
 				B.charge = max(B.charge - 50,0)
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for(var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge = max(S.charge - 100,0)
-		for (var/mob/living/silicon/robot/M in mob_list)
-			for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
+		for(var/mob/living/silicon/robot/M in mob_list)
+			for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
 				D.charge = max(D.charge - 50,0)
 				to_chat(M, "\red SYSTEM ALERT: Energy drain detected!")
 	return 1
@@ -32,13 +32,13 @@
 /datum/artifact_effect/celldrain/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/obj/machinery/power/apc/C in range(200, T))
-			for (var/obj/item/weapon/stock_parts/cell/B in C.contents)
+		for(var/obj/machinery/power/apc/C in range(200, T))
+			for(var/obj/item/weapon/stock_parts/cell/B in C.contents)
 				B.charge = max(B.charge - rand() * 150,0)
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for(var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge = max(S.charge - 250,0)
-		for (var/mob/living/silicon/robot/M in mob_list)
-			for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
+		for(var/mob/living/silicon/robot/M in mob_list)
+			for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
 				D.charge = max(D.charge - rand() * 150,0)
 				to_chat(M, "\red SYSTEM ALERT: Energy drain detected!")
 	return 1

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm

@@ -26,7 +26,7 @@
 
 /datum/artifact_effect/goodfeeling/DoEffectTouch(var/mob/user)
 	if(user)
-		if (istype(user, /mob/living/carbon/human))
+		if(istype(user, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = user
 			if(prob(50))
 				if(prob(75))
@@ -40,7 +40,7 @@
 /datum/artifact_effect/goodfeeling/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+		for(var/mob/living/carbon/human/H in range(src.effectrange,T))
 			if(prob(5))
 				if(prob(75))
 					to_chat(H, "<font color='blue'>[pick(messages)]</font>")
@@ -54,7 +54,7 @@
 /datum/artifact_effect/goodfeeling/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+		for(var/mob/living/carbon/human/H in range(src.effectrange,T))
 			if(prob(50))
 				if(prob(95))
 					to_chat(H, "<font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm

@@ -38,7 +38,7 @@
 	//todo: check over this properly
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
+		for(var/mob/living/carbon/C in range(src.effectrange,T))
 			var/weakness = GetAnomalySusceptibility(C)
 			if(prob(weakness * 100))
 				if(prob(10))
@@ -54,7 +54,7 @@
 	//todo: check over this properly
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
+		for(var/mob/living/carbon/C in range(src.effectrange,T))
 			var/weakness = GetAnomalySusceptibility(C)
 			if(prob(weakness * 100))
 				to_chat(C, "\blue A wave of energy invigorates you.")

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm

@@ -22,7 +22,7 @@
 /datum/artifact_effect/hurt/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
+		for(var/mob/living/carbon/C in range(src.effectrange,T))
 			var/weakness = GetAnomalySusceptibility(C)
 			if(prob(weakness * 100))
 				if(prob(10))
@@ -37,7 +37,7 @@
 /datum/artifact_effect/hurt/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(effectrange, T))
+		for(var/mob/living/carbon/C in range(effectrange, T))
 			var/weakness = GetAnomalySusceptibility(C)
 			if(prob(weakness * 100))
 				to_chat(C, "\red A wave of painful energy strikes you!")

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_radiate.dm

@@ -17,7 +17,7 @@
 /datum/artifact_effect/radiate/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/M in range(src.effectrange,T))
+		for(var/mob/living/M in range(src.effectrange,T))
 			M.apply_effect(radiation_amount,IRRADIATE,0)
 			M.updatehealth()
 		return 1
@@ -25,7 +25,7 @@
 /datum/artifact_effect/radiate/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/M in range(src.effectrange,T))
+		for(var/mob/living/M in range(src.effectrange,T))
 			M.apply_effect(radiation_amount * 25,IRRADIATE,0)
 			M.updatehealth()
 		return 1

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm

@@ -8,7 +8,7 @@
 
 /datum/artifact_effect/roboheal/DoEffectTouch(var/mob/user)
 	if(user)
-		if (istype(user, /mob/living/silicon/robot))
+		if(istype(user, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/R = user
 			to_chat(R, "\blue Your systems report damaged components mending by themselves!")
 			R.adjustBruteLoss(rand(-10,-30))
@@ -18,7 +18,7 @@
 /datum/artifact_effect/roboheal/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
+		for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
 			if(prob(10))
 				to_chat(M, "\blue SYSTEM ALERT: Beneficial energy field detected!")
 			M.adjustBruteLoss(-1)
@@ -29,7 +29,7 @@
 /datum/artifact_effect/roboheal/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
+		for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
 			to_chat(M, "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!")
 			M.adjustBruteLoss(-10)
 			M.adjustFireLoss(-10)

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm

@@ -8,7 +8,7 @@
 
 /datum/artifact_effect/robohurt/DoEffectTouch(var/mob/user)
 	if(user)
-		if (istype(user, /mob/living/silicon/robot))
+		if(istype(user, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/R = user
 			to_chat(R, "\red Your systems report severe damage has been inflicted!")
 			R.adjustBruteLoss(rand(10,50))
@@ -18,7 +18,7 @@
 /datum/artifact_effect/robohurt/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
+		for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
 			if(prob(10))
 				to_chat(M, "\red SYSTEM ALERT: Harmful energy field detected!")
 			M.adjustBruteLoss(1)
@@ -29,7 +29,7 @@
 /datum/artifact_effect/robohurt/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
+		for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
 			to_chat(M, "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!")
 			M.adjustBruteLoss(10)
 			M.adjustFireLoss(10)

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm

@@ -23,14 +23,14 @@
 /datum/artifact_effect/sleepy/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+		for(var/mob/living/carbon/human/H in range(src.effectrange,T))
 			var/weakness = GetAnomalySusceptibility(H)
 			if(prob(weakness * 100))
 				if(prob(10))
 					to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
 				H.drowsyness = min(H.drowsyness + 1 * weakness, 25 * weakness)
 				H.eye_blurry = min(H.eye_blurry + 1 * weakness, 25 * weakness)
-		for (var/mob/living/silicon/robot/R in range(src.effectrange,holder))
+		for(var/mob/living/silicon/robot/R in range(src.effectrange,holder))
 			to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
 		return 1
 
@@ -43,6 +43,6 @@
 				to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
 				H.drowsyness = min(H.drowsyness + rand(5,15) * weakness, 50 * weakness)
 				H.eye_blurry = min(H.eye_blurry + rand(5,15) * weakness, 50 * weakness)
-		for (var/mob/living/silicon/robot/R in range(src.effectrange,holder))
+		for(var/mob/living/silicon/robot/R in range(src.effectrange,holder))
 			to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
 		return 1

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm

@@ -19,7 +19,7 @@
 /datum/artifact_effect/stun/DoEffectAura()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
+		for(var/mob/living/carbon/C in range(src.effectrange,T))
 			var/susceptibility = GetAnomalySusceptibility(C)
 			if(prob(10 * susceptibility))
 				to_chat(C, "\red Your body goes numb for a moment.")
@@ -33,7 +33,7 @@
 /datum/artifact_effect/stun/DoEffectPulse()
 	if(holder)
 		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
+		for(var/mob/living/carbon/C in range(src.effectrange,T))
 			var/susceptibility = GetAnomalySusceptibility(C)
 			if(prob(100 * susceptibility))
 				to_chat(C, "\red A wave of energy overwhelms your senses!")

code/modules/research/xenoarchaeology/finds/finds_misc.dm

@@ -25,11 +25,11 @@
 	return
 
 /obj/item/weapon/shard/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if ( istype(W, /obj/item/weapon/weldingtool))
+	if( istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.remove_fuel(0, user))
 			var/obj/item/stack/sheet/plasmaglass/NG = new (user.loc)
-			for (var/obj/item/stack/sheet/plasmaglass/G in user.loc)
+			for(var/obj/item/stack/sheet/plasmaglass/G in user.loc)
 				if(G==NG)
 					continue
 				if(G.amount>=G.max_amount)

code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm

@@ -113,9 +113,9 @@
 
 	var/list/listening = viewers(holder_atom)
 	for(var/mob/M in mob_list)
-		if (!M.client)
+		if(!M.client)
 			continue //skip monkeys and leavers
-		if (istype(M, /mob/new_player))
+		if(istype(M, /mob/new_player))
 			continue
 		if(M.stat == 2 &&  M.client.prefs.toggles & CHAT_GHOSTEARS)
 			listening|=M

code/modules/research/xenoarchaeology/genetics/reconstitutor.dm

@@ -61,7 +61,7 @@ datum/genesequence
 				src.visible_message("\blue [bicon(src)] [user] inserts [W] into [src], the fossil is consumed as [src] extracts genetic data from it.")
 				qdel(W)
 				updateDialog()
-	else if (istype(W, /obj/item/weapon/storage))
+	else if(istype(W, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = W
 		S.hide_from(usr)
 		var/numaccepted = 0

code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm

@@ -116,7 +116,7 @@
 
 /obj/machinery/artifact_harvester/Topic(href, href_list)
 
-	if (href_list["harvest"])
+	if(href_list["harvest"])
 		if(!inserted_battery)
 			src.visible_message("<b>[src]</b> states, \"Cannot harvest. No battery inserted.\"")
 
@@ -213,7 +213,7 @@
 								inserted_battery.battery_effect = E
 								inserted_battery.stored_charge = 0
 
-	if (href_list["stopharvest"])
+	if(href_list["stopharvest"])
 		if(harvesting)
 			if(harvesting < 0 && inserted_battery.battery_effect && inserted_battery.battery_effect.activated)
 				inserted_battery.battery_effect.ToggleActivate()
@@ -224,11 +224,11 @@
 			src.visible_message("<b>[name]</b> states, \"Energy harvesting interrupted.\"")
 			icon_state = "incubator"
 
-	if (href_list["ejectbattery"])
+	if(href_list["ejectbattery"])
 		src.inserted_battery.loc = src.loc
 		src.inserted_battery = null
 
-	if (href_list["drainbattery"])
+	if(href_list["drainbattery"])
 		if(inserted_battery)
 			if(inserted_battery.battery_effect && inserted_battery.stored_charge > 0)
 				if(alert("This action will dump all charge, safety gear is recommended before proceeding","Warning","Continue","Cancel"))

code/modules/research/xenoarchaeology/machinery/coolant.dm

@@ -47,9 +47,9 @@ datum/chemical_reaction/coolant
 
 	var/datum/gas_mixture/env = src.loc.return_air()
 	if(env)
-		if (reagents.total_volume > 750)
+		if(reagents.total_volume > 750)
 			env.temperature = 0
-		else if (reagents.total_volume > 500)
+		else if(reagents.total_volume > 500)
 			env.temperature -= 100
 		else
 			env.temperature -= 50

code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm

@@ -97,8 +97,8 @@
 	fresh_coolant = 0
 	coolant_purity = 0
 	var/num_reagent_types = 0
-	for (var/datum/reagent/current_reagent in src.reagents.reagent_list)
-		if (!current_reagent)
+	for(var/datum/reagent/current_reagent in src.reagents.reagent_list)
+		if(!current_reagent)
 			continue
 		var/cur_purity = coolant_reagents_purity[current_reagent.id]
 		if(!cur_purity)
@@ -144,7 +144,7 @@
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "geoscanner.tmpl", "High Res Radiocarbon Spectrometer", 900, 825)

code/modules/research/xenoarchaeology/tools/ano_device_battery.dm

@@ -195,7 +195,7 @@
 	return ..()
 
 /obj/item/weapon/anodevice/attack(mob/living/M as mob, mob/living/user as mob, def_zone)
-	if (!istype(M))
+	if(!istype(M))
 		return
 
 	if(activated && inserted_battery.battery_effect.effect == EFFECT_TOUCH && !isnull(inserted_battery))

code/modules/research/xenoarchaeology/tools/suspension_generator.dm

@@ -22,7 +22,7 @@
 /obj/machinery/suspension_gen/process()
 	//set background = 1
 
-	if (suspension_field)
+	if(suspension_field)
 		cell.charge -= power_use
 
 		var/turf/T = get_turf(suspension_field)
@@ -126,11 +126,11 @@
 	if(href_list["select_field"])
 		field_type = href_list["select_field"]
 	else if(href_list["insertcard"])
-		if (istype(usr, /mob/living/silicon))
+		if(istype(usr, /mob/living/silicon))
 			locked = 0
 		else
 			var/obj/item/I = usr.get_active_hand()
-			if (istype(I, /obj/item/weapon/card))
+			if(istype(I, /obj/item/weapon/card))
 				usr.drop_item()
 				I.loc = src
 				auth_card = I
@@ -169,14 +169,14 @@
 		to_chat(user, "<span class='info'>You remove the power cell</span>")
 
 /obj/machinery/suspension_gen/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if (istype(W, /obj/item/weapon/screwdriver))
+	if(istype(W, /obj/item/weapon/screwdriver))
 		if(!open)
 			if(screwed)
 				screwed = 0
 			else
 				screwed = 1
 			to_chat(user, "<span class='info'>You [screwed ? "screw" : "unscrew"] the battery panel.</span>")
-	else if (istype(W, /obj/item/weapon/crowbar))
+	else if(istype(W, /obj/item/weapon/crowbar))
 		if(!locked)
 			if(!screwed)
 				if(!suspension_field)
@@ -192,7 +192,7 @@
 				to_chat(user, "<span class='warning'>Unscrew [src]'s battery panel first.</span>")
 		else
 			to_chat(user, "<span class='warning'>[src]'s security locks are engaged.</span>")
-	else if (istype(W, /obj/item/weapon/wrench))
+	else if(istype(W, /obj/item/weapon/wrench))
 		if(!suspension_field)
 			if(anchored)
 				anchored = 0
@@ -205,7 +205,7 @@
 				desc = "It has stubby legs bolted up against it's body for stabilising."
 		else
 			to_chat(user, "<span class='warning'>You are unable to secure [src] while it is active!</span>")
-	else if (istype(W, /obj/item/weapon/stock_parts/cell))
+	else if(istype(W, /obj/item/weapon/stock_parts/cell))
 		if(open)
 			if(cell)
 				to_chat(user, "<span class='warning'>There is a power cell already installed.</span>")

code/modules/research/xenoarchaeology/tools/tools_locater.dm

@@ -86,7 +86,7 @@
 		target_radio = null
 	else if(href_list["freq"])
 		var/new_frequency = (frequency + text2num(href_list["freq"]))
-		if (frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
+		if(frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
 			new_frequency = sanitize_frequency(new_frequency, 1499)
 		frequency = new_frequency
 

code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm

@@ -111,7 +111,7 @@
 	attack_self(var/mob/user as mob)
 		var/N = input("Excavation amount (in centimeters):", "[src]") as null|anything in possible_excavation_amounts
 
-		if (N)
+		if(N)
 			excavation_amount = N / 2
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

code/modules/research/xenobiology/xenobiology.dm

@@ -125,7 +125,7 @@
 	origin_tech = "biotech=4"
 
 /obj/item/slimepotion/afterattack(obj/item/weapon/reagent_containers/target, mob/user , proximity)
-	if (istype(target))
+	if(istype(target))
 		to_chat(user, "<span class='notice'>You cannot transfer [src] to [target]! It appears the potion must be given directly to a slime to absorb.</span>") // le fluff faec
 		return
 
@@ -154,7 +154,7 @@
 		qdel(M)
 		var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
 
-		if (!newname)
+		if(!newname)
 			newname = "pet slime"
 		pet.name = newname
 		pet.real_name = newname
@@ -168,7 +168,7 @@
 		qdel(M)
 		var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
 
-		if (!newname)
+		if(!newname)
 			newname = "pet slime"
 		pet.name = newname
 		pet.real_name = newname