cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add 'as anything' to various for loops

Browse Source
This commit is contained in:
Aronai Sieyes
2021-07-20 12:39:59 -04:00
parent bb3b3d6214
commit 34982728cb
221 changed files with 483 additions and 914 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/global/02_settings.dm
+2 -4
View File
@@ -29,8 +29,7 @@
// Arrange preferences that have never been enabled/disabled.
var/list/client_preference_keys = list()
for(var/cp in get_client_preferences())
var/datum/client_preference/client_pref = cp
for(var/datum/client_preference/client_pref as anything in get_client_preferences())
client_preference_keys += client_pref.key
if((client_pref.key in pref.preferences_enabled) || (client_pref.key in pref.preferences_disabled))
continue
@@ -57,8 +56,7 @@
. += "<b>Preferences</b><br>"
. += "<table>"
var/mob/pref_mob = preference_mob()
for(var/cp in get_client_preferences())
var/datum/client_preference/client_pref = cp
for(var/datum/client_preference/client_pref as anything in get_client_preferences())
if(!client_pref.may_toggle(pref_mob))
continue
code/modules/client/preference_setup/global/setting_datums.dm
+3 -6
View File
@@ -5,8 +5,7 @@ var/list/_client_preferences_by_type
/proc/get_client_preferences()
if(!_client_preferences)
_client_preferences = list()
for(var/ct in subtypesof(/datum/client_preference))
var/datum/client_preference/client_type = ct
for(var/datum/client_preference/client_type as anything in subtypesof(/datum/client_preference))
if(initial(client_type.description))
_client_preferences += new client_type()
return _client_preferences
@@ -21,16 +20,14 @@ var/list/_client_preferences_by_type
/proc/get_client_preference_by_key(var/preference)
if(!_client_preferences_by_key)
_client_preferences_by_key = list()
for(var/ct in get_client_preferences())
var/datum/client_preference/client_pref = ct
for(var/datum/client_preference/client_pref as anything in get_client_preferences())
_client_preferences_by_key[client_pref.key] = client_pref
return _client_preferences_by_key[preference]
/proc/get_client_preference_by_type(var/preference)
if(!_client_preferences_by_type)
_client_preferences_by_type = list()
for(var/ct in get_client_preferences())
var/datum/client_preference/client_pref = ct
for(var/datum/client_preference/client_pref as anything in get_client_preferences())
_client_preferences_by_type[client_pref.type] = client_pref
return _client_preferences_by_type[preference]
code/modules/client/preference_setup/loadout/loadout.dm
+3 -4
View File
@@ -12,9 +12,8 @@ var/list/gear_datums = list()
/hook/startup/proc/populate_gear_list()
//create a list of gear datums to sort
for(var/geartype in typesof(/datum/gear)-/datum/gear)
var/datum/gear/G = geartype
if(initial(G.type_category) == geartype)
for(var/datum/gear/G as anything in subtypesof(/datum/gear))
if(initial(G.type_category) == G)
continue
var/use_name = initial(G.display_name)
var/use_category = initial(G.sort_category)
@@ -32,7 +31,7 @@ var/list/gear_datums = list()
if(!loadout_categories[use_category])
loadout_categories[use_category] = new /datum/loadout_category(use_category)
var/datum/loadout_category/LC = loadout_categories[use_category]
gear_datums[use_name] = new geartype
gear_datums[use_name] = new G
LC.gear[use_name] = gear_datums[use_name]
loadout_categories = sortAssoc(loadout_categories)
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+8 -16
View File
@@ -13,8 +13,7 @@
/datum/gear/accessory/armband/New()
..()
var/list/armbands = list()
for(var/armband in (typesof(/obj/item/clothing/accessory/armband) - typesof(/obj/item/clothing/accessory/armband/med/color)))
var/obj/item/clothing/accessory/armband_type = armband
for(var/obj/item/clothing/accessory/armband_type as anything in (typesof(/obj/item/clothing/accessory/armband) - typesof(/obj/item/clothing/accessory/armband/med/color)))
armbands[initial(armband_type.name)] = armband_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(armbands))
@@ -71,8 +70,7 @@
/datum/gear/accessory/wcoat/New()
..()
var/list/wcoats = list()
for(var/wcoat in typesof(/obj/item/clothing/accessory/wcoat))
var/obj/item/clothing/accessory/wcoat_type = wcoat
for(var/obj/item/clothing/accessory/wcoat_type as anything in typesof(/obj/item/clothing/accessory/wcoat))
wcoats[initial(wcoat_type.name)] = wcoat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(wcoats))
@@ -84,8 +82,7 @@
/datum/gear/accessory/holster/New()
..()
var/list/holsters = list()
for(var/holster in typesof(/obj/item/clothing/accessory/holster))
var/obj/item/clothing/accessory/holster_type = holster
for(var/obj/item/clothing/accessory/holster_type as anything in typesof(/obj/item/clothing/accessory/holster))
holsters[initial(holster_type.name)] = holster_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(holsters))
@@ -97,8 +94,7 @@
/datum/gear/accessory/tie/New()
..()
var/list/ties = list()
for(var/tie in typesof(/obj/item/clothing/accessory/tie))
var/obj/item/clothing/accessory/tie_type = tie
for(var/obj/item/clothing/accessory/tie_type as anything in typesof(/obj/item/clothing/accessory/tie))
ties[initial(tie_type.name)] = tie_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(ties))
@@ -110,8 +106,7 @@
/datum/gear/accessory/scarf/New()
..()
var/list/scarfs = list()
for(var/scarf in typesof(/obj/item/clothing/accessory/scarf))
var/obj/item/clothing/accessory/scarf_type = scarf
for(var/obj/item/clothing/accessory/scarf_type as anything in typesof(/obj/item/clothing/accessory/scarf))
scarfs[initial(scarf_type.name)] = scarf_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(scarfs))
@@ -132,8 +127,7 @@
/datum/gear/accessory/jacket/New()
..()
var/list/jackets = list()
for(var/jacket in typesof(/obj/item/clothing/accessory/jacket))
var/obj/item/clothing/accessory/jacket_type = jacket
for(var/obj/item/clothing/accessory/jacket_type as anything in typesof(/obj/item/clothing/accessory/jacket))
jackets[initial(jacket_type.name)] = jacket_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jackets))
@@ -179,8 +173,7 @@
/datum/gear/accessory/fannypack/New()
..()
var/list/fannys = list()
for(var/fanny in typesof(/obj/item/weapon/storage/belt/fannypack))
var/obj/item/weapon/storage/belt/fannypack/fanny_type = fanny
for(var/obj/item/weapon/storage/belt/fannypack/fanny_type as anything in typesof(/obj/item/weapon/storage/belt/fannypack))
fannys[initial(fanny_type.name)] = fanny_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(fannys))
@@ -280,8 +273,7 @@
/datum/gear/accessory/asym/New()
..()
var/list/asyms = list()
for(var/asym in typesof(/obj/item/clothing/accessory/asymmetric))
var/obj/item/clothing/accessory/asymmetric_type = asym
for(var/obj/item/clothing/accessory/asymmetric_type as anything in typesof(/obj/item/clothing/accessory/asymmetric))
asyms[initial(asymmetric_type.name)] = asymmetric_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(asyms))
code/modules/client/preference_setup/loadout/loadout_general.dm
+2 -4
View File
@@ -53,8 +53,7 @@
/datum/gear/plushie/New()
..()
var/list/plushies = list()
for(var/plushie in subtypesof(/obj/item/toy/plushie/) - /obj/item/toy/plushie/therapy)
var/obj/item/toy/plushie/plushie_type = plushie
for(var/obj/item/toy/plushie/plushie_type as anything in subtypesof(/obj/item/toy/plushie/) - /obj/item/toy/plushie/therapy)
plushies[initial(plushie_type.name)] = plushie_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(plushies))
@@ -66,8 +65,7 @@
/datum/gear/figure/New()
..()
var/list/figures = list()
for(var/figure in typesof(/obj/item/toy/figure/) - /obj/item/toy/figure)
var/obj/item/toy/figure/figure_type = figure
for(var/obj/item/toy/figure/figure_type as anything in typesof(/obj/item/toy/figure/) - /obj/item/toy/figure)
figures[initial(figure_type.name)] = figure_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(figures))
code/modules/client/preference_setup/loadout/loadout_general_vr.dm
+3 -6
View File
@@ -6,8 +6,7 @@
/datum/gear/ball/New()
..()
var/list/balls = list()
for(var/ball in typesof(/obj/item/toy/tennis/))
var/obj/item/toy/tennis/ball_type = ball
for(var/obj/item/toy/tennis/ball_type as anything in typesof(/obj/item/toy/tennis/))
balls[initial(ball_type.name)] = ball_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(balls))
@@ -19,8 +18,7 @@
/datum/gear/character/New()
..()
var/list/characters = list()
for(var/character in typesof(/obj/item/toy/character/) - /obj/item/toy/character)
var/obj/item/toy/character/character_type = character
for(var/obj/item/toy/character/character_type as anything in typesof(/obj/item/toy/character/) - /obj/item/toy/character)
characters[initial(character_type.name)] = character_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(characters))
@@ -32,8 +30,7 @@
/datum/gear/mechtoy/New()
..()
var/list/mechs = list()
for(var/mech in typesof(/obj/item/toy/mecha/) - /obj/item/toy/mecha/)
var/obj/item/toy/mecha/mech_type = mech
for(var/obj/item/toy/mecha/mech_type as anything in typesof(/obj/item/toy/mecha/) - /obj/item/toy/mecha/)
mechs[initial(mech_type.name)] = mech_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(mechs))
code/modules/client/preference_setup/loadout/loadout_head.dm
+3 -6
View File
@@ -169,8 +169,7 @@
/datum/gear/head/pin/New()
..()
var/list/pins = list()
for(var/pin in typesof(/obj/item/clothing/head/pin))
var/obj/item/clothing/head/pin/pin_type = pin
for(var/obj/item/clothing/head/pin/pin_type as anything in typesof(/obj/item/clothing/head/pin))
pins[initial(pin_type.name)] = pin_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pins))
@@ -182,8 +181,7 @@
/datum/gear/head/hardhat/New()
..()
var/list/hardhats = list()
for(var/hardhat in typesof(/obj/item/clothing/head/hardhat))
var/obj/item/clothing/head/hardhat/hardhat_type = hardhat
for(var/obj/item/clothing/head/hardhat/hardhat_type as anything in typesof(/obj/item/clothing/head/hardhat))
hardhats[initial(hardhat_type.name)] = hardhat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hardhats))
@@ -223,8 +221,7 @@
/datum/gear/head/santahat/New()
..()
var/list/santahats = list()
for(var/santahat in typesof(/obj/item/clothing/head/santa))
var/obj/item/clothing/head/santa/santahat_type = santahat
for(var/obj/item/clothing/head/santa/santahat_type as anything in typesof(/obj/item/clothing/head/santa))
santahats[initial(santahat_type.name)] = santahat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(santahats))
code/modules/client/preference_setup/loadout/loadout_smoking.dm
+1 -2
View File
@@ -48,7 +48,6 @@
/datum/gear/cigarettes/New()
..()
var/list/cigarettes = list()
for(var/cigarette in (typesof(/obj/item/weapon/storage/fancy/cigarettes) - typesof(/obj/item/weapon/storage/fancy/cigarettes/killthroat)))
var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand = cigarette
for(var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand as anything in (typesof(/obj/item/weapon/storage/fancy/cigarettes) - typesof(/obj/item/weapon/storage/fancy/cigarettes/killthroat)))
cigarettes[initial(cigarette_brand.name)] = cigarette_brand
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes))
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+8 -16
View File
@@ -16,8 +16,7 @@
/datum/gear/uniform/cheongsam/New()
..()
var/list/cheongasms = list()
for(var/cheongasm in typesof(/obj/item/clothing/under/cheongsam))
var/obj/item/clothing/under/cheongsam/cheongasm_type = cheongasm
for(var/obj/item/clothing/under/cheongsam/cheongasm_type as anything in typesof(/obj/item/clothing/under/cheongsam))
cheongasms[initial(cheongasm_type.name)] = cheongasm_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cheongasms))
@@ -28,8 +27,7 @@
/datum/gear/uniform/croptop/New()
..()
var/list/croptops = list()
for(var/croptop in typesof(/obj/item/clothing/under/croptop))
var/obj/item/clothing/under/croptop/croptop_type = croptop
for(var/obj/item/clothing/under/croptop/croptop_type as anything in typesof(/obj/item/clothing/under/croptop))
croptops[initial(croptop_type.name)] = croptop_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(croptops))
@@ -52,8 +50,7 @@
/datum/gear/uniform/jumpsuit/New()
..()
var/list/jumpclothes = list()
for(var/jump in typesof(/obj/item/clothing/under/color))
var/obj/item/clothing/under/color/jumps = jump
for(var/obj/item/clothing/under/color/jumps as anything in typesof(/obj/item/clothing/under/color))
jumpclothes[initial(jumps.name)] = jumps
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpclothes))
@@ -78,8 +75,7 @@
/datum/gear/uniform/pants/New()
..()
var/list/pants = list()
for(var/pant in typesof(/obj/item/clothing/under/pants))
var/obj/item/clothing/under/pants/pant_type = pant
for(var/obj/item/clothing/under/pants/pant_type as anything in typesof(/obj/item/clothing/under/pants))
pants[initial(pant_type.name)] = pant_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants))
@@ -90,8 +86,7 @@
/datum/gear/uniform/shorts/New()
..()
var/list/shorts = list()
for(var/short in typesof(/obj/item/clothing/under/shorts))
var/obj/item/clothing/under/pants/short_type = short
for(var/obj/item/clothing/under/pants/short_type as anything in typesof(/obj/item/clothing/under/shorts))
shorts[initial(short_type.name)] = short_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts))
@@ -212,8 +207,7 @@
/datum/gear/uniform/suit/lawyer/New()
..()
var/list/lsuits = list()
for(var/lsuit in typesof(/obj/item/clothing/under/lawyer))
var/obj/item/clothing/suit/lsuit_type = lsuit
for(var/obj/item/clothing/suit/lsuit_type as anything in typesof(/obj/item/clothing/under/lawyer))
lsuits[initial(lsuit_type.name)] = lsuit_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(lsuits))
@@ -273,8 +267,7 @@
/datum/gear/uniform/scrub/New()
..()
var/list/scrubs = list()
for(var/scrub in typesof(/obj/item/clothing/under/rank/medical/scrubs))
var/obj/item/clothing/under/rank/medical/scrubs/scrub_type = scrub
for(var/obj/item/clothing/under/rank/medical/scrubs/scrub_type as anything in typesof(/obj/item/clothing/under/rank/medical/scrubs))
scrubs[initial(scrub_type.name)] = scrub_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(scrubs))
@@ -396,8 +389,7 @@
/datum/gear/uniform/dresses/maid/New()
..()
var/list/maids = list()
for(var/maid in typesof(/obj/item/clothing/under/dress/maid))
var/obj/item/clothing/under/dress/maid/maid_type = maid
for(var/obj/item/clothing/under/dress/maid/maid_type as anything in typesof(/obj/item/clothing/under/dress/maid))
maids[initial(maid_type.name)] = maid_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(maids))
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+1 -2
View File
@@ -171,8 +171,7 @@ Swimsuits
/datum/gear/uniform/swimsuits/New()
..()
var/list/swimsuits = list()
for(var/swimsuit in typesof(/obj/item/weapon/storage/box/fluff/swimsuit))
var/obj/item/weapon/storage/box/fluff/swimsuit/swimsuit_type = swimsuit
for(var/obj/item/weapon/storage/box/fluff/swimsuit/swimsuit_type as anything in typesof(/obj/item/weapon/storage/box/fluff/swimsuit))
swimsuits[initial(swimsuit_type.name)] = swimsuit_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(swimsuits))
code/modules/client/preference_setup/loadout/loadout_utility.dm
+1 -2
View File
@@ -21,8 +21,7 @@
/datum/gear/utility/communicator/New()
..()
var/list/communicators = list()
for(var/communicator in typesof(/obj/item/device/communicator) - list(/obj/item/device/communicator/integrated,/obj/item/device/communicator/commlink)) //VOREStation Edit - Remove Commlink
var/obj/item/device/communicator_type = communicator
for(var/obj/item/device/communicator_type as anything in typesof(/obj/item/device/communicator) - list(/obj/item/device/communicator/integrated,/obj/item/device/communicator/commlink)) //VOREStation Edit - Remove Commlink
communicators[initial(communicator_type.name)] = communicator_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(communicators))