Revert "optimize crew monitor's scan()"

This reverts commit 8e245f527db4a00088fc2b7b8576fadc11875a6a.

Conflicts:
	code/__HELPERS/global_lists.dm
	code/modules/clothing/clothing.dm
This commit is contained in:
ZomgPonies
2014-06-22 06:28:41 -04:00
parent 3e3e4abbb5
commit d2129f5a01
3 changed files with 9 additions and 13 deletions
-2
View File
@@ -22,7 +22,6 @@ var/global/list/side_effects = list() //list of all medical sideeffects types
var/global/list/mechas_list = list() //list of all mechs. Used by hostile mobs target tracking.
var/global/list/joblist = list() //list of all jobstypes, minus borg and AI
var/global/list/flag_list = list() //list of flags during Nations gamemode
var/global/list/clothing_list = list() //list of all /obj/item/clothing instances in the world
//Languages/species/whitelist.
var/global/list/all_species[0]
@@ -111,7 +110,6 @@ var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Al
var/datum/language/L = new T
all_languages[L.name] = L
var/rkey = 0
paths = typesof(/datum/species)-/datum/species
for(var/T in paths)
+9 -3
View File
@@ -108,7 +108,13 @@
/obj/machinery/computer/crew/proc/scan()
for(var/obj/item/clothing/under/C in clothing_list)
for(var/obj/item/clothing/under/C in world)
if((C.has_sensor) && (istype(C.loc, /mob/living/carbon/human)))
tracked |= C
return 1
var/check = 0
for(var/O in src.tracked)
if(O == C)
check = 1
break
if(!check)
src.tracked.Add(C)
return 1
-8
View File
@@ -2,14 +2,6 @@
name = "clothing"
var/list/species_restricted = null //Only these species can wear this kit.
/obj/item/clothing/New()
. = ..()
clothing_list += src
/obj/item/clothing/Del()
clothing_list -= src
return ..()
//BS12: Species-restricted clothing check.
/obj/item/clothing/mob_can_equip(M as mob, slot)