Conflicts!!!

code/controllers/configuration/entries/game_options.dm

@@ -521,3 +521,10 @@
   * Camera mobs, AIs, ghosts and some other are of course exempt from this. This also doesn't influence simplemob AI, for the best.
   */
 /datum/config_entry/flag/use_field_of_vision
+
+//Shuttle size limiter
+/datum/config_entry/number/max_shuttle_count
+	config_entry_value = 6
+
+/datum/config_entry/number/max_shuttle_size
+	config_entry_value = 250

code/controllers/subsystem/air.dm

@@ -76,6 +76,8 @@ SUBSYSTEM_DEF(air)
 		var/list/pipenet_rebuilds = pipenets_needing_rebuilt
 		for(var/thing in pipenet_rebuilds)
 			var/obj/machinery/atmospherics/AT = thing
+			if(!istype(AT))
+				continue
 			AT.build_network()
 		cost_rebuilds = MC_AVERAGE(cost_rebuilds, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		pipenets_needing_rebuilt.Cut()

code/controllers/subsystem/minimaps.dm

@@ -1,8 +1,8 @@
 SUBSYSTEM_DEF(minimaps)
 	name = "Minimaps"
 	flags = SS_NO_FIRE
-	var/list/station_minimaps
-	var/datum/minimap_group/station_minimap
+	var/list/station_minimaps = list()
+	var/datum/minimap_group/station_minimap = null
 
 /datum/controller/subsystem/minimaps/Initialize()
 	if(!CONFIG_GET(flag/minimaps_enabled))
@@ -12,9 +12,9 @@ SUBSYSTEM_DEF(minimaps)
 	return ..()
 
 /datum/controller/subsystem/minimaps/proc/build_minimaps()
-	station_minimaps = list()
 	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
 		var/datum/space_level/SL = SSmapping.get_level(z)
 		var/name = (SL.name == initial(SL.name))? "[z] - Station" : "[z] - [SL.name]"
 		station_minimaps += new /datum/minimap(z, name = name)
+
 	station_minimap = new(station_minimaps, "Station")

code/controllers/subsystem/npcpool.dm

@@ -23,7 +23,7 @@ SUBSYSTEM_DEF(npcpool)
 		var/mob/living/simple_animal/SA = currentrun[currentrun.len]
 		--currentrun.len
 
-		if(!SA.ckey && !SA.notransform)
+		if(!SA.ckey && !SA.mob_transforming)
 			if(SA.stat != DEAD)
 				SA.handle_automated_movement()
 			if(SA.stat != DEAD)

code/controllers/subsystem/ticker.dm

@@ -409,7 +409,7 @@ SUBSYSTEM_DEF(ticker)
 		var/mob/living = player.transfer_character()
 		if(living)
 			qdel(player)
-			living.notransform = TRUE
+			living.mob_transforming = TRUE
 			if(living.client)
 				if (living.client.prefs && living.client.prefs.auto_ooc)
 					if (living.client.prefs.chat_toggles & CHAT_OOC)
@@ -423,7 +423,7 @@ SUBSYSTEM_DEF(ticker)
 /datum/controller/subsystem/ticker/proc/release_characters(list/livings)
 	for(var/I in livings)
 		var/mob/living/L = I
-		L.notransform = FALSE
+		L.mob_transforming = FALSE
 
 /datum/controller/subsystem/ticker/proc/send_tip_of_the_round()
 	var/m