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

code/WorkInProgress/AI_Visibility/chunk.dm

@@ -216,6 +216,9 @@
 			images_added += t.obscured
 
 	for(var/mob/aiEye/eye in seenby)
-		if(eye.ai.client)
+		if(eye.ai)
-			eye.ai.client.images -= images_removed
+			if(eye.ai.client)
-			eye.ai.client.images |= images_added
+				eye.ai.client.images -= images_removed
+				eye.ai.client.images |= images_added
+		else
+			seenby -= eye

code/ZAS/Connection.dm

@@ -63,6 +63,8 @@ connection
 				B.zone.connected_zones[A.zone] = 1
 			else
 				B.zone.connected_zones[A.zone]++
+			if(A.HasDoor(B) || B.HasDoor(A))
+				indirect = 1
 		else
 			world.log << "Attempted to create connection object for non-zone tiles: [T] -> [O]"
 			del(src)
@@ -193,6 +195,8 @@ connection
 		Cleanup()
 		if(!A.CanPass(null, B, 0, 0) || !B.CanPass(null, A, 0, 0))
 			del src
+		if(A.HasDoor(B) || B.HasDoor(A))
+			indirect = 1
 
 	proc/Sanitize()
 		//If the zones change on connected turfs, update it.

code/ZAS/FEA_system.dm

@@ -107,6 +107,7 @@ datum
 			var/current_cycle = 0
 			var/update_delay = 5 //How long between check should it try to process atmos again.
 			var/failed_ticks = 0 //How many ticks have runtimed?
+			var/next_stat_check = 10
 
 
 /*				process()
@@ -167,6 +168,12 @@ datum
 
 			proc/tick()
 
+				if(current_cycle >= next_stat_check)
+					var/zone/z = pick(zones)
+					var/log_file = file("[time2text(world.timeofday, "statistics/DD-MM-YYYY.txt")]")
+					log_file << "Zone | \The [get_area(pick(z.contents))] | [z.air.oxygen], [z.air.nitrogen], [z.air.carbon_dioxide], [z.air.toxins] | [z.air.temperature] | [z.air.group_multiplier * z.air.volume]"
+					next_stat_check = current_cycle + (rand(5,7)*60)
+
 				if(tiles_to_update.len > 0) //If there are tiles to update, do so.
 					for(var/turf/simulated/T in tiles_to_update)
 						T.update_air_properties()

code/ZAS/Functions.dm

@@ -123,13 +123,10 @@ proc/ZConnect(turf/A,turf/B)
 		var/list/connections = air_master.tiles_with_connections["\ref[A]"]
 		for(var/connection/C in connections)
 			C.Cleanup()
-			if(C.B == B || C.A == B)
+			if(C && (C.B == B || C.A == B))
 				return
 
-	var/connection/C = new(A,B)
+	new /connection(A,B)
-
-	//Ensure zones separated by doors do not merge.
-	if(A.HasDoor(B) || B.HasDoor(A)) C.indirect = 1
 
 /*
 proc/ZDisconnect(turf/A,turf/B)

code/game/objects/devices/PDA/cart.dm

@@ -612,9 +612,9 @@ Code:
 						blood[main_blood] = A.blood_DNA[blood]
 			return 1
 		var/list/sum_list[4]	//Pack it back up!
-		sum_list[1] = A.fingerprints
+		sum_list[1] = A.fingerprints.Copy()
-		sum_list[2] = A.suit_fibers
+		sum_list[2] = A.suit_fibers.Copy()
-		sum_list[3] = A.blood_DNA
+		sum_list[3] = A.blood_DNA.Copy()
 		sum_list[4] = "\The [A] in \the [get_area(A)]"
 		stored_data["\ref [A]"] = sum_list
 		return 0

code/game/objects/explosion.dm

@@ -2,6 +2,8 @@ var/roundExplosions = 1
 
 proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1)
 	if(!epicenter) return
+	var/log_file = file("[time2text(world.timeofday, "statistics/DD-MM-YYYY.txt")]")
+	log_file << "Explosion | \The [get_area(epicenter)] | [devastation_range], [heavy_impact_range], [light_impact_range], [flash_range]"
 	spawn(0)
 		if(defer_powernet_rebuild != 2)
 			defer_powernet_rebuild = 1

code/modules/DetectiveWork/detective_work.dm

@@ -513,10 +513,10 @@ obj/machinery/computer/forensic_scanning
 						prints[print] = atom_fingerprints[print]
 		else
 			var/list/templist[4]
-			templist[1] = atom_suit_fibers
+			templist[1] = atom_suit_fibers.Copy()
-			templist[2] = atom_blood_DNA
+			templist[2] = atom_blood_DNA.Copy()
 			templist[3] = atom_name
-			templist[4] = atom_fingerprints
+			templist[4] = atom_fingerprints.Copy()
 			misc[atom_reference] = templist	//Store it!
 		//Has prints.
 		if(atom_fingerprints)
@@ -560,17 +560,17 @@ obj/machinery/computer/forensic_scanning
 					//It's not in there!  We gotta add it.
 					update_fingerprints(main_print, atom_fingerprints[main_print])
 					var/list/data_point[4]
-					data_point[1] = atom_fingerprints
+					data_point[1] = atom_fingerprints.Copy()
-					data_point[2] = atom_suit_fibers
+					data_point[2] = atom_suit_fibers.Copy()
-					data_point[3] = atom_blood_DNA
+					data_point[3] = atom_blood_DNA.Copy()
 					data_point[4] = atom_name
 					data_entry[atom_reference] = data_point
 					continue
 				//No print at all!  New data entry, go!
 				var/list/data_point[4]
-				data_point[1] = atom_fingerprints
+				data_point[1] = atom_fingerprints.Copy()
-				data_point[2] = atom_suit_fibers
+				data_point[2] = atom_suit_fibers.Copy()
-				data_point[3] = atom_blood_DNA
+				data_point[3] = atom_blood_DNA.Copy()
 				data_point[4] = atom_name
 				var/list/new_file[2]
 				new_file[1] = atom_fingerprints[main_print]

code/modules/DetectiveWork/scanner.dm

@@ -164,9 +164,9 @@
 						blood[main_blood] = A.blood_DNA[blood]
 			return 1
 		var/list/sum_list[4]	//Pack it back up!
-		sum_list[1] = A.fingerprints
+		sum_list[1] = A.fingerprints.Copy()
-		sum_list[2] = A.suit_fibers
+		sum_list[2] = A.suit_fibers.Copy()
-		sum_list[3] = A.blood_DNA
+		sum_list[3] = A.blood_DNA.Copy()
 		sum_list[4] = "\The [A] in \the [get_area(A)]"
 		stored["\ref [A]"] = sum_list
 		return 0

code/modules/mob/death.dm

@@ -47,6 +47,8 @@
 
 /mob/proc/death(gibbed)
 	timeofdeath = world.time
+	var/log_file = file("[time2text(world.timeofday, "statistics/DD-MM-YYYY.txt")]")
+	log_file << "Death | \The [get_area(src)] | [bruteloss], [oxyloss], [toxloss], [fireloss][attack_log && attack_log.len? " | attack_log[attack_log.len]" : ""]"
 	if(client)
 		client.onDeath()
 

config/alienwhitelist.txt

@@ -1,10 +1,14 @@
 botanistpower - Tajaran
+bluefishie - Skrell
+densane - Skrell
+duntadaman - Skrell
 fenrisian - Tajaran
 forsamori - Tajaran
-watermelonstorm - Tajaran
 forsamori - Soghun
 galenus - Soghun
+masterofstuff - Skrell
 searif - Soghun
 searif - Tajaran
 searif - Skrell
-watermelonstorm - Tajaran
+sparklysheep - Skrell
+watermelonstorm - Tajaran