Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme

code/controllers/master_controller.dm

@@ -36,8 +36,8 @@ datum/controller/game_controller/New()
 datum/controller/game_controller/proc/setup()
 
 	setup_objects()
-	setupgenetics()
-	SetupXenoarch()
+	// setupgenetics() Moved to SSatoms
+	// SetupXenoarch() - Moved to SSxenoarch
 
 	transfer_controller = new
 	admin_notice("<span class='danger'>Initializations complete.</span>", R_DEBUG)

code/controllers/subsystem.dm

@@ -166,7 +166,7 @@
 
 
 
-	if(can_fire && !(SS_NO_FIRE in flags))
+	if(can_fire && !(SS_NO_FIRE & flags))
 		msg = "[round(cost,1)]ms|[round(tick_usage,1)]%|[round(ticks,0.1)]\t[msg]"
 	else
 		msg = "OFFLINE\t[msg]"

code/controllers/subsystems/atoms.dm

@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(atoms)
 	var/list/BadInitializeCalls = list()
 
 /datum/controller/subsystem/atoms/Initialize(timeofday)
-	setupgenetics() //to set the mutations' place in structural enzymes, so monkey.initialize() knows where to put the monkey mutation.
+	setupgenetics() //to set the mutations' place in structural enzymes, so initializers know where to put mutations.
 	initialized = INITIALIZATION_INNEW_MAPLOAD
 	to_world_log("Initializing objects")
 	admin_notice("<span class='danger'>Initializing objects</span>", R_DEBUG)

code/controllers/subsystems/xenoarch.dm

@@ -0,0 +1,116 @@
+#define XENOARCH_SPAWN_CHANCE 0.5
+#define DIGSITESIZE_LOWER 4
+#define DIGSITESIZE_UPPER 12
+#define ARTIFACTSPAWNNUM_LOWER 6
+#define ARTIFACTSPAWNNUM_UPPER 12
+
+//
+// Xenoarch subsystem handles initialization of Xenoarcheaology artifacts and digsites.
+//
+SUBSYSTEM_DEF(xenoarch)
+	name = "Xenoarch"
+	init_order = INIT_ORDER_XENOARCH
+	flags = SS_NO_FIRE
+	var/list/artifact_spawning_turfs = list()
+	var/list/digsite_spawning_turfs = list()
+
+/datum/controller/subsystem/xenoarch/Initialize(timeofday)
+	SetupXenoarch()
+	..()
+
+/datum/controller/subsystem/xenoarch/Recover()
+	if (istype(SSxenoarch.artifact_spawning_turfs))
+		artifact_spawning_turfs = SSxenoarch.artifact_spawning_turfs
+	if (istype(SSxenoarch.digsite_spawning_turfs))
+		digsite_spawning_turfs = SSxenoarch.digsite_spawning_turfs
+
+/datum/controller/subsystem/xenoarch/stat_entry(msg)
+	if (!Debug2)
+		return // Only show up in stat panel if debugging is enabled.
+	. = ..()
+
+/datum/controller/subsystem/xenoarch/proc/SetupXenoarch()
+	for(var/turf/simulated/mineral/M in world)
+		if(!M.density)
+			continue
+
+		if(isnull(M.geologic_data))
+			M.geologic_data = new /datum/geosample(M)
+
+		if(!prob(XENOARCH_SPAWN_CHANCE))
+			continue
+
+		var/farEnough = 1
+		for(var/A in digsite_spawning_turfs)
+			var/turf/T = A
+			if(T in range(5, M))
+				farEnough = 0
+				break
+		if(!farEnough)
+			continue
+
+		digsite_spawning_turfs.Add(M)
+
+		var/digsite = get_random_digsite_type()
+		var/target_digsite_size = rand(DIGSITESIZE_LOWER, DIGSITESIZE_UPPER)
+
+		var/list/processed_turfs = list()
+		var/list/turfs_to_process = list(M)
+
+		var/list/viable_adjacent_turfs = list()
+		if(target_digsite_size > 1)
+			for(var/turf/simulated/mineral/T in orange(2, M))
+				if(!T.density)
+					continue
+				if(T.finds)
+					continue
+				if(T in processed_turfs)
+					continue
+				viable_adjacent_turfs.Add(T)
+
+			target_digsite_size = min(target_digsite_size, viable_adjacent_turfs.len)
+
+		for(var/i = 1 to target_digsite_size)
+			turfs_to_process += pick_n_take(viable_adjacent_turfs)
+
+		while(turfs_to_process.len)
+			var/turf/simulated/mineral/archeo_turf = pop(turfs_to_process)
+
+			processed_turfs.Add(archeo_turf)
+			if(isnull(archeo_turf.finds))
+				archeo_turf.finds = list()
+				if(prob(50))
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(10, 190)))
+				else if(prob(75))
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(10, 90)))
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(110, 190)))
+				else
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(10, 50)))
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(60, 140)))
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(150, 190)))
+
+				//sometimes a find will be close enough to the surface to show
+				var/datum/find/F = archeo_turf.finds[1]
+				if(F.excavation_required <= F.view_range)
+					archeo_turf.archaeo_overlay = "overlay_archaeo[rand(1,3)]"
+					archeo_turf.update_icon()
+
+			//have a chance for an artifact to spawn here, but not in animal or plant digsites
+			if(isnull(M.artifact_find) && digsite != DIGSITE_GARDEN && digsite != DIGSITE_ANIMAL)
+				artifact_spawning_turfs.Add(archeo_turf)
+
+	//create artifact machinery
+	var/num_artifacts_spawn = rand(ARTIFACTSPAWNNUM_LOWER, ARTIFACTSPAWNNUM_UPPER)
+	while(artifact_spawning_turfs.len > num_artifacts_spawn)
+		pick_n_take(artifact_spawning_turfs)
+
+	var/list/artifacts_spawnturf_temp = artifact_spawning_turfs.Copy()
+	while(artifacts_spawnturf_temp.len > 0)
+		var/turf/simulated/mineral/artifact_turf = pop(artifacts_spawnturf_temp)
+		artifact_turf.artifact_find = new()
+
+#undef XENOARCH_SPAWN_CHANCE
+#undef DIGSITESIZE_LOWER
+#undef DIGSITESIZE_UPPER
+#undef ARTIFACTSPAWNNUM_LOWER
+#undef ARTIFACTSPAWNNUM_UPPER