cleanup _HELPERS/_lists.dm and all the necessary files (#61827)

Bring _HELPERS/_lists.dm to latest standards by:
-Adding proper documentation and fixing existing one
-Giving vars proper names
-Procs now use snake case as per standard (many files that use those procs will be affected)
This commit is contained in:
Ghilker
2021-10-12 14:48:51 +01:00
committed by GitHub
parent 56d21164d0
commit 95c8e00af7
207 changed files with 551 additions and 522 deletions
+1 -1
View File
@@ -15,7 +15,7 @@
/obj/item/cardboard_cutout/Initialize(mapload)
. = ..()
possible_appearances = sortList(list(
possible_appearances = sort_list(list(
"Assistant" = image(icon = src.icon, icon_state = "cutout_greytide"),
"Clown" = image(icon = src.icon, icon_state = "cutout_clown"),
"Mime" = image(icon = src.icon, icon_state = "cutout_mime"),
+1 -1
View File
@@ -1271,7 +1271,7 @@
trim_list[fake_trim_name] = trim_path
var/selected_trim_path
selected_trim_path = input("Select trim to apply to your card.\nNote: This will not grant any trim accesses.", "Forge Trim", selected_trim_path) as null|anything in sortList(trim_list, /proc/cmp_typepaths_asc)
selected_trim_path = input("Select trim to apply to your card.\nNote: This will not grant any trim accesses.", "Forge Trim", selected_trim_path) as null|anything in sort_list(trim_list, /proc/cmp_typepaths_asc)
if(selected_trim_path)
SSid_access.apply_trim_to_chameleon_card(src, trim_list[selected_trim_path])
+1 -1
View File
@@ -48,7 +48,7 @@
if(!initial(CM.weight))
break
chromosomes[A] = initial(CM.weight)
return pickweight(chromosomes)
return pick_weight(chromosomes)
/obj/item/chromosome/stabilizer
@@ -564,7 +564,7 @@
display_vending_names_paths = list()
for(var/path in vending_names_paths)
display_vending_names_paths[vending_names_paths[path]] = path
var/choice = input(user,"Choose a new brand","Select an Item") as null|anything in sortList(display_vending_names_paths)
var/choice = input(user,"Choose a new brand","Select an Item") as null|anything in sort_list(display_vending_names_paths)
set_type(display_vending_names_paths[choice])
else
return ..()
+2 -2
View File
@@ -1215,7 +1215,7 @@ GLOBAL_LIST_EMPTY(PDAs)
plist[avoid_assoc_duplicate_keys(pda.owner, namecounts)] = pda
var/choice = tgui_input_list(user, "Please select a PDA", "PDA Messenger", sortList(plist))
var/choice = tgui_input_list(user, "Please select a PDA", "PDA Messenger", sort_list(plist))
if (!choice)
return
@@ -1264,7 +1264,7 @@ GLOBAL_LIST_EMPTY(PDAs)
else
sortmode = /proc/cmp_pdaname_asc
for(var/obj/item/pda/P in sortList(GLOB.PDAs, sortmode))
for(var/obj/item/pda/P in sort_list(GLOB.PDAs, sortmode))
if(!P.owner || P.toff || P.hidden)
continue
. += P
+3 -3
View File
@@ -297,7 +297,7 @@ Code:
if (44) //medical records //This thing only displays a single screen so it's hard to really get the sub-menu stuff working.
menu = "<h4>[PDAIMG(medical)] Medical Record List</h4>"
if(GLOB.data_core.general)
for(var/datum/data/record/R in sortRecord(GLOB.data_core.general))
for(var/datum/data/record/R in sort_record(GLOB.data_core.general))
menu += "<a href='byond://?src=[REF(src)];choice=Medical Records;target=[R.fields["id"]]'>[R.fields["id"]]: [R.fields["name"]]<br>"
menu += "<br>"
if(441)
@@ -340,7 +340,7 @@ Code:
if (45) //security records
menu = "<h4>[PDAIMG(cuffs)] Security Record List</h4>"
if(GLOB.data_core.general)
for (var/datum/data/record/R in sortRecord(GLOB.data_core.general))
for (var/datum/data/record/R in sort_record(GLOB.data_core.general))
menu += "<a href='byond://?src=[REF(src)];choice=Security Records;target=[R.fields["id"]]'>[R.fields["id"]]: [R.fields["name"]]<br>"
menu += "<br>"
@@ -530,7 +530,7 @@ Code:
if(!emoji_table)
var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
var/list/collate = list("<br><table>")
for(var/emoji in sortList(icon_states(icon(EMOJI_SET))))
for(var/emoji in sort_list(icon_states(icon(EMOJI_SET))))
var/tag = sheet.icon_tag("emoji-[emoji]")
collate += "<tr><td>[emoji]</td><td>[tag]</td></tr>"
collate += "</table><br>"
@@ -87,7 +87,7 @@
if(!camera_ref || !camera.c_tag)
continue
bugged_cameras[camera.c_tag] = camera_ref
return sortList(bugged_cameras)
return sort_list(bugged_cameras)
/obj/item/camera_bug/proc/menu(list/cameras)
+1 -1
View File
@@ -844,7 +844,7 @@ GENE SCANNER
for(var/A in buffer)
options += get_display_name(A)
var/answer = input(user, "Analyze Potential", "Sequence Analyzer") as null|anything in sortList(options)
var/answer = input(user, "Analyze Potential", "Sequence Analyzer") as null|anything in sort_list(options)
if(answer && ready && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
var/sequence
for(var/A in buffer) //this physically hurts but i dont know what anything else short of an assoc list
@@ -25,7 +25,7 @@
add_overlay("improvised_grenade_filled")
add_overlay("improvised_grenade_wired")
times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value]
det_time = text2num(pickweight(times))
det_time = text2num(pick_weight(times))
if(det_time < 0) //checking for 'duds'
range = 1
det_time = rand(30,80)
+1 -1
View File
@@ -158,7 +158,7 @@
goodies += job_goodies
for(var/iterator = 0, iterator < goodie_count, iterator++)
var/target_good = pickweight(goodies)
var/target_good = pick_weight(goodies)
var/atom/movable/target_atom = new target_good(src)
body.log_message("[key_name(body)] received [target_atom.name] in the mail ([target_good])", LOG_GAME)
+1 -1
View File
@@ -143,7 +143,7 @@
user.visible_message(span_notice("[user]'s pinpointer fails to detect a signal."), span_notice("Your pinpointer fails to detect a signal."))
return
var/A = input(user, "Person to track", "Pinpoint") in sortList(names)
var/A = input(user, "Person to track", "Pinpoint") in sort_list(names)
if(!A || QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated())
return
+1 -1
View File
@@ -929,7 +929,7 @@
/obj/item/storage/box/papersack/Initialize(mapload)
. = ..()
papersack_designs = sortList(list(
papersack_designs = sort_list(list(
"None" = image(icon = src.icon, icon_state = "paperbag_None"),
"NanotrasenStandard" = image(icon = src.icon, icon_state = "paperbag_NanotrasenStandard"),
"SyndiSnacks" = image(icon = src.icon, icon_state = "paperbag_SyndiSnacks"),
@@ -23,7 +23,7 @@
/obj/item/storage/box/syndicate
/obj/item/storage/box/syndicate/bundle_a/PopulateContents()
switch (pickweight(list(
switch (pick_weight(list(
KIT_RECON = 2,
KIT_BLOODY_SPAI = 3,
KIT_STEALTHY = 2,
@@ -153,7 +153,7 @@
new /obj/item/card/emag/doorjack(src) // 3 tc
/obj/item/storage/box/syndicate/bundle_b/PopulateContents()
switch (pickweight(list(
switch (pick_weight(list(
KIT_JAMES_BOND = 2,
KIT_NINJA = 1,
KIT_DARK_LORD = 1,
+3 -3
View File
@@ -304,7 +304,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
/obj/item/tcgcard_deck/proc/flip_deck()
flipped = !flipped
var/list/temp_deck = contents.Copy()
contents = reverseRange(temp_deck)
contents = reverse_range(temp_deck)
//Now flip the cards to their opposite positions.
for(var/a in 1 to contents.len)
var/obj/item/tcgcard/nu_card = contents[a]
@@ -437,7 +437,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
weight += rarity_table[chance]
var/random = rand(weight)
for(var/bracket in rarity_table)
//Steals blatently from pickweight(), sorry buddy I need the index
//Steals blatently from pick_weight(), sorry buddy I need the index
random -= rarity_table[bracket]
if(random <= 0)
rarity = bracket
@@ -565,7 +565,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
totalCards++
cardsByCount[id] += 1
var/toSend = "Out of [totalCards] cards"
for(var/id in sortList(cardsByCount, /proc/cmp_num_string_asc))
for(var/id in sort_list(cardsByCount, /proc/cmp_num_string_asc))
if(id)
var/datum/card/template = GLOB.cached_cards[pack.series]["ALL"][id]
toSend += "\nID:[id] [template.name] [(cardsByCount[id] * 100) / totalCards]% Total:[cardsByCount[id]]"
+1 -1
View File
@@ -1498,7 +1498,7 @@
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
icon_state = "shell[rand(1,3)]"
color = pickweight(possible_colors)
color = pick_weight(possible_colors)
setDir(pick(GLOB.cardinals))
/obj/item/toy/brokenradio
+1 -1
View File
@@ -262,7 +262,7 @@
to_chat(user, span_notice("Your pinpointer fails to detect a signal."))
return
var/A = input(user, "", "Pinpoint") as null|anything in sortList(beacons)
var/A = input(user, "", "Pinpoint") as null|anything in sort_list(beacons)
if(!A || QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated())
return