mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179
[MIRROR] Optimize a couple things
This commit is contained in:
@@ -127,22 +127,19 @@
|
||||
//returns a new list with only atoms that are in typecache L
|
||||
/proc/typecache_filter_list(list/atoms, list/typecache)
|
||||
. = list()
|
||||
for(var/thing in atoms)
|
||||
var/atom/A = thing
|
||||
for(var/atom/A as anything in atoms)
|
||||
if(typecache[A.type])
|
||||
. += A
|
||||
|
||||
/proc/typecache_filter_list_reverse(list/atoms, list/typecache)
|
||||
. = list()
|
||||
for(var/thing in atoms)
|
||||
var/atom/A = thing
|
||||
for(var/atom/A as anything in atoms)
|
||||
if(!typecache[A.type])
|
||||
. += A
|
||||
|
||||
/proc/typecache_filter_multi_list_exclusion(list/atoms, list/typecache_include, list/typecache_exclude)
|
||||
. = list()
|
||||
for(var/thing in atoms)
|
||||
var/atom/A = thing
|
||||
for(var/atom/A as anything in atoms)
|
||||
if(typecache_include[A.type] && !typecache_exclude[A.type])
|
||||
. += A
|
||||
|
||||
|
||||
@@ -226,8 +226,7 @@ var/mobs_radio_range_fired = 1 //CHOMPEdit
|
||||
. = list()
|
||||
// Returns a list of mobs who can hear any of the radios given in @radios
|
||||
var/list/speaker_coverage = list()
|
||||
for(var/r in radios)
|
||||
var/obj/item/device/radio/R = r // You better fucking be a radio.
|
||||
for(var/obj/item/device/radio/R as anything in radios)
|
||||
var/turf/speaker = get_turf(R)
|
||||
if(speaker)
|
||||
for(var/turf/T in R.can_broadcast_to()) //CHOMPEdit
|
||||
@@ -378,8 +377,7 @@ var/mobs_radio_range_fired = 1 //CHOMPEdit
|
||||
|
||||
/proc/flick_overlay_view(image/I, atom/target, duration, gc_after) //wrapper for the above, flicks to everyone who can see the target atom
|
||||
var/list/viewing = list()
|
||||
for(var/m in viewers(target))
|
||||
var/mob/M = m
|
||||
for(var/mob/M as anything in viewers(target))
|
||||
if(M.client)
|
||||
viewing += M.client
|
||||
flick_overlay(I, viewing, duration, gc_after)
|
||||
|
||||
@@ -215,23 +215,20 @@ GLOBAL_LIST_EMPTY(mannequins)
|
||||
|
||||
// Suit cyclers
|
||||
paths = subtypesof(/datum/suit_cycler_choice/department)
|
||||
for(var/path in paths)
|
||||
var/datum/suit_cycler_choice/SCC = path
|
||||
for(var/datum/suit_cycler_choice/SCC as anything in paths)
|
||||
if(!initial(SCC.name))
|
||||
continue
|
||||
GLOB.suit_cycler_departments += new path()
|
||||
GLOB.suit_cycler_departments += new SCC()
|
||||
paths = subtypesof(/datum/suit_cycler_choice/species)
|
||||
for(var/path in paths)
|
||||
var/datum/suit_cycler_choice/SCC = path
|
||||
for(var/datum/suit_cycler_choice/SCC as anything in paths)
|
||||
if(!initial(SCC.name))
|
||||
continue
|
||||
GLOB.suit_cycler_species += new path()
|
||||
GLOB.suit_cycler_species += new SCC()
|
||||
paths = subtypesof(/datum/suit_cycler_choice/department/emag)
|
||||
for(var/path in paths)
|
||||
var/datum/suit_cycler_choice/SCC = path
|
||||
for(var/datum/suit_cycler_choice/SCC as anything in paths)
|
||||
if(!initial(SCC.name))
|
||||
continue
|
||||
GLOB.suit_cycler_emagged += new path()
|
||||
GLOB.suit_cycler_emagged += new SCC()
|
||||
|
||||
//Ores
|
||||
paths = subtypesof(/ore)
|
||||
@@ -273,7 +270,7 @@ GLOBAL_LIST_EMPTY(mannequins)
|
||||
|
||||
/*
|
||||
// Custom species traits
|
||||
paths = subtypesof(/datum/trait) - /datum/trait
|
||||
paths = subtypesof(/datum/trait)
|
||||
for(var/path in paths)
|
||||
var/datum/trait/instance = new path()
|
||||
if(!instance.name)
|
||||
|
||||
@@ -534,7 +534,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
|
||||
var/paths
|
||||
|
||||
// Custom Hair Accessories
|
||||
paths = typesof(/datum/sprite_accessory/hair_accessory) - /datum/sprite_accessory/hair_accessory
|
||||
paths = subtypesof(/datum/sprite_accessory/hair_accessory)
|
||||
for(var/path in paths)
|
||||
var/datum/sprite_accessory/hair_accessory/instance = new path()
|
||||
hair_accesories_list[path] = instance
|
||||
@@ -568,14 +568,14 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
|
||||
|
||||
|
||||
// Weaver recipe stuff
|
||||
paths = typesof(/datum/weaver_recipe/structure) - /datum/weaver_recipe/structure
|
||||
paths = subtypesof(/datum/weaver_recipe/structure)
|
||||
for(var/path in paths)
|
||||
var/datum/weaver_recipe/instance = new path()
|
||||
if(!instance.title)
|
||||
continue //A prototype or something
|
||||
weavable_structures[instance.title] = instance
|
||||
|
||||
paths = typesof(/datum/weaver_recipe/item) - /datum/weaver_recipe/item
|
||||
paths = subtypesof(/datum/weaver_recipe/item)
|
||||
for(var/path in paths)
|
||||
var/datum/weaver_recipe/instance = new path()
|
||||
if(!instance.title)
|
||||
|
||||
@@ -224,8 +224,7 @@
|
||||
// Dimensions of overlay being added
|
||||
var/list/add_size[4]
|
||||
|
||||
for(var/V in layers)
|
||||
var/image/I = V
|
||||
for(var/image/I as anything in layers)
|
||||
if(I.alpha == 0)
|
||||
continue
|
||||
|
||||
@@ -359,8 +358,7 @@
|
||||
//For photo camera.
|
||||
/proc/build_composite_icon(atom/A)
|
||||
var/icon/composite = icon(A.icon, A.icon_state, A.dir, 1)
|
||||
for(var/O in A.overlays)
|
||||
var/image/I = O
|
||||
for(var/image/I as anything in A.overlays)
|
||||
composite.Blend(icon(I.icon, I.icon_state, I.dir, 1), ICON_OVERLAY)
|
||||
return composite
|
||||
|
||||
|
||||
@@ -1249,8 +1249,7 @@ var/mob/dview/dview_mob = new
|
||||
if(orange)
|
||||
turfs -= get_turf(center)
|
||||
. = list()
|
||||
for(var/V in turfs)
|
||||
var/turf/T = V
|
||||
for(var/turf/T as anything in turfs)
|
||||
. += T
|
||||
. += T.contents
|
||||
if(areas)
|
||||
|
||||
@@ -335,8 +335,7 @@ GLOBAL_LIST_INIT(master_filter_info, list(
|
||||
/obj/item/update_filters()
|
||||
. = ..()
|
||||
/* Will port this from TG
|
||||
for(var/X in actions)
|
||||
var/datum/action/A = X
|
||||
for(var/datum/action/A as anything in actions)
|
||||
A.UpdateButtonIcon()
|
||||
*/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user