Loadoutport Fixes (And adds some new items while I'm here) (#517)

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
 	"recommendations": [
 		"platymuus.dm-langclient",
-		"EditorConfig.EditorConfig",
 		"arcanis.vscode-zipfs",
 		"dbaeumer.vscode-eslint",
 		"stylemistake.auto-comment-blocks",

dependencies.sh

@@ -11,8 +11,9 @@ export BYOND_MINOR=1626
 export RUST_G_VERSION=3.1.0
 
 #node version
-export NODE_VERSION=14
-export NODE_VERSION_PRECISE=14.16.1
+export NODE_VERSION_LTS=20.13.0
+# compatiblility mode MUST work with windows 7
+export NODE_VERSION_COMPAT=20.2.0
 
 # SpacemanDMM git tag
 export SPACEMAN_DMM_VERSION=suite-1.8

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_accessory.dm

@@ -2,7 +2,7 @@
 /datum/loadout_category/accessories
 	category_name = "Accessory"
 	type_to_generate = /datum/loadout_item/accessory
-	tab_order = 11
+	tab_order = 9
 
 /datum/loadout_item/accessory
 	abstract_type = /datum/loadout_item/accessory
@@ -128,12 +128,12 @@
 /datum/loadout_item/accessory/bone_charm
 	name = "Heirloom Bone Talismin"
 	item_path = /obj/item/clothing/accessory/armorless_talisman
-	additional_displayed_text = list("No Armor")
+	additional_displayed_text = list("Cosmetic")
 
 /datum/loadout_item/accessory/bone_codpiece
 	name = "Heirloom Skull Codpiece"
 	item_path = /obj/item/clothing/accessory/armorless_skullcodpiece
-	additional_displayed_text = list("No Armor")
+	additional_displayed_text = list("Cosmetic")
 
 /datum/loadout_item/accessory/pride
 	name = "Pride Pin"

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_glasses.dm

@@ -29,6 +29,10 @@
 	name = "Jamjar Glasses"
 	item_path = /obj/item/clothing/glasses/regular/jamjar
 
+/datum/loadout_item/glasses/prescription_glasses/binoclard
+	name = "Binoclard Glasses"
+	item_path = /obj/item/clothing/glasses/regular/kim
+
 /datum/loadout_item/glasses/black_blindfold
 	name = "Black Blindfold"
 	item_path = /obj/item/clothing/glasses/blindfold
@@ -73,3 +77,11 @@
 /datum/loadout_item/glasses/casualsunglasses
 	name = "Casual Sunglasses"
 	item_path = /obj/item/clothing/glasses/sunglasses/casual
+
+/datum/loadout_item/glasses/osi
+	name = "OSI Sunglasses"
+	item_path = /obj/item/clothing/glasses/osi
+
+/datum/loadout_item/glasses/monocle
+	name = "Monocle"
+	item_path = /obj/item/clothing/glasses/monocle

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_gloves.dm

@@ -4,7 +4,7 @@
 /datum/loadout_category/gloves
 	category_name = "Gloves"
 	type_to_generate = /datum/loadout_item/gloves
-	tab_order = 9
+	tab_order = 11
 
 /datum/loadout_item/gloves
 	abstract_type = /datum/loadout_item/gloves
@@ -73,8 +73,9 @@
 /datum/loadout_item/gloves/bone
 	name = "Heirloom Bone Bracers"
 	item_path = /obj/item/clothing/gloves/armorless_bracer
-	additional_displayed_text = list("No Armor")
+	additional_displayed_text = list("Cosmetic")
 
 /datum/loadout_item/gloves/mragloves
 	name = "Malheur Research Association gloves"
 	item_path = /obj/item/clothing/gloves/mragloves
+	additional_displayed_text = list("Character Item")

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_heads.dm

@@ -213,3 +213,48 @@
 /datum/loadout_item/head/reshiacap
 	name = "Cap (Delinquent, Black)"
 	item_path = /obj/item/clothing/head/hats/reshiacap
+	additional_displayed_text = list("Character Item")
+
+/datum/loadout_item/head/cowboy
+	name = "Cowboy Hat (Brown)"
+	item_path = /obj/item/clothing/head/cowboy/brown
+
+/datum/loadout_item/head/cowboy_black
+	name = "Cowboy Hat (Black)"
+	item_path = /obj/item/clothing/head/cowboy/black
+
+/datum/loadout_item/head/cowboy_white
+	name = "Cowboy Hat (White)"
+	item_path = /obj/item/clothing/head/cowboy/white
+
+/datum/loadout_item/head/cowboy_grey
+	name = "Cowboy Hat (Grey)"
+	item_path = /obj/item/clothing/head/cowboy/grey
+
+/datum/loadout_item/head/cowboy_red
+	name = "Cowboy Hat (Red)"
+	item_path = /obj/item/clothing/head/cowboy/red
+
+/datum/loadout_item/head/propeller_hat
+	name = "Propeller Hat"
+	item_path = /obj/item/clothing/head/soft/propeller_hat
+
+/datum/loadout_item/head/garland
+	name = "Garland"
+	item_path = /obj/item/clothing/head/costume/garland
+
+/datum/loadout_item/head/garland/rainbowbunch
+	name = "Rainbow Flower Crown"
+	item_path = /obj/item/clothing/head/costume/garland/rainbowbunch
+
+/datum/loadout_item/head/garland/sunflower
+	name = "Sunflower Crown"
+	item_path = /obj/item/clothing/head/costume/garland/sunflower
+
+/datum/loadout_item/head/garland/poppy
+	name = "Poppy Crown"
+	item_path = /obj/item/clothing/head/costume/garland/poppy
+
+/datum/loadout_item/head/garland/lily
+	name = "Lily Crown"
+	item_path = /obj/item/clothing/head/costume/garland/lily

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_masks.dm

@@ -30,11 +30,11 @@
 	item_path = /obj/item/clothing/mask/bandana
 
 /datum/loadout_item/mask/bandana_striped_greyscale
-	name = "Striped Bandana"
+	name = "Bandana (Striped)"
 	item_path = /obj/item/clothing/mask/bandana/striped
 
 /datum/loadout_item/mask/skull_bandana
-	name = "Skull Bandana"
+	name = "Bandana (Skull)"
 	item_path = /obj/item/clothing/mask/bandana/skull
 
 /datum/loadout_item/mask/surgical_mask

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_neck.dm

@@ -41,7 +41,21 @@
 /datum/loadout_item/neck/casual_cloak
 	name = "Fuzzy Cloak"
 	item_path = /obj/item/clothing/neck/cloak/casual
+	additional_displayed_text = list("Character Item")
 
 /datum/loadout_item/neck/cremona_necklace
 	name = "Puligard Holy Necklace"
 	item_path = /obj/item/clothing/neck/cremona
+	additional_displayed_text = list("Character Item")
+
+/datum/loadout_item/neck/rainbow_tie
+	name = "Bowtie (Rainbow)"
+	item_path = /obj/item/clothing/neck/bowtie/rainbow
+
+/datum/loadout_item/neck/bowtie
+	name = "Bowtie (Colorable)"
+	item_path = /obj/item/clothing/neck/bowtie
+
+/datum/loadout_item/neck/maid
+	name = "Maid Collar"
+	item_path = /obj/item/clothing/neck/maid

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_pocket.dm

@@ -218,7 +218,7 @@
 /datum/loadout_item/pocket_items/plush/albertcat
 	name = "Plush (Albus)"
 	item_path = /obj/item/toy/plush/albertcat
-	additional_displayed_text = list("Charcter")
+	additional_displayed_text = list("Character Item")
 
 /datum/loadout_item/pocket_items/card_binder
 	name = "Card Binder"

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm

@@ -108,6 +108,7 @@
 /datum/loadout_item/shoes/mrashoes
 	name = "Malheur Research Association boots"
 	item_path = /obj/item/clothing/shoes/mrashoes
+	additional_displayed_text = list("Character Item")
 
 /datum/loadout_item/shoes/reshiaboot
 	name = "Short Brown Boots"
@@ -120,3 +121,4 @@
 /datum/loadout_item/shoes/lini
 	name = "Berbier Boots"
 	item_path = /obj/item/clothing/shoes/liniboots
+	additional_displayed_text = list("Character Item")

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_suits.dm

@@ -26,7 +26,7 @@
 /datum/loadout_item/suit/parade_jacket_greyscale
 	name = "Greyscale Parade Jacket"
 	item_path = /obj/item/clothing/suit/greyscale_parade
-	additional_displayed_text = list("No Armor")
+	additional_displayed_text = list("Cosmetic")
 
 /datum/loadout_item/suit/big_jacket
 	name = "Greyscale Jacket Large"
@@ -80,7 +80,7 @@
 /datum/loadout_item/suit/goliath_cloak
 	name = "Heirloom Goliath Cloak"
 	item_path = /obj/item/clothing/suit/hooded/cloak/goliath/heirloom
-	additional_displayed_text = list("No Armor")
+	additional_displayed_text = list("Cosmetic")
 
 /datum/loadout_item/suit/poncho
 	name = "Poncho"

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm

@@ -54,6 +54,14 @@
 	name = "Random Jumpskirt"
 	item_path = /obj/item/clothing/under/color/jumpskirt/random
 
+/datum/loadout_item/under/jumpsuit/rainbow
+	name = "Rainbow Jumpsuit"
+	item_path = /obj/item/clothing/under/color/rainbow
+
+/datum/loadout_item/under/jumpsuit/rainbow_skirt
+	name = "Rainbow Jumpskirt"
+	item_path = /obj/item/clothing/under/color/jumpskirt/rainbow
+
 /datum/loadout_item/under/jumpsuit/jeans
 	name = "Jeans"
 	item_path = /obj/item/clothing/under/pants/jeans
@@ -254,10 +262,6 @@
 	name = "Purple Suitskirt"
 	item_path = /obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt
 
-/datum/loadout_item/under/formal/red_suit
-	name = "Red Suit"
-	item_path = /obj/item/clothing/under/suit/red
-
 /datum/loadout_item/under/formal/red_lawyer_skirt
 	name = "Red Lawyer Suit"
 	item_path = /obj/item/clothing/under/rank/civilian/lawyer/red
@@ -333,14 +337,17 @@
 /datum/loadout_item/under/formal/nndress
 	name = "Blue Dress"
 	item_path = /obj/item/clothing/under/dress/nndress
+	additional_displayed_text = list("Character Item")
 
 /datum/loadout_item/under/formal/ritzuniform
 	name = "Malheur Research Association uniform"
 	item_path = /obj/item/clothing/under/rank/rnd/mrauniform
+	additional_displayed_text = list("Character Item")
 
 /datum/loadout_item/under/formal/reshiacoat
 	name = "Black Uniform Coat"
 	item_path = /obj/item/clothing/under/jumpsuit/reshiacoat
+	additional_displayed_text = list("Character Item")
 
 /datum/loadout_item/under/formal/arbitersuit
 	name = "Arbiter's Suit"
@@ -377,7 +384,9 @@
 /datum/loadout_item/under/formal/grey
 	name = "Designer Outfit"
 	item_path = /obj/item/clothing/under/jumpsuit/greyshirt
+	additional_displayed_text = list("Character Item")
 
 /datum/loadout_item/under/jumpsuit/pilot
 	name = "Berbier Uniform"
 	item_path = /obj/item/clothing/under/jumpsuit/lini
+	additional_displayed_text = list("Character Item")

maplestation_modules/code/modules/loadouts/loadout_ui/loadout_outfit_helpers.dm

@@ -117,7 +117,7 @@
 /proc/get_updated_loadout_list(datum/preferences/preferences, list/loadout_list)
 	RETURN_TYPE(/list)
 	var/slot = preferences.read_preference(/datum/preference/numeric/active_loadout)
-	var/list/complete_loadout_list = preferences.read_preference(/datum/preference/loadout)
+	var/list/complete_loadout_list = preferences.read_preference(/datum/preference/loadout) || list()
 	while(length(complete_loadout_list) < slot)
 		complete_loadout_list += null
 

maplestation_modules/story_content/shiro_equipment/code/shiroclothing.dm

@@ -19,7 +19,9 @@
 /datum/loadout_item/under/formal/shirodress
 	name = "Doll's Formal Uniform"
 	item_path = /obj/item/clothing/under/shirodress
+	additional_displayed_text = list("Character Item")
 
 /datum/loadout_item/neck/shirocloak
 	name = "Side Cape"
 	item_path = /obj/item/clothing/neck/cloak/shirocloak
+	additional_displayed_text = list("Character Item")

maplestation_modules/story_content/wollys_items/code/wollysitems.dm

@@ -139,10 +139,12 @@ since some of them are two per character or singleton, i'm gonna save space and
 /datum/loadout_item/suit/cyrilcloak
 	name = "Claw-Sewn Cloak"
 	item_path = /obj/item/clothing/suit/toggle/cyrilcloak
+	additional_displayed_text = list("Character Item")
 
 /datum/loadout_item/suit/scoriajacket
 	name = "Embroidered Clan Jacket"
 	item_path = /obj/item/clothing/suit/matthewjacket
+	additional_displayed_text = list("Character Item")
 
 // sheathes
 

tgstation.dme

@@ -636,7 +636,6 @@
 #include "code\controllers\subsystem\ipintel.dm"
 #include "code\controllers\subsystem\job.dm"
 #include "code\controllers\subsystem\lag_switch.dm"
-#include "code\controllers\subsystem\language.dm"
 #include "code\controllers\subsystem\library.dm"
 #include "code\controllers\subsystem\lighting.dm"
 #include "code\controllers\subsystem\lua.dm"
@@ -1083,7 +1082,6 @@
 #include "code\datums\components\igniter.dm"
 #include "code\datums\components\infective.dm"
 #include "code\datums\components\interaction_booby_trap.dm"
-#include "code\datums\components\irradiated.dm"
 #include "code\datums\components\itembound.dm"
 #include "code\datums\components\itempicky.dm"
 #include "code\datums\components\jetpack.dm"
@@ -1678,7 +1676,6 @@
 #include "code\datums\quirks\neutral_quirks\photographer.dm"
 #include "code\datums\quirks\neutral_quirks\pineapple_hater.dm"
 #include "code\datums\quirks\neutral_quirks\pineapple_liker.dm"
-#include "code\datums\quirks\neutral_quirks\pride_pin.dm"
 #include "code\datums\quirks\neutral_quirks\shifty_eyes.dm"
 #include "code\datums\quirks\neutral_quirks\snob.dm"
 #include "code\datums\quirks\neutral_quirks\transhumanist.dm"
@@ -3595,7 +3592,6 @@
 #include "code\modules\client\preferences\pixel_size.dm"
 #include "code\modules\client\preferences\playtime_reward_cloak.dm"
 #include "code\modules\client\preferences\preferred_map.dm"
-#include "code\modules\client\preferences\pride_pin.dm"
 #include "code\modules\client\preferences\prisoner_crime.dm"
 #include "code\modules\client\preferences\prosthetic.dm"
 #include "code\modules\client\preferences\random.dm"

tgui/.prettierignore

@@ -6,6 +6,8 @@
 /yarn.lock
 /.pnp.*
 
+.swcrc
+
 /docs
 /public
 /packages/tgui-polyfill