Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -104,7 +104,7 @@
 		var/datum/gas_mixture/environment = loc.return_air()
 
 		if(scrubbing)
-			if((environment.phoron>0) || (environment.carbon_dioxide>0) || (environment.trace_gases.len>0))
+			if((environment.phoron>0.001) || (environment.carbon_dioxide>0.001) || (environment.trace_gases.len>0))
 				var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles()
 
 				//Take a gas sample

code/ATMOSPHERICS/datum_pipe_network.dm

@@ -54,8 +54,6 @@ datum/pipe_network
 		for(var/datum/pipeline/line_member in giver.line_members)
 			line_member.network = src
 
-		del(giver)
-
 		update_network_gases()
 		return 1