diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 06db24ac78eb8..c98f97709a066 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -731,6 +731,9 @@
 /client/proc/drop_bomb() // Some admin dickery that can probably be done better -- TLE
 	set category = "Special Verbs"
 	set name = "Drop Bomb"
+	set desc = "Cause an explosion of varying strength at your location."
+	// Old code - mostly leaving in for legacy reasons. Remove it if you like.
+	/*
 	set desc = "Spawn a plasma tank with overloaded pressure. Will trigger explosion on next air cycle."
 	var/bomb_strength = input("Enter a value greater than 299:", "Blowing Shit Up", 300) as num
 	if(bomb_strength < 300)
@@ -740,6 +743,28 @@
 	message_admins("\blue [src.ckey] dropping a plasma bomb at [bomb_strength] strength.")
 	var/obj/item/weapon/tank/plasma/P = new(src.mob.loc)
 	P.air_contents.toxins = bomb_strength
+	*/
+	var/turf/epicenter = src.mob.loc
+	var/list/choices = list("Small Bomb", "Medium Bomb", "Big Bomb", "Custom Bomb")
+	var/choice = input("What size explosion would you like to produce?") in choices
+	switch(choice)
+		if(null)
+			return 0
+		if("Small Bomb")
+			explosion(epicenter, 1, 2, 3, 3)
+		if("Medium Bomb")
+			explosion(epicenter, 2, 3, 4, 4)
+		if("Big Bomb")
+			explosion(epicenter, 3, 5, 7, 5)
+		if("Custom Bomb")
+			var/devastation_range = input("Devastation range (in tiles):") as num
+			var/heavy_impact_range = input("Heavy impact range (in tiles):") as num
+			var/light_impact_range = input("Light impact range (in tiles):") as num
+			var/flash_range = input("Flash range (in tiles):") as num
+			explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range)
+	message_admins("\blue [src.ckey] creating an admin explosion at [epicenter.loc].")
+
+
 
 
 /client/proc/make_cultist(var/mob/M in world) // -- TLE
diff --git a/code/notes.dm b/code/notes.dm
deleted file mode 100644
index f7739ec3456c4..0000000000000
--- a/code/notes.dm
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-
-// MINING
-
-
-
-
-
-// MANUFACTURING
-
-
-
-
-
-// XENOGENETICS
-
-
-
-
-
-// WEAPONS RESEARCH
-
-
-
-
-
-// SHIPS
-
-
-
-
-
-// CULT MAGIC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-*/
\ No newline at end of file
diff --git a/code/setup.dm b/code/setup.dm
index 25da5fc14c0ce..5ac2142c4ebb9 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -13,14 +13,13 @@
 #define MOLES_PLASMA_VISIBLE	0.5 //Moles in a standard cell after which plasma is visible
 
 #define BREATH_VOLUME 0.5	//liters in a normal breath
-//#define BREATH_VOLUME 500 // Buffing to increase the rate at which air is consumed. Used to be 0.5 -- TLE
 #define BREATH_PERCENTAGE BREATH_VOLUME/CELL_VOLUME
 	//Amount of air to take a from a tile
 #define HUMAN_NEEDED_OXYGEN	MOLES_CELLSTANDARD*BREATH_PERCENTAGE*0.16
 	//Amount of air needed before pass out/suffocation commences
 
 
-#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.1 // Was 0.05 -- TLE
+#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05
 	//Minimum ratio of air that must move to/from a tile to suspend group processing
 #define MINIMUM_AIR_TO_SUSPEND MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_SUSPEND
 	//Minimum amount of air that has to move before a group processing can be suspended
@@ -28,7 +27,7 @@
 #define MINIMUM_MOLES_DELTA_TO_MOVE MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_SUSPEND //Either this must be active
 #define MINIMUM_TEMPERATURE_TO_MOVE	T20C+100 		  //or this (or both, obviously)
 
-#define MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND 0.1 // Was 0.012 -- TLE
+#define MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND 0.012
 #define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND 4
 	//Minimum temperature difference before group processing is suspended
 #define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER 0.5
diff --git a/icons/Thumbs.db b/icons/Thumbs.db
index 6a70cd447f340..4982189ce1b5a 100644
Binary files a/icons/Thumbs.db and b/icons/Thumbs.db differ
diff --git a/libmysql.dll b/libmysql.dll
new file mode 100644
index 0000000000000..86453b952eb36
Binary files /dev/null and b/libmysql.dll differ