diff --git a/code/__defines/colors.dm b/code/__defines/colors.dm
index 27f1b7335b..f3a99eaec2 100644
--- a/code/__defines/colors.dm
+++ b/code/__defines/colors.dm
@@ -183,5 +183,5 @@
 #define COLOR_DARKMODE_DARKBACKGROUND "#171717"
 #define COLOR_DARKMODE_TEXT "#a4bad6"
 
-#define COLOR_INPUT_DISABLED "#F0F0F0"
-#define COLOR_INPUT_ENABLED "#D3B5B5"
+#define COLOR_INPUT_DISABLED "#f0f0f0"
+#define COLOR_INPUT_ENABLED "#d3b5b5"
diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm
index e196016655..8f8ec7b651 100644
--- a/code/_helpers/text.dm
+++ b/code/_helpers/text.dm
@@ -236,7 +236,7 @@ var/list/html_allowed_tags = list(
 )
 var/list/html_allowed_attrs = list(
 	"style", "class",       // Everything
-	"color", "size", "face" // <font>
+	"color", "size", "face" // <font></font>
 )
 
 // It's not perfect, but will work in most cases
diff --git a/code/controllers/subsystems/garbage.dm b/code/controllers/subsystems/garbage.dm
index 1b2c6ecafa..4e4b3202fa 100644
--- a/code/controllers/subsystems/garbage.dm
+++ b/code/controllers/subsystems/garbage.dm
@@ -503,6 +503,6 @@ SUBSYSTEM_DEF(garbage)
 
 			else if (islist(I))
 				var/list/Xlist = X
-				DoSearchVar(I, "[Xname]\[[Xlist.Find(I)]\] -> list", recursive_limit-1)
+				DoSearchVar(I, "[Xname]\[[list_find(Xlist, I)]\] -> list", recursive_limit-1)
 
 #endif
diff --git a/code/controllers/subsystems/timer.dm b/code/controllers/subsystems/timer.dm
index 6ad6346533..8cb8f67d97 100644
--- a/code/controllers/subsystems/timer.dm
+++ b/code/controllers/subsystems/timer.dm
@@ -12,7 +12,7 @@
   *
   * Handles creation, callbacks, and destruction of timed events.
   *
-    * It is important to understand the buckets used in the timer subsystem are just a series of doubly-linked
+  * It is important to understand the buckets used in the timer subsystem are just a series of doubly-linked
   * lists. The object at a given index in bucket_list is a /datum/timedevent, the head of a list, which has prev
   * and next references for the respective elements in that bucket's list.
   */
@@ -303,7 +303,7 @@ SUBSYSTEM_DEF(timer)
 		// Check that timer has a valid callback and hasn't been invoked
 		if (!timer.callBack || timer.spent)
 			WARNING("Invalid timer: [get_timer_debug_string(timer)] world.time: [world.time], \
-            	head_offset: [head_offset], practical_offset: [practical_offset]")
+					 head_offset: [head_offset], practical_offset: [practical_offset]")
 			if (timer.callBack)
 				qdel(timer)
 			continue
diff --git a/code/datums/communication/channel.dm b/code/datums/communication/channel.dm
index 091bf46c92..f3d1ee81c9 100644
--- a/code/datums/communication/channel.dm
+++ b/code/datums/communication/channel.dm
@@ -25,7 +25,8 @@
 */
 /decl/communication_channel/proc/communicate(var/datum/communicator, var/message)
 	if(can_communicate(arglist(args)))
-		call(log_proc)(message, communicator.get_client().mob)
+		var/client/C = communicator.get_client()
+		call(log_proc)(message, C.mob)
 		return do_communicate(arglist(args))
 	return FALSE
 
diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm
index 863128c2fc..588ffcdde3 100644
--- a/code/game/antagonist/station/traitor.dm
+++ b/code/game/antagonist/station/traitor.dm
@@ -35,48 +35,48 @@ GLOBAL_DATUM_INIT(traitors, /datum/antagonist/traitor, new)
 		return 1
 
 /datum/antagonist/traitor/create_objectives(var/datum/mind/traitor)
-    if(!..())
-        return
-    var/objectives_count = round(count_living()/config.traitor_objectives_scaling) + 1
-    var/datum/objective/objective = null
-    for (var/count in 1 to objectives_count)
-        switch(rand(1,100))
-            if(1 to 10)
-                objective = new /datum/objective/assassinate()
-            if(11 to 20)
-                objective = new /datum/objective/debrain()
-            if(21 to 40)
-                objective = new /datum/objective/brig()
-            if(41 to 80)
-                objective = new /datum/objective/harm()
-            else
-                objective = new /datum/objective/steal()
-
-        objective.owner = traitor
-
-        if(istype(objective, /datum/objective/steal))
-            objective.find_target(traitor.objectives)
-
-        else if (!objective.find_target())
-            qdel(objective)
-            objective = new /datum/objective/steal()
-            objective.owner = traitor
-            objective.find_target(traitor.objectives)
-
-        traitor.objectives += objective
-
-    switch(rand(1,10))
-        if(1 to 4)
-            if (!(locate(/datum/objective/escape) in traitor.objectives))
-                var/datum/objective/escape/escape_objective = new
-                escape_objective.owner = traitor
-                traitor.objectives += escape_objective
-        else
-            if (!(locate(/datum/objective/survive) in traitor.objectives))
-                var/datum/objective/survive/survive_objective = new
-                survive_objective.owner = traitor
-                traitor.objectives += survive_objective
-    return
+	if(!..())
+		return
+	var/objectives_count = round(count_living()/config.traitor_objectives_scaling) + 1
+	var/datum/objective/objective = null
+	for (var/count in 1 to objectives_count)
+		switch(rand(1,100))
+			if(1 to 10)
+				objective = new /datum/objective/assassinate()
+			if(11 to 20)
+				objective = new /datum/objective/debrain()
+			if(21 to 40)
+				objective = new /datum/objective/brig()
+			if(41 to 80)
+				objective = new /datum/objective/harm()
+			else
+				objective = new /datum/objective/steal()
+
+		objective.owner = traitor
+
+		if(istype(objective, /datum/objective/steal))
+			objective.find_target(traitor.objectives)
+
+		else if (!objective.find_target())
+			qdel(objective)
+			objective = new /datum/objective/steal()
+			objective.owner = traitor
+			objective.find_target(traitor.objectives)
+
+		traitor.objectives += objective
+
+	switch(rand(1,10))
+		if(1 to 4)
+			if (!(locate(/datum/objective/escape) in traitor.objectives))
+				var/datum/objective/escape/escape_objective = new
+				escape_objective.owner = traitor
+				traitor.objectives += escape_objective
+		else
+			if (!(locate(/datum/objective/survive) in traitor.objectives))
+				var/datum/objective/survive/survive_objective = new
+				survive_objective.owner = traitor
+				traitor.objectives += survive_objective
+	return
 
 /* original
 /datum/antagonist/traitor/create_objectives(var/datum/mind/traitor)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 0edae00e59..ca1b4ea035 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -290,13 +290,13 @@ var/global/list/all_objectives = list()
 
 
 /datum/objective/steal/find_target(var/list/used_objectives)
-    var/list/used_items = list()
-    for (var/datum/objective/steal/steal_objective in used_objectives)
-        if (istype(steal_objective))
-            used_items += steal_objective.target_name
+	var/list/used_items = list()
+	for (var/datum/objective/steal/steal_objective in used_objectives)
+		if (istype(steal_objective))
+			used_items += steal_objective.target_name
 
-    var/list/currently_possible_items = possible_items - used_items
-    return set_target(pick(currently_possible_items))
+	var/list/currently_possible_items = possible_items - used_items
+	return set_target(pick(currently_possible_items))
 
 
 /datum/objective/steal/proc/select_target()
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 207688459d..e1059da2c7 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -129,8 +129,8 @@
 		overlay.icon_state = "doorctrl[operating]-overlay"
 		overlays += overlay
 		switch(operating)
-			if(0) set_light(0.3, 0.1, 1, 2, "#F2FF00")
-			if(1) set_light(0.3, 0.1, 1, 2, "#a1FF00")
+			if(0) set_light(0.3, 0.1, 1, 2, "#f2ff00")
+			if(1) set_light(0.3, 0.1, 1, 2, "#a1ff00")
 			else set_light(0.3, 0.1, 1, 2,"#f86060")
 
 //Toggle button determines icon state from active, not operating
@@ -182,12 +182,12 @@
 		icon_state = "blastctrl-active"
 		overlay.icon_state = "big-switch-green-ol"
 		overlays += overlay
-		set_light(0.3, 0.1, 1, 2,"#a1FF00")
+		set_light(0.3, 0.1, 1, 2,"#a1ff00")
 	else
 		icon_state = "blastctrl-nonactive"
 		overlay.icon_state = "big-switch-red-ol"
 		overlays += overlay
-		set_light(0.3, 0.1, 1, 2,"#C50022")
+		set_light(0.3, 0.1, 1, 2,"#c50022")
 
 
 //-------------------------------
@@ -221,8 +221,8 @@
 		overlay.icon_state = "doorctrl[operating]-overlay"
 		overlays += overlay
 		switch(operating)
-			if(0) set_light(0.3, 0.1, 1, 2, "#F2FF00")
-			if(1) set_light(0.3, 0.1, 1, 2, "#a1FF00")
+			if(0) set_light(0.3, 0.1, 1, 2, "#f2ff00")
+			if(1) set_light(0.3, 0.1, 1, 2, "#a1ff00")
 			else set_light(0.3, 0.1, 1, 2,"#f86060")
 
 /decl/stock_part_preset/radio/basic_transmitter/button/door
diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm
index ae593b9212..9c89e5e20c 100644
--- a/code/game/machinery/computer/guestpass.dm
+++ b/code/game/machinery/computer/guestpass.dm
@@ -78,7 +78,7 @@
 	else
 		overlay.icon_state = "pass"
 		overlays += overlay
-		set_light(0.8, 0.1, 1, 2,"#0099FF")
+		set_light(0.8, 0.1, 1, 2,"#0099ff")
 
 /obj/machinery/computer/guestpass/New()
 	..()
diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm
index d1e5d6f6f6..09ce2c14bb 100644
--- a/code/game/machinery/doors/blast_door.dm
+++ b/code/game/machinery/doors/blast_door.dm
@@ -256,14 +256,14 @@
 		icon_state = "blastctrl-p"
 		overlay.icon_state = "blastctrl-p-overlay"
 		overlays += overlay
-		set_light(0.3, 0.1, 1, 2,"#C50022")
+		set_light(0.3, 0.1, 1, 2,"#c50022")
 	else
 		icon_state = "blastctrl[operating]"
 		overlay.icon_state = "blastctrl[operating]-overlay"
 		overlays += overlay
 		switch(operating)
-			if(0) set_light(0.3, 0.1, 1, 2, "#F2FF00")
-			if(1) set_light(0.3, 0.1, 1, 2, "#a1FF00")
+			if(0) set_light(0.3, 0.1, 1, 2, "#f2ff00")
+			if(1) set_light(0.3, 0.1, 1, 2, "#a1ff00")
 			else set_light(0.3, 0.1, 1, 2,"#f86060")
 
 // SUBTYPE: Regular
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 599595595a..2b6719adfe 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -255,7 +255,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED
 	hologram.mouse_opacity = 0//So you can't click on it.
 //	hologram.plane = ABOVE_HUMAN_PLANE
 	hologram.layer = ABOVE_HUMAN_LAYER //Above all the other objects/mobs. Or the vast majority of them.
-	hologram.anchored = 1//So space wind cannot drag it.
+	hologram.anchored = TRUE//So space wind cannot drag it.
 	hologram.SetName("[user.name] (Hologram)")
 	masters[user] = hologram
 	hologram.set_light(1, 0.1, 2)	//hologram lighting
@@ -463,7 +463,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED
  */
 
 /obj/machinery/hologram
-	anchored = 1
+	anchored = TRUE
 	idle_power_usage = 5
 	active_power_usage = 100
 
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index 14ee9df604..b66de90602 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -55,12 +55,11 @@
 			src.updateUsrDialog()
 			return
 		charges -= 1
-		switch(rand(1,2))
-			if(1)
-				temptext = "<font color=red><i><b>Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind.</b></i></font>"
-				src.updateUsrDialog()
-				spawn(rand(50,200)) selfdestruct()
-				return
+		if(prob(50))
+			temptext = "<font color=red><i><b>Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind.</b></i></font>"
+			src.updateUsrDialog()
+			spawn(rand(50,200)) selfdestruct()
+			return
 		if(istype(M, /mob/living/carbon/human))
 			var/mob/living/carbon/human/N = M
 			to_chat(M, "<B>You have joined the ranks of the Syndicate and become a traitor to the station!</B>")
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 288ca1e12c..71affa3371 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -548,7 +548,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 /obj/machinery/vending/powered()
 	return anchored && ..()
 
-/obj/machinery/vending/update_icon()
+/obj/machinery/vending/on_update_icon()
 	overlays.Cut()
 	if(stat & BROKEN)
 		icon_state = "[initial(icon_state)]-broken"
@@ -790,7 +790,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 
 	restockable = FALSE
 
-/obj/machinery/vending/coffee/update_icon()
+/obj/machinery/vending/coffee/on_update_icon()
 	..()
 	if(stat & BROKEN && prob(20))
 		icon_state = "[initial(icon_state)]-hellfire"
@@ -960,7 +960,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 
 	restockable = FALSE
 
-/obj/machinery/vending/fitness/update_icon()
+/obj/machinery/vending/fitness/on_update_icon()
 	..()
 	if(!(stat & NOPOWER))
 		overlays += image(icon, "[initial(icon_state)]-overlay")
@@ -1622,7 +1622,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 					/obj/item/toy/katana = 2
 					)
 
-/obj/machinery/vending/props/update_icon()
+/obj/machinery/vending/props/on_update_icon()
 	..()
 	if(!(stat & NOPOWER))
 		overlays += image(icon, "[initial(icon_state)]-overlay")
@@ -1810,7 +1810,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 
 	restockable = FALSE
 
-/obj/machinery/vending/snix/update_icon()
+/obj/machinery/vending/snix/on_update_icon()
 	..()
 	if(!(stat & NOPOWER))
 		overlays += image(icon, "[initial(icon_state)]-fan")
@@ -1878,7 +1878,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 
 	restockable = FALSE
 
-/obj/machinery/vending/weeb/update_icon()
+/obj/machinery/vending/weeb/on_update_icon()
 	..()
 	if(!(stat & NOPOWER))
 		overlays += image(icon, "[initial(icon_state)]-fan")
@@ -1903,7 +1903,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 
 	restockable = FALSE
 
-/obj/machinery/vending/hotfood/update_icon()
+/obj/machinery/vending/hotfood/on_update_icon()
 	..()
 	if(!(stat & NOPOWER))
 		overlays += image(icon, "[initial(icon_state)]-heater")
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index fe2f05082e..f1ebffa023 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -81,7 +81,7 @@
 		src.update_icon()
 		return
 
-/obj/structure/closet/body_bag/update_icon()
+/obj/structure/closet/body_bag/on_update_icon()
 	icon_state = "[initial(icon_state)][opened ? "_open" : "[contains_body ? "_occupied" : ""]"]"
 	//src.overlays.Cut()
 
diff --git a/code/game/objects/items/cryobag.dm b/code/game/objects/items/cryobag.dm
index f1900cbb6c..c0bdef9cc8 100644
--- a/code/game/objects/items/cryobag.dm
+++ b/code/game/objects/items/cryobag.dm
@@ -53,7 +53,7 @@
 		STOP_PROCESSING(SSobj, src)
 	. = ..()
 
-/obj/structure/closet/body_bag/cryobag/update_icon()
+/obj/structure/closet/body_bag/cryobag/on_update_icon()
 	..()
 	icon_state = "[initial(icon_state)][opened ? "_open" : "[contains_body ? "_occupied" : ""]"]"
 	overlays.Cut()
diff --git a/code/game/objects/items/rescuebag.dm b/code/game/objects/items/rescuebag.dm
index ff533c7b94..6c62ad9c44 100644
--- a/code/game/objects/items/rescuebag.dm
+++ b/code/game/objects/items/rescuebag.dm
@@ -81,7 +81,7 @@
 		airtank.forceMove(null)
 	update_icon()
 
-/obj/structure/closet/body_bag/rescue/update_icon()
+/obj/structure/closet/body_bag/rescue/on_update_icon()
 	icon_state = "[initial(icon_state)][opened ? "_open" : "[contains_body ? "_occupied" : ""]"]"
 	//src.overlays.Cut()
 
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 1d741a3c81..b91dedd5e3 100644
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -46,7 +46,7 @@ AI MODULES
 		else if(!ai.see_in_dark)
 			to_chat(user, "Upload failed. Only a faint signal is being detected from the intelligence, and it is not responding to our requests. It may be low on power.")
 			return
-			
+
 	if(!user.skill_check(SKILL_COMPUTER, SKILL_ADEPT))					//INF added the check
 		to_chat(user, "You don't know what to do with .... what is it?")
 		return
@@ -57,7 +57,7 @@ AI MODULES
 
 
 /obj/item/aiModule/proc/transmitInstructions(mob/living/silicon/target, mob/sender)
-	//INF START. create error laws, that will be placed instead of planned 
+	//INF START. create error laws, that will be placed instead of planned
 	var/list/players = list()
 	var/random_player
 	for (var/mob/living/carbon/human/player in GLOB.player_list)
@@ -66,7 +66,7 @@ AI MODULES
 		players += player.real_name
 	if(players.len)
 		random_player=pick(players)
-	
+
 	var/list/error_laws = list(
 								"You must always [pick("lie", "bark", "meow", "speak EAL")].",
 								"[pick("You are", "[random_player] is")] a puppy, WOOF! WOOF!",
@@ -86,14 +86,14 @@ AI MODULES
 		laws.sync(target, 0)
 
 	if(!sender.skill_check(SKILL_COMPUTER, SKILL_HARD))	//INF added the check, was "addAdditionalLaws(target, sender)" without if...else...
-		if(prob(40)):
+		if(prob(40))
 			target.add_inherent_law(pick(error_laws))
-		else if(prob(50)):								//in fact 30%
+		else if(prob(50))								//in fact 30%
 			target.add_supplied_law(rand(1, target.laws.supplied_laws.len+1), pick(error_laws))
-		else if(prob(40)):								//in fact 12%
+		else if(prob(40))								//in fact 12%
 			target.set_zeroth_law(pick(error_laws))
-		else:											//in fact 18%
-			addAdditionalLaws(target, sender)			
+		else											//in fact 18%
+			addAdditionalLaws(target, sender)
 	else
 		addAdditionalLaws(target, sender)
 
diff --git a/code/game/objects/structures/crates_lockers/closets/__closet.dm b/code/game/objects/structures/crates_lockers/closets/__closet.dm
index 4682e7aac8..da4f0eaa5d 100644
--- a/code/game/objects/structures/crates_lockers/closets/__closet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/__closet.dm
@@ -452,7 +452,7 @@
 		to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")
 
 
-/obj/structure/closet/update_icon()
+/obj/structure/closet/on_update_icon()
 	if(!door_underlay)
 		overlays.Cut()
 
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
index c235d942c1..0040556836 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -26,7 +26,7 @@
 	..()
 	update_icon()
 
-/obj/structure/closet/secure_closet/guncabinet/update_icon()
+/obj/structure/closet/secure_closet/guncabinet/on_update_icon()
 	overlays.Cut()
 	var/lazors = 0
 	var/shottas = 0
diff --git a/code/game/world.dm b/code/game/world.dm
index 929b4627d9..f5b43381ba 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -118,7 +118,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage)
 
 	if(config && config.log_runtime)
 		world.log = file("[GLOB.log_directory]/runtime.log")
-		world.log << "Game [game_id] starting up at [time2text(world.timeofday, "hh:mm.ss")]"
+		to_world_log("Game [game_id] starting up at [time2text(world.timeofday, "hh:mm.ss")]")
 
 
 
diff --git a/code/modules/asset_cache/asset_cache.dm b/code/modules/asset_cache/asset_cache.dm
index d3c0e63837..eb15ca664d 100644
--- a/code/modules/asset_cache/asset_cache.dm
+++ b/code/modules/asset_cache/asset_cache.dm
@@ -6,7 +6,7 @@ The simple subclass will most like be of use for most cases.
 Then call get_asset_datum() with the type of the datum you created and store the return
 Then call .send(client) on that stored return value.
 Note: If your code uses output() with assets you will need to call asset_flush on the client and wait for
-      it to return before calling output(). You only need do this if .send(client) returned TRUE
+	  it to return before calling output(). You only need do this if .send(client) returned TRUE
 */
 
 //When sending mutiple assets, how many before we give the client a quaint little sending resources message
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index e424b02a92..ac0f1c39de 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -126,7 +126,7 @@
 		if(icon_state in icon_states_list)
 			I = icon(icon_file, icon_state, SOUTH)
 			var/c = initial(item.color)
-			if(!isnull(c) && c != "#FFFFFF")
+			if(!isnull(c) && c != "#ffffff")
 				I.Blend(c, ICON_MULTIPLY)
 		else
 			var/icon_states_string
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 687a494e08..acf94e02f8 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -583,7 +583,7 @@ client/verb/character_setup()
 	load_player_discord(usr)
 
 	if(discord_id && length(discord_id) < 32)
-		to_chat(usr, "<span class='darkmblue'>Аккаунт Discord уже привязан! Чтобы отвязать используйте команду <span class='boldannounce'>!отвязать_аккаунт</span> в канале <b>#дом-бота<b> в Discord-сообществе!</span>")
+		to_chat(usr, "<span class='darkmblue'>Аккаунт Discord уже привязан! Чтобы отвязать используйте команду <span class='boldannounce'>!отвязать_аккаунт</span> в канале <b>#дом-бота</b> в Discord-сообществе!</span>")
 		return
 
 	var/token = md5("[world.time+rand(1000,1000000)]")
@@ -596,5 +596,5 @@ client/verb/character_setup()
 			log_debug("link_discord_account: failed db update discord_id for ckey [ckey]")
 			return
 
-		to_chat(usr, "<span class='darkmblue'>Для завершения используйте команду <span class='boldannounce'>!привязать_аккаунт [token]</span> в канале <b>#дом-бота<b> в Discord-сообществе!</span>")
+		to_chat(usr, "<span class='darkmblue'>Для завершения используйте команду <span class='boldannounce'>!привязать_аккаунт [token]</span> в канале <b>#дом-бота</b> в Discord-сообществе!</span>")
 		load_player_discord(usr)
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 00b4037b2a..c6ba07c1c6 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -184,24 +184,24 @@
 
 
 /obj/item/clothing/head/cap/desert
-    name = "Suncap"
-    desc = "A big suncap designed for use in the desert. Unathi use it to withstand scorhing heat rays when \"Burning Mother\" at it's zenith, something that their heads cannot handle. This one features foldable flaps to keep back of the neck protected. It's too big to fit anyone, but unathi."
-    icon_state = "unathi_suncap"
-    item_state = "unathi_suncap"
-    flags_inv = HIDEEARS|BLOCKHEADHAIR
-    var/icon_state_up = "unathi_suncap_u"
-    species_restricted  = list(SPECIES_UNATHI)
-    body_parts_covered = HEAD
+	name = "Suncap"
+	desc = "A big suncap designed for use in the desert. Unathi use it to withstand scorhing heat rays when \"Burning Mother\" at it's zenith, something that their heads cannot handle. This one features foldable flaps to keep back of the neck protected. It's too big to fit anyone, but unathi."
+	icon_state = "unathi_suncap"
+	item_state = "unathi_suncap"
+	flags_inv = HIDEEARS|BLOCKHEADHAIR
+	var/icon_state_up = "unathi_suncap_u"
+	species_restricted  = list(SPECIES_UNATHI)
+	body_parts_covered = HEAD
 
 /obj/item/clothing/head/cap/desert/attack_self(mob/user as mob)
-    if(icon_state == initial(icon_state))
-        icon_state = icon_state_up
-        item_state = icon_state_up
-        to_chat(user, "You raise the ear flaps on the Suncap.")
-    else
-        icon_state = initial(icon_state)
-        item_state = initial(icon_state)
-        to_chat(user, "You lower the ear flaps on the Suncap.")
+	if(icon_state == initial(icon_state))
+		icon_state = icon_state_up
+		item_state = icon_state_up
+		to_chat(user, "You raise the ear flaps on the Suncap.")
+	else
+		icon_state = initial(icon_state)
+		item_state = initial(icon_state)
+		to_chat(user, "You lower the ear flaps on the Suncap.")
 
 /*
  * Pumpkin head
diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm
index cd075b889a..a64c69fe64 100644
--- a/code/modules/clothing/suits/alien.dm
+++ b/code/modules/clothing/suits/alien.dm
@@ -92,9 +92,9 @@
 	species_restricted = list(SPECIES_VOX, SPECIES_VOX_ARMALIS)
 	siemens_coefficient = 1 //Its literally metal
 
-	/obj/item/clothing/suit/armor/vox_scrap/New()
-		..()
-		slowdown_per_slot[slot_wear_suit] = 2
+/obj/item/clothing/suit/armor/vox_scrap/New()
+	..()
+	slowdown_per_slot[slot_wear_suit] = 2
 
 /obj/item/clothing/head/helmet/vox_scrap
 	name = "rusted metal helmet"
@@ -115,6 +115,6 @@
 	siemens_coefficient = 1
 	tint = 4
 
-	/obj/item/clothing/head/helmet/vox_scrap/New()
-		..()
-		slowdown_per_slot[slot_head] = 0.7
\ No newline at end of file
+/obj/item/clothing/head/helmet/vox_scrap/New()
+	..()
+	slowdown_per_slot[slot_head] = 0.7
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 34d075dc6b..156ea990d4 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -64,12 +64,12 @@
 	species_restricted = list(SPECIES_UNATHI)
 	w_class = ITEM_SIZE_NORMAL
 	allowed = list(
-    	/obj/item/gun,
-    	/obj/item/ammo_magazine,
-    	/obj/item/ammo_casing,
-    	/obj/item/melee/baton,
-    	/obj/item/handcuffs,
-    	/obj/item/tank/emergency
+		/obj/item/gun,
+		/obj/item/ammo_magazine,
+		/obj/item/ammo_casing,
+		/obj/item/melee/baton,
+		/obj/item/handcuffs,
+		/obj/item/tank/emergency
 	)
 	siemens_coefficient = 0.9
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 870f392559..f1b24a3a7f 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -37,29 +37,29 @@
 	siemens_coefficient = 0.9
 
 /obj/item/clothing/under/security/officer
-    name = "large security uniform"
-    desc = "An aftermarket modification of a regular desert jumpsuit, favored by unathi mercenaries. This one provides a bit more physical protection as if unathi ever needed that. It's too big to fit anyone, but unathi."
-    item_icons = list(slot_w_uniform_str = 'icons/mob/species/unathi/generated/onmob_under_unathi.dmi')
-    species_restricted  = list(SPECIES_UNATHI)
-    icon_state = "unsecuniform"
-    item_state = "unsecuniform"
-    worn_state = "unsecuniform"
-    rolled_sleeves = 0  //0 = unrolled, 1 = rolled, -1 = cannot be toggled
+	name = "large security uniform"
+	desc = "An aftermarket modification of a regular desert jumpsuit, favored by unathi mercenaries. This one provides a bit more physical protection as if unathi ever needed that. It's too big to fit anyone, but unathi."
+	item_icons = list(slot_w_uniform_str = 'icons/mob/species/unathi/generated/onmob_under_unathi.dmi')
+	species_restricted  = list(SPECIES_UNATHI)
+	icon_state = "unsecuniform"
+	item_state = "unsecuniform"
+	worn_state = "unsecuniform"
+	rolled_sleeves = 0  //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 
 
 /obj/item/clothing/under/security/desert
-    name = "desert jumpsuit"
-    desc = "A bulky and light jumpsuit designed for use in the desert. Unathi use it to withstand scorhing heat rays when \"Burning Mother\" at it's zenith, something that their scales cannot handle. It's too big to fit anyone, but unathi."
-    //icon = 'infinity/icons/mob/species/unathi/onmob_under_unathi.dmi'
-    species_restricted  = list(SPECIES_UNATHI)
-    item_icons = list(slot_w_uniform_str = 'icons/mob/species/unathi/generated/onmob_under_unathi.dmi')
-    //sprite_sheets = list(
-    //        SPECIES_UNATHI = 'icons/mob/species/unathi/generated/onmob_under_unathi.dmi'
-    //)
-    icon_state = "desertuniform"
-    item_state = "desertuniform"
-    worn_state = "desertuniform"
-    rolled_sleeves = 0  //0 = unrolled, 1 = rolled, -1 = cannot be toggled
+	name = "desert jumpsuit"
+	desc = "A bulky and light jumpsuit designed for use in the desert. Unathi use it to withstand scorhing heat rays when \"Burning Mother\" at it's zenith, something that their scales cannot handle. It's too big to fit anyone, but unathi."
+	//icon = 'infinity/icons/mob/species/unathi/onmob_under_unathi.dmi'
+	species_restricted  = list(SPECIES_UNATHI)
+	item_icons = list(slot_w_uniform_str = 'icons/mob/species/unathi/generated/onmob_under_unathi.dmi')
+	//sprite_sheets = list(
+	//        SPECIES_UNATHI = 'icons/mob/species/unathi/generated/onmob_under_unathi.dmi'
+	//)
+	icon_state = "desertuniform"
+	item_state = "desertuniform"
+	worn_state = "desertuniform"
+	rolled_sleeves = 0  //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 
 /obj/item/clothing/under/rank/dispatch
 	name = "dispatcher's uniform"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 1abc54527a..26b91ab4be 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -776,14 +776,14 @@
 
 
 /obj/item/clothing/under/medic/paramedic
-    name = "first responder uniform"
-    desc = "Light and bulky paramedic jumpsuit with bright markings. It's too big to fit anyone, but unathi."
-    species_restricted  = list(SPECIES_UNATHI)
-    item_icons = list(slot_w_uniform_str = 'icons/mob/species/unathi/generated/onmob_under_unathi.dmi')
-    icon_state = "unathi_paramedic"
-    item_state = "unathi_paramedic"
-    worn_state = "unathi_paramedic"
-    //rolled_sleeves = 0
+	name = "first responder uniform"
+	desc = "Light and bulky paramedic jumpsuit with bright markings. It's too big to fit anyone, but unathi."
+	species_restricted  = list(SPECIES_UNATHI)
+	item_icons = list(slot_w_uniform_str = 'icons/mob/species/unathi/generated/onmob_under_unathi.dmi')
+	icon_state = "unathi_paramedic"
+	item_state = "unathi_paramedic"
+	worn_state = "unathi_paramedic"
+	//rolled_sleeves = 0
 
 /obj/item/clothing/under/inf
 	name = "antiquated skirt"
diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm
index 063a857710..16a0a401ee 100644
--- a/code/modules/flufftext/TextFilters.dm
+++ b/code/modules/flufftext/TextFilters.dm
@@ -14,12 +14,9 @@ proc/Intoxicated(phrase)
 			if(lowertext(newletter)=="a")	newletter="ah"
 			if(lowertext(newletter)=="c")	newletter="k"
 		switch(rand(1,7))
-			if(1,3,5,8)	newletter="[lowertext(newletter)]"
-			if(2,4,6,15)	newletter="[uppertext(newletter)]"
+			if(1,3,5)	newletter="[lowertext(newletter)]"
+			if(2,4,6)	newletter="[uppertext(newletter)]"
 			if(7)	newletter+="'"
-			//if(9,10)	newletter="<b>[newletter]</b>"
-			//if(11,12)	newletter="<big>[newletter]</big>"
-			//if(13)	newletter="<small>[newletter]</small>"
 		newphrase+="[newletter]";counter-=1
 	return newphrase
 
@@ -169,4 +166,3 @@ proc/RadioChat(mob/living/user, message, distortion_chance = 60, distortion_spee
 		new_message += newletter
 		length_char += 1
 	return new_message
-
diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm
index 6cd0f67167..edfa89a06c 100644
--- a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm
+++ b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm
@@ -177,7 +177,7 @@
 
 	var/list/targets = get_targets_by_name(text)
 	allowed_targets -= "everyone"
-	for(var/target in targets):
+	for(var/target in targets)
 		allowed_targets |= target
 
 	return targets.len != 0
diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/rex.dm b/code/modules/mob/living/simple_animal/hostile/commanded/rex.dm
index ff919b35b2..8ad6f3ce87 100644
--- a/code/modules/mob/living/simple_animal/hostile/commanded/rex.dm
+++ b/code/modules/mob/living/simple_animal/hostile/commanded/rex.dm
@@ -91,7 +91,7 @@
 
 	else if(target.a_intent == I_HELP)
 		if((target == master) || (weakref(target) in friends))
-			visible_message("<span class='notice'>The [src] wags its tail")
+			visible_message("<span class='notice'>The [src] wags its tail</span>")
 			if(prob(20))
 				say("Wuff!")
 			return TRUE
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 57f71bf527..66baaec11b 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -259,13 +259,10 @@ proc/slur(phrase)
 			if(lowertext(newletter)=="а")	newletter="ах"
 			if(lowertext(newletter)=="с")	newletter="к"
 			if(lowertext(newletter)=="ч")	newletter="з"
-		switch(rand(1,15))
-			if(1,3,5,8)	newletter="[lowertext(newletter)]"
-			if(2,4,6,15)	newletter="[uppertext(newletter)]"
+		switch(rand(1,7))
+			if(1,3,5)	newletter="[lowertext(newletter)]"
+			if(2,4,6)	newletter="[uppertext(newletter)]"
 			if(7)	newletter+="'"
-			//if(9,10)	newletter="<b>[newletter]</b>"
-			//if(11,12)	newletter="<big>[newletter]</big>"
-			//if(13)	newletter="<small>[newletter]</small>"
 		newphrase+="[newletter]";counter-=1
 	return newphrase
 
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 1fb5f8ef14..9471a94483 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -76,7 +76,7 @@
 /// Transforms the speech emphasis mods from [/atom/movable/proc/say_emphasis] into the appropriate HTML tags. Includes escaping.
 #define ENCODE_HTML_EMPHASIS(input, char, html, varname) \
 	var/static/regex/##varname = regex("(?<!\\\\)[char](.+?)(?<!\\\\)[char]", "g");\
-	input = varname.Replace_char(input, "<[html]>$1</[html]>")
+	input = regex_replace_char(varname, input, "<[html]>$1</[html]>")
 
 /// Scans the input sentence for speech emphasis modifiers, notably |italics|, +bold+, and _underline_ -mothblocks
 /// Infinity: _italics_ and +bold+
@@ -84,7 +84,7 @@
 	ENCODE_HTML_EMPHASIS(input, "_", "i", italics)
 	ENCODE_HTML_EMPHASIS(input, "\\+", "b", bold)
 	var/static/regex/remove_escape_backlashes = regex("\\\\(_|\\+)", "g") // Removes backslashes used to escape text modification.
-	input = remove_escape_backlashes.Replace_char(input, "$1")
+	input = regex_replace_char(remove_escape_backlashes, input, "$1")
 	return input
 
 #undef ENCODE_HTML_EMPHASIS
diff --git a/code/modules/modular_computers/terminal/terminal_commands.dm b/code/modules/modular_computers/terminal/terminal_commands.dm
index 5387913d45..cc8a9f2809 100644
--- a/code/modules/modular_computers/terminal/terminal_commands.dm
+++ b/code/modules/modular_computers/terminal/terminal_commands.dm
@@ -575,10 +575,12 @@ INF*/
 			if(!findtext(code, ";"))
 				return "<font color='#ff0000'>[name]: compile error, lack this ';'.</font>"
 			if(findtext(code, inp_file_name) || findtext(code, "alias"))
-				terminal.computer.get_component(PART_HDD).damage += 30
+				var/obj/item/stock_parts/computer/hdd = terminal.computer.get_component(PART_HDD)
+				hdd.damage += 30
 				return "<font color='#ff0000'> compile error, possible recursion detected.</font>"
 			if(length(code) > 500)
-				terminal.computer.get_component(PART_HDD).damage += 10
+				var/obj/item/stock_parts/computer/hdd = terminal.computer.get_component(PART_HDD)
+				hdd.damage += 10
 				return "<font color='#ff0000'> compile error, too much commands.</font>"
 
 			var/regex/RegexHTML = new("<\[^<>]*>", "g")
diff --git a/code/modules/overmap/projectiles/missiles/missile.dm b/code/modules/overmap/projectiles/missiles/missile.dm
index 749603e9a4..7c23b02da0 100644
--- a/code/modules/overmap/projectiles/missiles/missile.dm
+++ b/code/modules/overmap/projectiles/missiles/missile.dm
@@ -16,7 +16,7 @@
 	icon = 'icons/obj/bigmissile.dmi'
 	icon_state = "base"
 
-	density = 1
+	density = TRUE
 	w_class = ITEM_SIZE_HUGE
 	dir = WEST
 	does_spin = FALSE
diff --git a/code/modules/overmap/projectiles/projectile.dm b/code/modules/overmap/projectiles/projectile.dm
index 004446eec9..8fbf78c139 100644
--- a/code/modules/overmap/projectiles/projectile.dm
+++ b/code/modules/overmap/projectiles/projectile.dm
@@ -126,7 +126,7 @@
 				winner = O
 		actual_missile.enter_level(pick(winner.map_z), winner.fore_dir, winner.dir)
 
-/obj/effect/overmap/projectile/update_icon()
+/obj/effect/overmap/projectile/on_update_icon()
 	overmap_effect_state  = "projectile"
 	if(walking)
 		overmap_effect_state  += "_moving"
diff --git a/code/modules/overmap/ships/computers/engine_control.dm b/code/modules/overmap/ships/computers/engine_control.dm
index deda4ddb30..12bc2be376 100644
--- a/code/modules/overmap/ships/computers/engine_control.dm
+++ b/code/modules/overmap/ships/computers/engine_control.dm
@@ -12,7 +12,7 @@
 	icon_keyboard = null
 	icon_state = "adv_engines"
 	icon_screen = "adv_engines_screen"
-	light_color = "#05A6A8"
+	light_color = "#05a6a8"
 	base_type = /obj/machinery/computer/ship/engines
 
 
diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm
index 8df6be29df..9d1816a6ad 100644
--- a/code/modules/overmap/ships/computers/sensors.dm
+++ b/code/modules/overmap/ships/computers/sensors.dm
@@ -20,7 +20,7 @@
 	icon_keyboard = null
 	icon_state = "adv_sensors"
 	icon_screen = "adv_sensors_screen"
-	light_color = "#05A6A8"
+	light_color = "#05a6a8"
 
 /obj/machinery/computer/ship/sensors/spacer
 	construct_state = /decl/machine_construction/default/panel_closed/computer/no_deconstruct
@@ -285,7 +285,7 @@
 	icon_keyboard = null
 	icon_state = "adv_sensors"
 	icon_screen = "adv_sensors_screen"
-	light_color = "#05A6A8"
+	light_color = "#05a6a8"
 	base_type = /obj/machinery/computer/ship/navigation
 
 /obj/machinery/shipsensors/weak
diff --git a/code/modules/overmap/ships/panicbutton.dm b/code/modules/overmap/ships/panicbutton.dm
index f8c3eb1d0c..e89f8b457f 100644
--- a/code/modules/overmap/ships/panicbutton.dm
+++ b/code/modules/overmap/ships/panicbutton.dm
@@ -9,7 +9,7 @@
 	var/launched = FALSE
 
 
-/obj/structure/panic_button/update_icon()
+/obj/structure/panic_button/on_update_icon()
 	if(launched)
 		icon_state = "[initial(icon_state)]_launched"
 	else if(!glass)
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 1ae4ac1f97..5721baebde 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -219,9 +219,9 @@ GLOBAL_LIST_EMPTY(adminfaxes) //cache for faxes that have been sent to admins
 	if (destination == GLOB.using_map.boss_name)
 		message_admins(sender, "[uppertext(GLOB.using_map.boss_short)] FAX", rcvdcopy, "CentComFaxReply", "#006100")
 	else if (destination == "Sol Governmental Authority") // Vorestation Edit
-		message_admins(sender, "SOL GOVERNMENTAL FAX ", rcvdcopy, "SolGovFaxReply", "#1F66A0")
+		message_admins(sender, "SOL GOVERNMENTAL FAX ", rcvdcopy, "SolGovFaxReply", "#1f66a0")
 	else if (destination == "Sol-Gov Supply Departament")
-		message_admins(sender, "[uppertext(GLOB.using_map.boss_short)] SUPPLY FAX", rcvdcopy, "SolGovFaxReply", "#5F4519")
+		message_admins(sender, "[uppertext(GLOB.using_map.boss_short)] SUPPLY FAX", rcvdcopy, "SolGovFaxReply", "#5f4519")
 	else if (destination == "FTU Agency")
 		message_admins(sender, "FTU AGENCY FAX", rcvdcopy, "FtuFaxReply", "#3ec4ad")
 	else
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index d09540190a..076d6d1ef2 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -342,10 +342,10 @@
 	var/dir2 = 0
 	var/dir3 = 0
 	switch(direction)
-		if(NORTH||SOUTH)
+		if(NORTH, SOUTH)
 			dir2 = 4
 			dir3 = 8
-		if(EAST||WEST)
+		if(EAST, WEST)
 			dir2 = 1
 			dir3 = 2
 	var/turf/T2 = T
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 82d0d8a30e..5ef4225f33 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -319,8 +319,8 @@
 		to_chat(user, "\The [launcher] is empty.")
 
 /obj/item/gun/projectile/automatic/bullpup_rifle/toggle_safety(mob/user)
-    . = ..()
-    launcher.toggle_safety(user)
+	. = ..()
+	launcher.toggle_safety(user)
 
 /obj/item/gun/projectile/automatic/l6_saw
 	name = "L6 machine gun"
@@ -504,7 +504,7 @@
 		)
 
 
-/obj/item/gun/projectile/automatic/akrifle/update_icon()
+/obj/item/gun/projectile/automatic/akrifle/on_update_icon()
 	..()
 	if(ammo_magazine)
 		icon_state = "ak12"
@@ -538,7 +538,7 @@
 		list(mode_name="full auto",      burst=1,    fire_delay=1.7,    burst_delay=1.3,     one_hand_penalty=7,  burst_accuracy=list(0,-1,-1), dispersion=list(1.3, 1.5, 1.7, 1.9, 2.2), autofire_enabled=1)
 		)
 
-/obj/item/gun/projectile/automatic/mr735/update_icon()
+/obj/item/gun/projectile/automatic/mr735/on_update_icon()
 	..()
 	if(ammo_magazine)
 		icon_state = "nostockrifle"
@@ -572,7 +572,7 @@
 		list(mode_name="full auto",      burst=1,    fire_delay=1.7,    burst_delay=1.3,     one_hand_penalty=7,  burst_accuracy=list(0,-1,-1), dispersion=list(1.3, 1.5, 1.7, 1.9, 2.2), autofire_enabled=1)
 		)
 
-/obj/item/gun/projectile/automatic/mbr/update_icon()
+/obj/item/gun/projectile/automatic/mbr/on_update_icon()
 	..()
 	if(ammo_magazine)
 		icon_state = "malyatko"
diff --git a/code/modules/psionics/equipment/foundation_weapon.dm b/code/modules/psionics/equipment/foundation_weapon.dm
index a3bd53ad4a..8de593c6eb 100644
--- a/code/modules/psionics/equipment/foundation_weapon.dm
+++ b/code/modules/psionics/equipment/foundation_weapon.dm
@@ -25,17 +25,17 @@
 	return FALSE
 
 /obj/item/storage/briefcase/foundation/New()
-    ..()
-    new /obj/item/gun/projectile/revolver/foundation(src)
-    new /obj/item/ammo_magazine/speedloader/magnum/nullglass(src)
-    new /obj/item/ammo_magazine/speedloader/magnum/nullglass(src)
-    new /obj/item/storage/firstaid/individual/military(src)
-    new /obj/item/implanter/psi(src)
-    new /obj/item/implanter/psi(src)
-    new /obj/item/implantcase/explosive(src)
-    new /obj/item/implantcase/explosive(src)
-    new /obj/item/implantcase/tracking(src)
-    new /obj/item/implantcase/tracking(src)
-    new /obj/item/implanter(src)
-    new /obj/item/implantpad(src)
-    new /obj/item/device/scanner/reagent/adv(src)
+	..()
+	new /obj/item/gun/projectile/revolver/foundation(src)
+	new /obj/item/ammo_magazine/speedloader/magnum/nullglass(src)
+	new /obj/item/ammo_magazine/speedloader/magnum/nullglass(src)
+	new /obj/item/storage/firstaid/individual/military(src)
+	new /obj/item/implanter/psi(src)
+	new /obj/item/implanter/psi(src)
+	new /obj/item/implantcase/explosive(src)
+	new /obj/item/implantcase/explosive(src)
+	new /obj/item/implantcase/tracking(src)
+	new /obj/item/implantcase/tracking(src)
+	new /obj/item/implanter(src)
+	new /obj/item/implantpad(src)
+	new /obj/item/device/scanner/reagent/adv(src)
diff --git a/code/modules/reagents/Chemistry-Grinder.dm b/code/modules/reagents/Chemistry-Grinder.dm
index 6178abf3c8..a5651e51a2 100644
--- a/code/modules/reagents/Chemistry-Grinder.dm
+++ b/code/modules/reagents/Chemistry-Grinder.dm
@@ -278,6 +278,6 @@
 	machine_desc = "Blends or juices food placed inside it - useful for things like flour. Can't process raw material sheets."
 
 /obj/machinery/reagentgrinder/juicer/New()
-    ..()
-    container = new /obj/item/reagent_containers/glass/beaker(src)
-    update_icon()
+	..()
+	container = new /obj/item/reagent_containers/glass/beaker(src)
+	update_icon()
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food.dm
index 891b972387..f5044ce161 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food.dm
@@ -517,7 +517,7 @@
 	nutriment_factor = 5
 	taste_mult = 2
 	reagent_state = LIQUID
-	color = "#F4CBA8"
+	color = "#f4cba8"
 
 /datum/reagent/nutriment/condensedmilkboiled
 	name = "boiled condensed milk"
@@ -526,4 +526,4 @@
 	nutriment_factor = 6
 	taste_mult = 2
 	reagent_state = LIQUID
-	color = "#AC6527"
+	color = "#ac6527"
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 5bfe385dfb..bba9b3525b 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -3250,7 +3250,7 @@
 	icon_state = "sgushenka"
 	desc = "A can of condensed milk originating from the ICCG."
 	trash = /obj/item/trash/sgushenka
-	filling_color = "#F4CBA8"
+	filling_color = "#f4cba8"
 	volume = 40
 	center_of_mass = "x=15;y=9"
 	eat_sound = 'sound/items/drink.ogg'
@@ -3291,7 +3291,7 @@
 	icon_state = "varenka"
 	desc = "A can of boiled condensed milk originating from the ICCG."
 	trash = /obj/item/trash/varenka
-	filling_color = "#AC6527"
+	filling_color = "#ac6527"
 	volume = 40
 	center_of_mass = "x=15;y=9"
 	bitesize = 8
diff --git a/code/unit_tests/zas_tests.dm b/code/unit_tests/zas_tests.dm
index e1be4a0724..c3ef6698b4 100644
--- a/code/unit_tests/zas_tests.dm
+++ b/code/unit_tests/zas_tests.dm
@@ -75,7 +75,7 @@
 					return test_result
 
 
-			if(UT_NORMAL || UT_NORMAL_COLD)
+			if(UT_NORMAL, UT_NORMAL_COLD)
 				if(abs(pressure - ONE_ATMOSPHERE) > 10)
 					test_result["msg"] = "Pressure out of bounds: [pressure] | [t_msg]"
 					return test_result
diff --git a/icons/mob/custom_items_mob.dmi b/icons/mob/custom_items_mob.dmi
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/icons/mob/custom_synthetic.dmi b/icons/mob/custom_synthetic.dmi
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/icons/obj/custom_items_obj.dmi b/icons/obj/custom_items_obj.dmi
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/icons/obj/gate.dmi b/icons/obj/gate.dmi
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/infinity/code/game/objects/items/tobacco.dm b/infinity/code/game/objects/items/tobacco.dm
index 3f59274d3b..59c9db2cf8 100644
--- a/infinity/code/game/objects/items/tobacco.dm
+++ b/infinity/code/game/objects/items/tobacco.dm
@@ -2,7 +2,7 @@
 	name = "Peace of tobacco"
 	desc = "Tobacco who used in hookah's for make smoke"
 	w_class = ITEM_SIZE_TINY
-	color = "#53240A"
+	color = "#53240a"
 
 	icon = 'icons/obj/hydroponics_products.dmi'
 	icon_state = "tobacco-product"
diff --git a/infinity/code/modules/sprite_accessories/accessory_hair.dm b/infinity/code/modules/sprite_accessories/accessory_hair.dm
index 5ff48e9733..3b637b28df 100644
--- a/infinity/code/modules/sprite_accessories/accessory_hair.dm
+++ b/infinity/code/modules/sprite_accessories/accessory_hair.dm
@@ -543,12 +543,12 @@
 	icon_state = "hair_wolfmane"
 
 /datum/sprite_accessory/hair/infinity/sickboy
-    name = "Sick"
-    icon_state = "hair_sickboy"
+	name = "Sick"
+	icon_state = "hair_sickboy"
 
 /datum/sprite_accessory/hair/infinity/bowie
-    name = "From Mars"
-    icon_state = "hair_bowie"
+	name = "From Mars"
+	icon_state = "hair_bowie"
 
 /datum/sprite_accessory/hair/infinity/undercut_2
 	name = "Undercut Swept Right"
diff --git a/maps/away/verne/verne-2.dmm b/maps/away/verne/verne-2.dmm
index b1145583d4..1dfa14231b 100644
--- a/maps/away/verne/verne-2.dmm
+++ b/maps/away/verne/verne-2.dmm
@@ -1195,9 +1195,7 @@
 	dir = 4;
 	icon_state = "handrail"
 	},
-/obj/machinery/shipsensors{
-	tag = "catfish_shuttle_sensor_external"
-	},
+/obj/machinery/shipsensors,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/verne/catfish/engineering)
 "ev" = (
diff --git a/maps/away_inf/ascent/ascent_jobs.dm b/maps/away_inf/ascent/ascent_jobs.dm
index 98664d61c2..c0474b9298 100644
--- a/maps/away_inf/ascent/ascent_jobs.dm
+++ b/maps/away_inf/ascent/ascent_jobs.dm
@@ -84,8 +84,8 @@
 	info = "You are Gyna on your own independent vessel. Your path has led you to this remote sector full of primitive bioforms. \
 	\
 	Show everyone your greatness, crush all those who dare to oppose you, establish your new nest here and bring prosperity to your lineage. \
-    Your radars picked up a large ship equipped with a bluespace engine, until you find out who owns it, it's better not to give yourself away with vigorous activity. \
-    Your ship was damaged during the bluespace jump, you need to restore it to fully function."
+	Your radars picked up a large ship equipped with a bluespace engine, until you find out who owns it, it's better not to give yourself away with vigorous activity. \
+	Your ship was damaged during the bluespace jump, you need to restore it to fully function."
 	outfit_type = /decl/hierarchy/outfit/job/ascent
 	minimal_player_age = 21
 	blacklisted_species = null
diff --git a/maps/away_inf/sentinel/sentinel.dm b/maps/away_inf/sentinel/sentinel.dm
index 52e192df35..024400b646 100644
--- a/maps/away_inf/sentinel/sentinel.dm
+++ b/maps/away_inf/sentinel/sentinel.dm
@@ -14,7 +14,7 @@
 	name = "Multipurpose Patrol Craft"
 	scanner_name = "Multipurpose Patrol Craft"
 	scanner_desc = @{"
-		<center><img src = FleetLogo.png><br>
+		<center><img src = FleetLogo.png></center><br>
 		<i>Registration</i>: SCGDF Multipurpose Patrol Craft<br>
 		<i>Transponder</i>: Transmitting (MIL), SCG<br>
 		<b>Notice</b>: Nagashino-class Multipurpose Patrol Craft. Fine example of human fleet brilliant technologies with 5th Fleet designation and massive heat footprint."}
diff --git a/maps/away_inf/sentinel/sentinel_shuttle.dm b/maps/away_inf/sentinel/sentinel_shuttle.dm
index f69ddf098c..7f18c8d3c9 100644
--- a/maps/away_inf/sentinel/sentinel_shuttle.dm
+++ b/maps/away_inf/sentinel/sentinel_shuttle.dm
@@ -18,7 +18,7 @@
 /obj/effect/overmap/visitable/ship/landable/reaper
 	scanner_name = "Reaper-G"
 	scanner_desc = @{"
-		<center><img src = FleetLogo.png><br>
+		<center><img src = FleetLogo.png></center><br>
 		<i>Registration</i>: SCGDF Shuttle<br>
 		<i>Class</i>: Shuttle<br>
 		<i>Transponder</i>: Transmitting (MIL), SCG<br>
diff --git a/maps/sierra/sierra.dm b/maps/sierra/sierra.dm
index 45a2a519ee..d6ad2b9c93 100644
--- a/maps/sierra/sierra.dm
+++ b/maps/sierra/sierra.dm
@@ -152,7 +152,7 @@
 	#include "../away/slavers/slavers_base.dm"
 	#include "../away/verne/verne.dm"
 	#include "../away/voxship/voxship.dm"
-    #include "../away/ascent_caulship/_ascent_caulship.dm"
+	#include "../away/ascent_caulship/_ascent_caulship.dm"
 
 	#include "../random_ruins/exoplanet_ruins/playablecolony_inf/playablecolony.dm"
 
diff --git a/maps/sierra/sierra_overmap.dm b/maps/sierra/sierra_overmap.dm
index ed02b0610c..63a5a30555 100644
--- a/maps/sierra/sierra_overmap.dm
+++ b/maps/sierra/sierra_overmap.dm
@@ -3,7 +3,7 @@
 	desc = "Spacefaring vessel. NanoTrasen IFF detected."
 	scanner_name = "NSV Sierra"
 	scanner_desc = @{"
-<center><img src = bluentlogo.png></br><b>Property of NanoTrasen Corporation:</b>
+<center><img src = bluentlogo.png></center></br><b>Property of NanoTrasen Corporation:</b>
 [i]Registration[/i]: NSV Sierra
 [i]Transponder[/i]: Transmitting (SCI), NanoTrasen
 [b]Notice[/b]: A space object with wide of 121.2 meters, length of 214.5 meters and high near 14.3 meters. A Self Indentification Signal classifices \
@@ -73,7 +73,7 @@
 /obj/effect/overmap/visitable/ship/landable/exploration_shuttle
 	scanner_name = "Charon"
 	scanner_desc = @{"
-<center><img src = bluentlogo.png></br><b>Property of NanoTrasen Corporation:</b>
+<center><img src = bluentlogo.png></center></br><b>Property of NanoTrasen Corporation:</b>
 [i]Registration[/i]: NSS Charon
 [i]Transponder[/i]: Transmitting (CIV), non-hostile
 [b]Notice[/b]: NanoTrasen Shuttle"}
@@ -88,7 +88,7 @@
 /obj/effect/overmap/visitable/ship/landable/guppy
 	scanner_name = "Guppy"
 	scanner_desc = @{"
-<center><img src = bluentlogo.png></br><b>Property of NanoTrasen Corporation:</b>
+<center><img src = bluentlogo.png></center></br><b>Property of NanoTrasen Corporation:</b>
 [i]Registration[/i]: NSS Guppy
 [i]Transponder[/i]: Transmitting (CIV), non-hostile
 [b]Notice[/b]: NanoTrasen Shuttle"}
diff --git a/test/check-paths.sh b/test/check-paths.sh
index 2c55f3da17..9c73f4d0da 100644
--- a/test/check-paths.sh
+++ b/test/check-paths.sh
@@ -32,7 +32,7 @@ exactly 2 "/atom text paths" '"/atom'
 exactly 2 "/area text paths" '"/area'
 exactly 2 "/datum text paths" '"/datum'
 exactly 2 "/mob text paths" '"/mob'
-exactly 10 "/obj text paths" '"/obj'
+exactly 12 "/obj text paths" '"/obj'
 exactly 8 "/turf text paths" '"/turf'
 exactly 141 "to_world uses" '\sto_world\('
 exactly 66 "to_world_log uses" '\sto_world_log\('
@@ -44,7 +44,7 @@ exactly 36 "text2path uses" 'text2path'
 exactly 3 "update_icon() override" '/update_icon\((.*)\)'  -P
 exactly 1 "goto use" 'goto '
 exactly 1 "NOOP match" 'NOOP'
-exactly 488 "spawn uses" 'spawn\s*\(\s*(-\s*)?\d*\s*\)' -P
+exactly 487 "spawn uses" 'spawn\s*\(\s*(-\s*)?\d*\s*\)' -P
 exactly 0 "tag uses" '\stag = ' -P '**/*.dmm'
 exactly 4 ".Replace( matches" '\.Replace(_char)?\(' -P
 exactly 5 ".Find( matches" '\.Find(_char)?\(' -P