diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm
index 8957e46f485..1c14ef95f2d 100644
--- a/code/ATMOSPHERICS/atmospherics.dm
+++ b/code/ATMOSPHERICS/atmospherics.dm
@@ -52,6 +52,7 @@ Pipelines + Other Objects -> Pipe network
 		qdel(pipe_vision_img)
 
 	..()
+	return QDEL_HINT_FINDREFERENCE
 
 /obj/machinery/atmospherics/proc/nullifyNode(I)
 	var/obj/machinery/atmospherics/N = NODE_I
diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
index fb3cbcdf028..bde761f802d 100644
--- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
@@ -35,7 +35,7 @@ Acts like a normal vent, but has an input AND output.
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src, frequency)
-	..()
+	return ..()
 
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume
 	name = "large dual-port air vent"
diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
index b522febf58e..d927ffab88a 100644
--- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -25,7 +25,7 @@ Passive gate is similar to the regular pump except:
 /obj/machinery/atmospherics/components/binary/passive_gate/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()
 
 /obj/machinery/atmospherics/components/binary/passive_gate/update_icon_nopipes()
 	if(!on)
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 3218246eb90..47965c2fad4 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -31,7 +31,7 @@ Thus, the two variables affect pump operation are set in New():
 		radio_controller.remove_object(src,frequency)
 	if(radio_connection)
 		radio_connection = null
-	..()
+	return ..()
 
 /obj/machinery/atmospherics/components/binary/pump/on
 	on = 1
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index 1d8253997f5..010a10fb5de 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -29,7 +29,7 @@ Thus, the two variables affect pump operation are set in New():
 /obj/machinery/atmospherics/components/binary/volume_pump/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()
 
 /obj/machinery/atmospherics/components/binary/volume_pump/on
 	on = 1
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index 439311ce86e..b2464c2a129 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -47,7 +47,7 @@ Filter types:
 /obj/machinery/atmospherics/components/trinary/filter/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()
 
 /obj/machinery/atmospherics/components/trinary/filter/update_icon()
 	overlays.Cut()
diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
index 818b410626a..14c3c47adf7 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
@@ -29,7 +29,7 @@
 				overlays += getpipeimage('icons/obj/atmospherics/components/trinary_devices.dmi', "cap", direction, node.pipe_color)
 				continue
 			overlays += getpipeimage('icons/obj/atmospherics/components/trinary_devices.dmi', "cap", direction)
-	..()
+	return ..()
 
 /obj/machinery/atmospherics/components/trinary/mixer/update_icon_nopipes()
 	if(!(stat & NOPOWER) && on && NODE1 && NODE2 && NODE3)
diff --git a/code/ATMOSPHERICS/components/unary_devices/cryo.dm b/code/ATMOSPHERICS/components/unary_devices/cryo.dm
index 67797df7868..2b7fb059a66 100644
--- a/code/ATMOSPHERICS/components/unary_devices/cryo.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/cryo.dm
@@ -44,7 +44,8 @@
 	if(beaker)
 		beaker.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube
 	beaker = null
-	..()
+	return ..()
+
 /obj/machinery/atmospherics/components/unary/cryo_cell/process_atmos()
 	..()
 	var/datum/gas_mixture/air_contents = AIR1
diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
index 3de7973b1f6..df9af8f6cfc 100644
--- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
@@ -19,7 +19,7 @@
 /obj/machinery/atmospherics/components/unary/outlet_injector/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()
 
 /obj/machinery/atmospherics/components/unary/outlet_injector/on
 	on = 1
diff --git a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm
index 9446c396078..d9e649c7a13 100644
--- a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm
@@ -19,7 +19,7 @@
 /obj/machinery/atmospherics/components/unary/portables_connector/Destroy()
 	if(connected_device)
 		connected_device.disconnect()
-	..()
+	return ..()
 
 /obj/machinery/atmospherics/components/unary/portables_connector/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/wrench))
diff --git a/code/ATMOSPHERICS/components/unary_devices/tank.dm b/code/ATMOSPHERICS/components/unary_devices/tank.dm
index f5113d05305..cfbaf0ad995 100644
--- a/code/ATMOSPHERICS/components/unary_devices/tank.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/tank.dm
@@ -1,3 +1,4 @@
+#define AIR_CONTENTS	(25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
 /obj/machinery/atmospherics/components/unary/tank
 	icon = 'icons/obj/atmospherics/pipes/pressure_tank.dmi'
 	icon_state = "generic"
@@ -6,15 +7,19 @@
 	var/volume = 10000 //in liters, 1 meters by 1 meters by 2 meters
 	density = 1
 
+/obj/machinery/atmospherics/components/unary/tank/New()
+	..()
+	var/datum/gas_mixture/air_contents = AIR1
+	air_contents.volume = volume
+	air_contents.temperature = T20C
+
 /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide
 	name = "pressure tank (Carbon Dioxide)"
 
 /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide/New()
 	..()
 	var/datum/gas_mixture/air_contents = AIR1
-	air_contents.volume = volume
-	air_contents.temperature = T20C
-	air_contents.carbon_dioxide = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
+	air_contents.carbon_dioxide = AIR_CONTENTS
 
 /obj/machinery/atmospherics/components/unary/tank/toxins
 	icon_state = "orange"
@@ -23,9 +28,7 @@
 /obj/machinery/atmospherics/components/unary/tank/toxins/New()
 	..()
 	var/datum/gas_mixture/air_contents = AIR1
-	air_contents.volume = volume
-	air_contents.temperature = T20C
-	air_contents.toxins = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
+	air_contents.toxins = AIR_CONTENTS
 
 /obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b
 	icon_state = "orange_2"
@@ -34,10 +37,8 @@
 /obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b/New()
 	..()
 	var/datum/gas_mixture/air_contents = AIR1
-	air_contents.volume = volume
-	air_contents.temperature = T0C
 	var/datum/gas/oxygen_agent_b/trace_gas = new
-	trace_gas.moles = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
+	trace_gas.moles = AIR_CONTENTS
 	air_contents.trace_gases += trace_gas
 
 /obj/machinery/atmospherics/components/unary/tank/oxygen
@@ -47,9 +48,7 @@
 /obj/machinery/atmospherics/components/unary/tank/oxygen/New()
 	..()
 	var/datum/gas_mixture/air_contents = AIR1
-	air_contents.volume = volume
-	air_contents.temperature = T20C
-	air_contents.oxygen = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
+	air_contents.oxygen = AIR_CONTENTS
 
 /obj/machinery/atmospherics/components/unary/tank/nitrogen
 	icon_state = "red"
@@ -58,9 +57,7 @@
 /obj/machinery/atmospherics/components/unary/tank/nitrogen/New()
 	..()
 	var/datum/gas_mixture/air_contents = AIR1
-	air_contents.volume = volume
-	air_contents.temperature = T20C
-	air_contents.nitrogen = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
+	air_contents.nitrogen = AIR_CONTENTS
 
 /obj/machinery/atmospherics/components/unary/tank/air
 	icon_state = "grey"
@@ -69,7 +66,5 @@
 /obj/machinery/atmospherics/components/unary/tank/air/New()
 	..()
 	var/datum/gas_mixture/air_contents = AIR1
-	air_contents.volume = volume
-	air_contents.temperature = T20C
-	air_contents.oxygen = (25*ONE_ATMOSPHERE*O2STANDARD)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
-	air_contents.nitrogen = (25*ONE_ATMOSPHERE*N2STANDARD)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
\ No newline at end of file
+	air_contents.oxygen = AIR_CONTENTS
+	air_contents.nitrogen = AIR_CONTENTS
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
index af4234cf1da..02b3107ce91 100644
--- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
@@ -65,7 +65,7 @@
 		initial_loc.air_vent_info -= id_tag
 		initial_loc.air_vent_names -= id_tag
 		initial_loc = null
-	..()
+	return ..()
 
 /obj/machinery/atmospherics/components/unary/vent_pump/high_volume
 	name = "large air vent"
diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
index 568286d3230..ae6e0a4a39a 100644
--- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
@@ -56,7 +56,7 @@
 		initial_loc = null
 	for(var/I in adjacent_turfs)
 		I = null
-	..()
+	return ..()
 /obj/machinery/atmospherics/components/unary/vent_scrubber/auto_use_power()
 	if(!powered(power_channel))
 		return 0
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index a16c320eebf..d3a44f0914e 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -1,5 +1,5 @@
 #define DEBUG					//Enables byond profiling and full runtime logs - note, this may also be defined in your .dme file
-//#define TESTING				//Enables in-depth debug messages to runtime log (used for debugging)
+#define TESTING				//Enables in-depth debug messages to runtime log (used for debugging)
 								//By using the testing("message") proc you can create debug-feedback for people with this
 								//uncommented, but not visible in the release version)
 
diff --git a/tgstation.dme b/tgstation.dme
index 2cc0562480a..cfc3503b273 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1118,7 +1118,6 @@
 #include "code\modules\mob\living\carbon\carbon_defines.dm"
 #include "code\modules\mob\living\carbon\death.dm"
 #include "code\modules\mob\living\carbon\emote.dm"
-#include "code\modules\mob\living\carbon\examine.dm"
 #include "code\modules\mob\living\carbon\inventory.dm"
 #include "code\modules\mob\living\carbon\life.dm"
 #include "code\modules\mob\living\carbon\say.dm"