Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme

code/controllers/Processes/garbage.dm

@@ -152,19 +152,13 @@ world/loop_checks = 0
 			A.finalize_qdel()
 
 /datum/proc/finalize_qdel()
-	if(IsPooled(src))
-		PlaceInPool(src)
-	else
-		del(src)
+	del(src)
 
 /atom/finalize_qdel()
-	if(IsPooled(src))
-		PlaceInPool(src)
+	if(garbage_collector)
+		garbage_collector.AddTrash(src)
 	else
-		if(garbage_collector)
-			garbage_collector.AddTrash(src)
-		else
-			delayed_garbage |= src
+		delayed_garbage |= src
 
 /icon/finalize_qdel()
 	del(src)
@@ -180,7 +174,7 @@ world/loop_checks = 0
 
 // Default implementation of clean-up code.
 // This should be overridden to remove all references pointing to the object being destroyed.
-// Return true if the the GC controller should allow the object to continue existing. (Useful if pooling objects.)
+// Return true if the the GC controller should allow the object to continue existing.
 /datum/proc/Destroy()
 	nanomanager.close_uis(src)
 	tag = null

code/controllers/configuration.dm

@@ -167,6 +167,7 @@ var/list/gamemode_cache = list()
 	var/simultaneous_pm_warning_timeout = 100
 
 	var/use_recursive_explosions //Defines whether the server uses recursive or circular explosions.
+	var/multi_z_explosion_scalar = 0.5 //Multiplier for how much weaker explosions are on neighboring z levels.
 
 	var/assistant_maint = 0 //Do assistants get maint access?
 	var/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour.
@@ -284,6 +285,9 @@ var/list/gamemode_cache = list()
 				if ("use_recursive_explosions")
 					use_recursive_explosions = 1
 
+				if ("multi_z_explosion_scalar")
+					multi_z_explosion_scalar = text2num(value)
+
 				if ("log_ooc")
 					config.log_ooc = 1