initial commit

Foxterosa · Jun 23, 2020 · c36a0e6 · c36a0e6
1 parent 4546c11
commit c36a0e6
Showing 1 changed file with 27 additions and 36 deletions.
diff --git a/code/datums/cache/crew.dm b/code/datums/cache/crew.dm
@@ -4,7 +4,7 @@ GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new())
 	cache_data = list()
 	..()
 
-/datum/repository/crew/proc/health_data(var/turf/T)
+/datum/repository/crew/proc/health_data(turf/T)
 	var/list/crewmembers = list()
 	if(!T)
 		return crewmembers
@@ -18,50 +18,41 @@ GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new())
 	if(world.time < cache_entry.timestamp)
 		return cache_entry.data
 
-	var/tracked = scan()
-	for(var/obj/item/clothing/under/C in tracked)
+	for(var/mob/living/carbon/human/H in GLOB.mob_living_list)
+		if(!istype(H.w_uniform, /obj/item/clothing/under))
+			continue
+		var/obj/item/clothing/under/C = H.w_uniform
+		if(C.sensor_mode == SUIT_SENSOR_OFF || !C.has_sensor)
+			continue
 		var/turf/pos = get_turf(C)
-		if((C) && (C.has_sensor) && (pos) && (T && pos.z == T.z) && (C.sensor_mode != SUIT_SENSOR_OFF))
-			if(istype(C.loc, /mob/living/carbon/human))
-				var/mob/living/carbon/human/H = C.loc
-				if(H.w_uniform != C)
-					continue
+		if(!T || pos.z != T.z)
+			continue
+		var/list/crewmemberData = list("dead"=0, "oxy"=-1, "tox"=-1, "fire"=-1, "brute"=-1, "area"="", "x"=-1, "y"=-1, "ref" = "\ref[H]")
 
-				var/list/crewmemberData = list("dead"=0, "oxy"=-1, "tox"=-1, "fire"=-1, "brute"=-1, "area"="", "x"=-1, "y"=-1, "ref" = "\ref[H]")
+		crewmemberData["sensor_type"] = C.sensor_mode
+		crewmemberData["name"] = H.get_authentification_name(if_no_id="Unknown")
+		crewmemberData["rank"] = H.get_authentification_rank(if_no_id="Unknown", if_no_job="No Job")
+		crewmemberData["assignment"] = H.get_assignment(if_no_id="Unknown", if_no_job="No Job")
 
-				crewmemberData["sensor_type"] = C.sensor_mode
-				crewmemberData["name"] = H.get_authentification_name(if_no_id="Unknown")
-				crewmemberData["rank"] = H.get_authentification_rank(if_no_id="Unknown", if_no_job="No Job")
-				crewmemberData["assignment"] = H.get_assignment(if_no_id="Unknown", if_no_job="No Job")
+		if(C.sensor_mode >= SUIT_SENSOR_BINARY)
+			crewmemberData["dead"] = H.stat > UNCONSCIOUS
 
-				if(C.sensor_mode >= SUIT_SENSOR_BINARY)
-					crewmemberData["dead"] = H.stat > UNCONSCIOUS
+		if(C.sensor_mode >= SUIT_SENSOR_VITAL)
+			crewmemberData["oxy"] = round(H.getOxyLoss(), 1)
+			crewmemberData["tox"] = round(H.getToxLoss(), 1)
+			crewmemberData["fire"] = round(H.getFireLoss(), 1)
+			crewmemberData["brute"] = round(H.getBruteLoss(), 1)
 
-				if(C.sensor_mode >= SUIT_SENSOR_VITAL)
-					crewmemberData["oxy"] = round(H.getOxyLoss(), 1)
-					crewmemberData["tox"] = round(H.getToxLoss(), 1)
-					crewmemberData["fire"] = round(H.getFireLoss(), 1)
-					crewmemberData["brute"] = round(H.getBruteLoss(), 1)
+		if(C.sensor_mode >= SUIT_SENSOR_TRACKING)
+			var/area/A = get_area(H)
+			crewmemberData["area"] = sanitize(A.name)
+			crewmemberData["x"] = pos.x
+			crewmemberData["y"] = pos.y
 
-				if(C.sensor_mode >= SUIT_SENSOR_TRACKING)
-					var/area/A = get_area(H)
-					crewmemberData["area"] = sanitize(A.name)
-					crewmemberData["x"] = pos.x
-					crewmemberData["y"] = pos.y
-
-				crewmembers[++crewmembers.len] = crewmemberData
+		crewmembers[++crewmembers.len] = crewmemberData
 
 	crewmembers = sortByKey(crewmembers, "name")
 	cache_entry.timestamp = world.time + 5 SECONDS
 	cache_entry.data = crewmembers
 
 	return crewmembers
-
-/datum/repository/crew/proc/scan()
-	var/list/tracked = list()
-	for(var/mob/living/carbon/human/H in GLOB.mob_list)
-		if(istype(H.w_uniform, /obj/item/clothing/under))
-			var/obj/item/clothing/under/C = H.w_uniform
-			if(C.has_sensor)
-				tracked |= C
-	return tracked