diff --git a/baystation12.dme b/baystation12.dme
index f053c299991..eebc61c47d4 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -158,6 +158,7 @@
 #include "code\datums\category.dm"
 #include "code\datums\computerfiles.dm"
 #include "code\datums\datacore.dm"
+#include "code\datums\discord_bot.dm"
 #include "code\datums\disease.dm"
 #include "code\datums\mind.dm"
 #include "code\datums\mixed.dm"
diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm
index 31bdcc94694..cc212c82cce 100644
--- a/code/__defines/chemistry.dm
+++ b/code/__defines/chemistry.dm
@@ -36,5 +36,5 @@
 // Chemistry lists.
 var/list/tachycardics  = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate.
 var/list/bradycardics  = list("neurotoxin", "cryoxadone", "clonexadone", "space_drugs", "stoxin")                 // Decrease heart rate.
-var/list/heartstopper  = list("potassium_phorochloride", "zombie_powder") // This stops the heart.
+var/list/heartstopper  = list("potassium_chlorophoride", "zombie_powder") // This stops the heart.
 var/list/cheartstopper = list("potassium_chloride")                       // This stops the heart when overdose is met. -- c = conditional
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 8e1f113dabb..b5c9bb2aa1c 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -297,9 +297,9 @@ var/global/list/additional_antag_types = list()
 		sleep(10)
 		print_ownerless_uplinks()
 
-			// Avoid the longest loop if we aren't actively using the bot.
-			if (discord_bot.active)
-				discord_text += antag.print_player_summary_discord()
+		// Avoid the longest loop if we aren't actively using the bot.
+		if (discord_bot.active)
+			discord_text += antag.print_player_summary_discord()
 
 	discord_bot.send_to_announce(discord_text)
 	discord_text = ""
diff --git a/code/global.dm b/code/global.dm
index 1cca8def890..6973eb570f0 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -125,12 +125,6 @@ var/DBConnection/dbcon
 // Added for Xenoarchaeology, might be useful for other stuff.
 var/global/list/alphabet_uppercase = list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z")
 
-// Chemistry lists.
-var/list/tachycardics  = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate.
-var/list/bradycardics  = list("neurotoxin", "cryoxadone", "clonexadone", "space_drugs", "stoxin")                 // Decrease heart rate.
-var/list/heartstopper  = list("potassium_chlorophoride", "zombie_powder") // This stops the heart.
-var/list/cheartstopper = list("potassium_chloride")                       // This stops the heart when overdose is met. -- c = conditional
-
 // Used by robots and robot preferences.
 var/list/robot_module_types = list(
 	"Standard", "Engineering", "Construction", "Medical",  "Rescue",
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
index 1dcab7f46bc..a48b59b4605 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
@@ -48,7 +48,6 @@
 	breach_threshold = 38
 	resilience = 0.2
 	can_breach = 1
-	sprite_sheets = list(
 	sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/suit.dmi',"Unathi" = 'icons/mob/species/unathi/suit.dmi')
 	species_restricted = list("exclude","Diona","Xenomorph","Vaurca","Golem")
 	supporting_limbs = list()
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 14e8e5faca6..39d948f433f 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -100,8 +100,6 @@ var/list/holder_mob_icon_cache = list()
 		return
 	if (isalive && contained.stat == DEAD)
 		held_death(1)//If we get here, it means the mob died sometime after we picked it up. We pass in 1 so that we can play its deathmessage
->>>>>>> development-2
-
 
 //This function checks if the current location is safe to release inside
 //it returns 1 if the creature will bug out when released
@@ -480,6 +478,3 @@ var/list/holder_mob_icon_cache = list()
 	icon_state_dead = "mushroom_dead"
 	slot_flags = SLOT_HEAD
 	w_class = 2
-
-
-
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 5aa7594b583..03786847849 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1302,22 +1302,22 @@
 			if(healths)		healths.icon_state = "health7"	//DEAD healthmeter
 		// #TODO-MERGE: Check the indentation of this file! It's awful!
 		if(healths)
-				if(client.view != world.view) // If mob dies while zoomed in with device, unzoom them.
-					for(var/obj/item/item in contents)
-						if(item.zoom)
-							item.zoom()
-							break
+			if(client.view != world.view) // If mob dies while zoomed in with device, unzoom them.
+				for(var/obj/item/item in contents)
+					if(item.zoom)
+						item.zoom()
+						break
 
-					/*
-					if(locate(/obj/item/weapon/gun/energy/sniperrifle, contents))
-						var/obj/item/weapon/gun/energy/sniperrifle/s = locate() in src
-						if(s.zoom)
-							s.zoom()
-					if(locate(/obj/item/device/binoculars, contents))
-						var/obj/item/device/binoculars/b = locate() in src
-						if(b.zoom)
-							b.zoom()
-					*/
+				/*
+				if(locate(/obj/item/weapon/gun/energy/sniperrifle, contents))
+					var/obj/item/weapon/gun/energy/sniperrifle/s = locate() in src
+					if(s.zoom)
+						s.zoom()
+				if(locate(/obj/item/device/binoculars, contents))
+					var/obj/item/device/binoculars/b = locate() in src
+					if(b.zoom)
+						b.zoom()
+				*/
 
 		else
 			if(is_ventcrawling == 0) // Stops sight returning to normal if inside a vent