From 26d7d6239c3ab40ceba4237452730665d50a7209 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 21 Dec 2024 12:32:18 -0500 Subject: [PATCH 1/2] Loadouts Debloating --- .../Locale/en-US/loadouts/generic/back.ftl | 3 + .../en-US/loadouts/{ => generic}/eyes.ftl | 2 + .../Locale/en-US/loadouts/generic/hands.ftl | 1 + .../Locale/en-US/loadouts/generic/head.ftl | 12 + .../en-US/loadouts/{ => generic}/items.ftl | 7 + .../Locale/en-US/loadouts/generic/neck.ftl | 4 + .../en-US/loadouts/generic/outerClothing.ftl | 11 + .../en-US/loadouts/{ => generic}/shoes.ftl | 6 + .../Locale/en-US/loadouts/generic/uniform.ftl | 12 + Resources/Locale/en-US/loadouts/head.ftl | 2 - .../jobs/engineering/uncategorized.ftl | 1 + .../en-US/loadouts/jobs/heads/captain.ftl | 3 + .../loadouts/jobs/heads/headOfPersonnel.ftl | 2 + Resources/Locale/en-US/loadouts/neck.ftl | 0 .../Locale/en-US/loadouts/outerClothing.ftl | 5 - Resources/Locale/en-US/loadouts/uniform.ftl | 1 - .../Generic/gloveGroup.yml | 18 - .../CharacterItemGroups/Generic/headGroup.yml | 54 -- .../Generic/itemGroups.yml | 56 -- .../CharacterItemGroups/Generic/neckGroup.yml | 26 - .../CharacterItemGroups/Generic/shoeGroup.yml | 20 - .../Entities/Clothing/Head/soft.yml | 4 +- .../Prototypes/Loadouts/Generic/hands.yml | 99 ---- .../Prototypes/Loadouts/Generic/head.yml | 351 ------------ .../Prototypes/Loadouts/Generic/neck.yml | 214 -------- .../Prototypes/Loadouts/Generic/shoes.yml | 112 ---- .../Prototypes/Loadouts/Generic/uniform.yml | 515 ------------------ 27 files changed, 66 insertions(+), 1475 deletions(-) create mode 100644 Resources/Locale/en-US/loadouts/generic/back.ftl rename Resources/Locale/en-US/loadouts/{ => generic}/eyes.ftl (84%) create mode 100644 Resources/Locale/en-US/loadouts/generic/hands.ftl create mode 100644 Resources/Locale/en-US/loadouts/generic/head.ftl rename Resources/Locale/en-US/loadouts/{ => generic}/items.ftl (91%) create mode 100644 Resources/Locale/en-US/loadouts/generic/neck.ftl create mode 100644 Resources/Locale/en-US/loadouts/generic/outerClothing.ftl rename Resources/Locale/en-US/loadouts/{ => generic}/shoes.ftl (83%) create mode 100644 Resources/Locale/en-US/loadouts/generic/uniform.ftl delete mode 100644 Resources/Locale/en-US/loadouts/head.ftl create mode 100644 Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl delete mode 100644 Resources/Locale/en-US/loadouts/neck.ftl delete mode 100644 Resources/Locale/en-US/loadouts/outerClothing.ftl delete mode 100644 Resources/Locale/en-US/loadouts/uniform.ftl diff --git a/Resources/Locale/en-US/loadouts/generic/back.ftl b/Resources/Locale/en-US/loadouts/generic/back.ftl new file mode 100644 index 00000000000..2925981849e --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/back.ftl @@ -0,0 +1,3 @@ +loadout-name-LoadoutBackpack = grey backpack (colorable) +loadout-name-LoadoutBackpackDuffel = grey duffelbag (colorable) +loadout-name-LoadoutBackpackSatchel = grey satchel (colorable) diff --git a/Resources/Locale/en-US/loadouts/eyes.ftl b/Resources/Locale/en-US/loadouts/generic/eyes.ftl similarity index 84% rename from Resources/Locale/en-US/loadouts/eyes.ftl rename to Resources/Locale/en-US/loadouts/generic/eyes.ftl index 93c4d9faa64..4d345190474 100644 --- a/Resources/Locale/en-US/loadouts/eyes.ftl +++ b/Resources/Locale/en-US/loadouts/generic/eyes.ftl @@ -3,3 +3,5 @@ loadout-description-LoadoutEyesBlindfold = Why would you want this? loadout-name-LoadoutItemBlindfoldFake = "blind"fold loadout-description-LoadoutItemBlindfoldFake = This product may not work as advertised. + +loadout-name-LoadoutEyesGlasses = glasses (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/hands.ftl b/Resources/Locale/en-US/loadouts/generic/hands.ftl new file mode 100644 index 00000000000..d9df439ce5a --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/hands.ftl @@ -0,0 +1 @@ +loadout-name-LoadoutHandsColorWhite = gloves (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/head.ftl b/Resources/Locale/en-US/loadouts/generic/head.ftl new file mode 100644 index 00000000000..efd13b00845 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/head.ftl @@ -0,0 +1,12 @@ +loadout-description-LoadoutHeadBeaverHat = Gentlemen. +loadout-description-LoadoutHeadTophat = A stylish black tophat. + +loadout-name-LoadoutHeadFedoraWhite = fedora (colorable) +loadout-name-LoadoutHeadHatCowboyWhite = cowboy hat (colorable) +loadout-name-LoadoutHeadHatMimesoft = baseball cap (colorable) +loadout-name-LoadoutHeadHatMimesoftFlipped = baseball cap (colorable, flipped) +loadout-name-LoadoutHeadHijabColorable = hijab (colorable) +loadout-name-LoadoutHeadTurbanColorable = turban (colorable) +loadout-name-LoadoutHeadKippahColorable = kippah (colorable) +loadout-name-LoadoutHeadTinfoil = tinfoil hat (colorable) +loadout-name-LoadoutHeadHatCowboyBountyHunter = bounty hunter hat (colorable) diff --git a/Resources/Locale/en-US/loadouts/items.ftl b/Resources/Locale/en-US/loadouts/generic/items.ftl similarity index 91% rename from Resources/Locale/en-US/loadouts/items.ftl rename to Resources/Locale/en-US/loadouts/generic/items.ftl index c2ec9a1c847..ac52b8be226 100644 --- a/Resources/Locale/en-US/loadouts/items.ftl +++ b/Resources/Locale/en-US/loadouts/generic/items.ftl @@ -35,3 +35,10 @@ loadout-name-LoadoutItemBoxSurvivalSecurity = survival box (security) loadout-name-LoadoutItemBoxSurvivalBrigmedic = survival box (corpsman) loadout-name-LoadoutItemBoxSurvivalMedical = survival box (medical) loadout-name-LoadoutItemBoxHug = box of hugs (clown) + +loadout-name-LoadoutItemLighter = lighter (colorable) +loadout-name-LoadoutItemLighterCheap = cheap lighter (colorable) +loadout-name-LoadoutItemLighterFlippo = flippo lighter (colorable) +loadout-name-LoadoutItemDrinkShinyFlask = shiny flask (colorable) +loadout-name-LoadoutItemDrinkLithiumFlask = lithium flask (colorable) +loadout-name-LoadoutItemDrinkVacuumFlask = vacuum flask (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/neck.ftl b/Resources/Locale/en-US/loadouts/generic/neck.ftl new file mode 100644 index 00000000000..8a9abb76664 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/neck.ftl @@ -0,0 +1,4 @@ +loadout-name-LoadoutNeckOldMantle = old mantle (colorable) +loadout-name-LoadoutNeckUnathiMantle = unathi mantle (colorable) +loadout-name-LoadoutNeckTieWhite = suit tie (colorable) +loadout-name-LoadoutNeckBedsheetWhite = bedsheet (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl b/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl new file mode 100644 index 00000000000..e312968b8e9 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl @@ -0,0 +1,11 @@ +loadout-description-LoadoutOuterGhostSheet = Spooky... +loadout-description-LoadoutOuterCoatBomberjacket = A sleek bomber jacket. +loadout-description-LoadoutOuterCoatHoodieBlack = A warm hoodie. +loadout-description-LoadoutOuterCoatHoodieGrey = A warm hoodie. +loadout-description-LoadoutOuterCoatWinterCoat = For keeping nice and snug. + +loadout-name-LoadoutOuterCoatHoodieGrey = grey hoodie (colorable) +loadout-name-LoadoutOuterCoatWinterCoat = winter coat (colorable) +loadout-name-LoadoutOuterCoatHyenhSweater = sweater (colorable) +loadout-name-LoadoutOuterWinterCoatLong = long winter coat (colorable) +loadout-name-LoadoutOuterCoatMNKWhiteHoodie = MNK hoodie (colorable) diff --git a/Resources/Locale/en-US/loadouts/shoes.ftl b/Resources/Locale/en-US/loadouts/generic/shoes.ftl similarity index 83% rename from Resources/Locale/en-US/loadouts/shoes.ftl rename to Resources/Locale/en-US/loadouts/generic/shoes.ftl index 79a8dd9c436..15631952f76 100644 --- a/Resources/Locale/en-US/loadouts/shoes.ftl +++ b/Resources/Locale/en-US/loadouts/generic/shoes.ftl @@ -8,3 +8,9 @@ loadout-description-LoadoutShoesRed = Embrace the spirit of exploration with the loadout-description-LoadoutShoesWhite = Elevate your style with these pristine white shoes, a symbol of innovation and progress. loadout-description-LoadoutShoesYellow = Light up the space station with these radiant yellow shoes, bringing a burst of energy to your every step. loadout-description-LoadoutShoesSlippersDuck = Quack up your downtime with these adorable duck slippers that waddle the line between comfort and quirkiness. + +loadout-name-LoadoutShoesWhite = shoes (colorable) +loadout-name-LoadoutShoesBootsCowboyWhite = cowboy boots (colorable) +loadout-name-LoadoutShoesBootsCowboyFancy = fancy cowboy boots (colorable) +loadout-name-LoadoutShoesMiscWhite = misc shoes (colorable) +loadout-name-LoadoutShoesClothWrap = cloth foot wraps (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/uniform.ftl b/Resources/Locale/en-US/loadouts/generic/uniform.ftl new file mode 100644 index 00000000000..fa4eccbdb17 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/uniform.ftl @@ -0,0 +1,12 @@ +loadout-description-LoadoutUniformAncientJumpsuit = The legend of the Greytide. + +loadout-name-LoadoutUniformJumpsuitColorWhite = jumpsuit (colorable) +loadout-name-LoadoutUniformJumpskirtColorWhite = jumpskirt (colorable) +loadout-name-LoadoutUniformMartialGi = gi (colorable) +loadout-name-LoadoutClothingJumpsuitKimono = kimono (colorable) +loadout-name-LoadoutClothingMNKOfficeSkirt = MNK office skirt (colorable) +loadout-name-LoadoutClothingMNKUnderGarment = MNK under garment (colorable) +loadout-name-LoadoutClothingMNKGymBra = MNK gym bra (colorable) +loadout-name-LoadoutClothingJumpsuitSuitWhite = business suit (colorable) +loadout-name-LoadoutClothingJumpsuitSuitWhiteAlt = business suit (alt, colorable) +loadout-name-LoadoutClothingJumpsuitSuitWhiteMob = mob suit (colorable) diff --git a/Resources/Locale/en-US/loadouts/head.ftl b/Resources/Locale/en-US/loadouts/head.ftl deleted file mode 100644 index be10f7d2fd2..00000000000 --- a/Resources/Locale/en-US/loadouts/head.ftl +++ /dev/null @@ -1,2 +0,0 @@ -loadout-description-LoadoutHeadBeaverHat = Gentlemen. -loadout-description-LoadoutHeadTophat = A stylish black tophat. diff --git a/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl b/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl new file mode 100644 index 00000000000..1831174bd46 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl @@ -0,0 +1 @@ +loadout-name-LoadoutEngineeringHeadHardhatWhite = hardhat (colorable) diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl index 27069b6ff88..1cb2a615991 100644 --- a/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl +++ b/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl @@ -10,3 +10,6 @@ loadout-description-LoadoutCommandCapHatCapcap = The Captain's cap, pretty nice. loadout-description-LoadoutCommandCapHatBeret = The Captain's beret, very nice. loadout-description-LoadoutCommandCapMaskGas = Why would the captain need this? I don't know, but it looks cool. loadout-description-LoadoutCommandCapItemDrinkFlask = The finest of flasks, for the finest of drinks. + +loadout-name-LoadoutCaptainDrinkFlask = captain's drink flask (colorable) +loadout-name-LoadoutCaptainGlovesInspection = inspection gloves (colorable) diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl index 8dc606f65dd..5c717e95839 100644 --- a/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl +++ b/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl @@ -2,3 +2,5 @@ loadout-description-LoadoutCommandHOPNeckMantle = To show who has the authority loadout-description-LoadoutCommandHOPNeckCloak = To really show who has the authority around here. loadout-description-LoadoutCommandHOPBackIan = A backpack that looks like Ian, how cute! loadout-description-LoadoutCommandHOPHatCap = The HOP's cap, pretty nice. + +loadout-name-LoadoutHeadOfPersonnelGlovesInspection = inspection gloves (colorable) diff --git a/Resources/Locale/en-US/loadouts/neck.ftl b/Resources/Locale/en-US/loadouts/neck.ftl deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Locale/en-US/loadouts/outerClothing.ftl b/Resources/Locale/en-US/loadouts/outerClothing.ftl deleted file mode 100644 index 7dc09f552e0..00000000000 --- a/Resources/Locale/en-US/loadouts/outerClothing.ftl +++ /dev/null @@ -1,5 +0,0 @@ -loadout-description-LoadoutOuterGhostSheet = Spooky... -loadout-description-LoadoutOuterCoatBomberjacket = A sleek bomber jacket. -loadout-description-LoadoutOuterCoatHoodieBlack = A warm hoodie. -loadout-description-LoadoutOuterCoatHoodieGrey = A warm hoodie. -loadout-description-LoadoutOuterCoatWinterCoat = For keeping nice and snug. diff --git a/Resources/Locale/en-US/loadouts/uniform.ftl b/Resources/Locale/en-US/loadouts/uniform.ftl deleted file mode 100644 index b32bd92b3a4..00000000000 --- a/Resources/Locale/en-US/loadouts/uniform.ftl +++ /dev/null @@ -1 +0,0 @@ -loadout-description-LoadoutUniformAncientJumpsuit = The legend of the Greytide. diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml index e8ec6f3d255..f712e18e24d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml @@ -1,24 +1,6 @@ - type: characterItemGroup id: LoadoutGloves items: - - type: loadout - id: LoadoutHandsColorPurple - - type: loadout - id: LoadoutHandsColorRed - - type: loadout - id: LoadoutHandsColorBlack - - type: loadout - id: LoadoutHandsColorBlue - - type: loadout - id: LoadoutHandsColorBrown - - type: loadout - id: LoadoutHandsColorGray - - type: loadout - id: LoadoutHandsColorGreen - - type: loadout - id: LoadoutHandsColorLightBrown - - type: loadout - id: LoadoutHandsColorOrange - type: loadout id: LoadoutHandsColorWhite - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml index d5ba07f5805..e6bd267b1d0 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml @@ -5,28 +5,12 @@ id: LoadoutHeadBeaverHat - type: loadout id: LoadoutHeadTophat - - type: loadout - id: LoadoutHeadFedoraBlack - - type: loadout - id: LoadoutHeadFedoraBrown - - type: loadout - id: LoadoutHeadFedoraGrey - - type: loadout - id: LoadoutHeadFedoraChoc - type: loadout id: LoadoutHeadFedoraWhite - type: loadout id: LoadoutHeadFlatBlack - type: loadout id: LoadoutHeadFlatBrown - - type: loadout - id: LoadoutHeadHatCowboyBrown - - type: loadout - id: LoadoutHeadHatCowboyBlack - - type: loadout - id: LoadoutHeadHatCowboyGrey - - type: loadout - id: LoadoutHeadHatCowboyRed - type: loadout id: LoadoutHeadHatCowboyWhite - type: loadout @@ -37,42 +21,14 @@ id: LoadoutHeadBellhop - type: loadout id: LoadoutHeadPoppy - - type: loadout - id: LoadoutHeadHatBluesoft - - type: loadout - id: LoadoutHeadHatBluesoftFlipped - type: loadout id: LoadoutHeadHatCorpsoft - type: loadout id: LoadoutHeadHatCorpsoftFlipped - - type: loadout - id: LoadoutHeadHatGreensoft - - type: loadout - id: LoadoutHeadHatGreensoftFlipped - - type: loadout - id: LoadoutHeadHatGreysoft - - type: loadout - id: LoadoutHeadHatGreysoftFlipped - type: loadout id: LoadoutHeadHatMimesoft - type: loadout id: LoadoutHeadHatMimesoftFlipped - - type: loadout - id: LoadoutHeadHatOrangesoft - - type: loadout - id: LoadoutHeadHatOrangesoftFlipped - - type: loadout - id: LoadoutHeadHatPurplesoft - - type: loadout - id: LoadoutHeadHatPurplesoftFlipped - - type: loadout - id: LoadoutHeadHatRedsoft - - type: loadout - id: LoadoutHeadHatRedsoftFlipped - - type: loadout - id: LoadoutHeadHatYellowsoft - - type: loadout - id: LoadoutHeadHatYellowsoftFlipped - type: loadout id: LoadoutHeadBandBlack - type: loadout @@ -107,16 +63,6 @@ id: LoadoutHeadBeret - type: loadout id: LoadoutHeadBeretFrench - - type: loadout - id: LoadoutHeadCowboyBrown - - type: loadout - id: LoadoutHeadCowboyBlack - - type: loadout - id: LoadoutHeadCowboyWhite - - type: loadout - id: LoadoutHeadCowboyGrey - - type: loadout - id: LoadoutHeadCowboyRed - type: loadout id: LoadoutHeadHijabColorable - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml b/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml index 66b7d32ea74..dcf9bbec8aa 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml @@ -7,66 +7,10 @@ items: - type: loadout id: LoadoutUniformAncientJumpsuit - - type: loadout - id: LoadoutUniformJumpsuitColorBlack - - type: loadout - id: LoadoutUniformJumpskirtColorBlack - - type: loadout - id: LoadoutUniformJumpsuitColorBlue - - type: loadout - id: LoadoutUniformJumpskirtColorBlue - - type: loadout - id: LoadoutUniformJumpsuitColorBrown - - type: loadout - id: LoadoutUniformJumpskirtColorBrown - - type: loadout - id: LoadoutUniformJumpsuitColorDarkBlue - - type: loadout - id: LoadoutUniformJumpskirtColorDarkBlue - - type: loadout - id: LoadoutUniformJumpsuitColorDarkGreen - - type: loadout - id: LoadoutUniformJumpskirtColorDarkGreen - - type: loadout - id: LoadoutUniformJumpsuitColorGreen - - type: loadout - id: LoadoutUniformJumpskirtColorGreen - - type: loadout - id: LoadoutUniformJumpsuitColorLightBrown - - type: loadout - id: LoadoutUniformJumpskirtColorLightBrown - - type: loadout - id: LoadoutUniformJumpsuitColorMaroon - - type: loadout - id: LoadoutUniformJumpskirtColorMaroon - - type: loadout - id: LoadoutUniformJumpsuitColorOrange - - type: loadout - id: LoadoutUniformJumpskirtColorOrange - - type: loadout - id: LoadoutUniformJumpsuitColorPink - - type: loadout - id: LoadoutUniformJumpskirtColorPink - - type: loadout - id: LoadoutUniformJumpsuitColorPurple - - type: loadout - id: LoadoutUniformJumpskirtColorPurple - - type: loadout - id: LoadoutUniformJumpsuitColorRed - - type: loadout - id: LoadoutUniformJumpskirtColorRed - - type: loadout - id: LoadoutUniformJumpsuitColorTeal - - type: loadout - id: LoadoutUniformJumpskirtColorTeal - type: loadout id: LoadoutUniformJumpsuitColorWhite - type: loadout id: LoadoutUniformJumpskirtColorWhite - - type: loadout - id: LoadoutUniformJumpsuitColorYellow - - type: loadout - id: LoadoutUniformJumpskirtColorYellow - type: loadout id: LoadoutUniformJumpsuitFlannel - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml index 2a7add033e0..ef3f40891a7 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml @@ -25,16 +25,8 @@ id: LoadoutNeckScarfStripedPurple - type: loadout id: LoadoutNeckScarfStripedZebra - - type: loadout - id: LoadoutNeckTieRed - type: loadout id: LoadoutNeckTieWhite - - type: loadout - id: LoadoutNeckTieBlack - - type: loadout - id: LoadoutNeckTieBlue - - type: loadout - id: LoadoutNeckTieGreen - type: loadout id: LoadoutItemsPrideLGBTPin - type: loadout @@ -53,29 +45,11 @@ id: LoadoutItemsPridePansexualPin - type: loadout id: LoadoutItemsPrideTransPin - - type: loadout - id: LoadoutNeckBedsheetBlack - - type: loadout - id: LoadoutNeckBedsheetBlue - - type: loadout - id: LoadoutNeckBedsheetBrown - type: loadout id: LoadoutNeckBedsheetCosmos - - type: loadout - id: LoadoutNeckBedsheetGreen - - type: loadout - id: LoadoutNeckBedsheetGrey - - type: loadout - id: LoadoutNeckBedsheetOrange - - type: loadout - id: LoadoutNeckBedsheetPurple - type: loadout id: LoadoutNeckBedsheetRainbow - - type: loadout - id: LoadoutNeckBedsheetRed - type: loadout id: LoadoutNeckBedsheetWhite - - type: loadout - id: LoadoutNeckBedsheetYellow - type: loadout id: LoadoutNeckBedsheetNT diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml index e3b71e7977e..ea56881c555 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml @@ -1,24 +1,8 @@ - type: characterItemGroup id: LoadoutShoes items: - - type: loadout - id: LoadoutShoesBlack - - type: loadout - id: LoadoutShoesBlue - - type: loadout - id: LoadoutShoesBrown - - type: loadout - id: LoadoutShoesGreen - - type: loadout - id: LoadoutShoesOrange - - type: loadout - id: LoadoutShoesPurple - - type: loadout - id: LoadoutShoesRed - type: loadout id: LoadoutShoesWhite - - type: loadout - id: LoadoutShoesYellow - type: loadout id: LoadoutShoesGeta - type: loadout @@ -29,10 +13,6 @@ id: LoadoutShoesBootsLaceup - type: loadout id: LoadoutShoesBootsWinter - - type: loadout - id: LoadoutShoesBootsCowboyBrown - - type: loadout - id: LoadoutShoesBootsCowboyBlack - type: loadout id: LoadoutShoesBootsCowboyWhite - type: loadout diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index 163d9937f2e..60a175e7de4 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -167,7 +167,7 @@ - type: entity parent: ClothingHeadHeadHatBaseFlippable id: ClothingHeadHatMimesoft - name: mime cap + name: baseball cap description: "It's a baseball hat in a tasteless white colour." components: - type: Sprite @@ -178,7 +178,7 @@ - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatMimesoft] id: ClothingHeadHatMimesoftFlipped - name: mime cap + name: baseball cap - type: entity parent: ClothingHeadHeadHatBaseFlippable diff --git a/Resources/Prototypes/Loadouts/Generic/hands.yml b/Resources/Prototypes/Loadouts/Generic/hands.yml index 524a6de9183..830dcd7beee 100644 --- a/Resources/Prototypes/Loadouts/Generic/hands.yml +++ b/Resources/Prototypes/Loadouts/Generic/hands.yml @@ -1,102 +1,3 @@ -- type: loadout - id: LoadoutHandsColorPurple - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorRed - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorBlack - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorBlue - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorBrown - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorGray - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorGray - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorGreen - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorLightBrown - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorLightBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorOrange - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - - type: loadout id: LoadoutHandsColorWhite category: Hands diff --git a/Resources/Prototypes/Loadouts/Generic/head.yml b/Resources/Prototypes/Loadouts/Generic/head.yml index b8d3c8c7ac4..c48ad846e1d 100644 --- a/Resources/Prototypes/Loadouts/Generic/head.yml +++ b/Resources/Prototypes/Loadouts/Generic/head.yml @@ -25,58 +25,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadFedoraBlack - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadFedoraBrown - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadFedoraGrey - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadFedoraChoc - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraChoc - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadFedoraWhite category: Head @@ -115,50 +63,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadHatCowboyBrown - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatCowboyBlack - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatCowboyGrey - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatCowboyRed - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadHatCowboyWhite category: Head @@ -219,36 +123,6 @@ group: LoadoutHead # Color Hats -- type: loadout - id: LoadoutHeadHatBluesoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatBluesoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatBluesoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatBluesoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadHatCorpsoft category: Head @@ -271,58 +145,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadHatGreensoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreensoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatGreensoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreensoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatGreysoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreysoft - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatGreysoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreysoftFlipped - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadHatMimesoft category: Head @@ -347,118 +169,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadHatOrangesoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatOrangesoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatOrangesoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatOrangesoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatPurplesoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatPurplesoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatPurplesoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatPurplesoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatRedsoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatRedsoft - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatRedsoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatRedsoftFlipped - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatYellowsoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatYellowsoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatYellowsoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatYellowsoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - # Headbands - type: loadout id: LoadoutHeadBandBlack @@ -686,67 +396,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -# Cowboy hats -- type: loadout - id: LoadoutHeadCowboyBrown - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyBlack - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyWhite - category: Head - cost: 1 - exclusive: true - customColorTint: true - items: - - ClothingHeadHatCowboyWhite - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyGrey - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyRed - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadHijabColorable category: Head diff --git a/Resources/Prototypes/Loadouts/Generic/neck.yml b/Resources/Prototypes/Loadouts/Generic/neck.yml index 30f65770b12..c18c33984fb 100644 --- a/Resources/Prototypes/Loadouts/Generic/neck.yml +++ b/Resources/Prototypes/Loadouts/Generic/neck.yml @@ -147,18 +147,6 @@ group: LoadoutNeck # Ties -- type: loadout - id: LoadoutNeckTieRed - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - type: loadout id: LoadoutNeckTieWhite category: Neck @@ -172,42 +160,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutNeck -- type: loadout - id: LoadoutNeckTieBlack - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutNeckTieBlue - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutNeckTieGreen - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - #Pride Accessories - type: loadout id: LoadoutItemsPrideLGBTPin @@ -309,60 +261,6 @@ group: LoadoutNeck # Bedsheets -- type: loadout - id: LoadoutNeckBedsheetBlack - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetBlue - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetBrown - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - - type: loadout id: LoadoutNeckBedsheetCosmos category: Neck @@ -382,80 +280,6 @@ departments: - Command -- type: loadout - id: LoadoutNeckBedsheetGreen - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetGrey - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetOrange - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Logistics - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - -- type: loadout - id: LoadoutNeckBedsheetPurple - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Epistemics - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - - type: loadout id: LoadoutNeckBedsheetRainbow category: Neck @@ -474,25 +298,6 @@ departments: - Command -- type: loadout - id: LoadoutNeckBedsheetRed - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - - type: loadout id: LoadoutNeckBedsheetWhite category: Neck @@ -512,25 +317,6 @@ departments: - Command -- type: loadout - id: LoadoutNeckBedsheetYellow - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetYellow - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Engineering - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - - type: loadout id: LoadoutNeckBedsheetNT category: Neck diff --git a/Resources/Prototypes/Loadouts/Generic/shoes.yml b/Resources/Prototypes/Loadouts/Generic/shoes.yml index 08f22753250..fb8487981bd 100644 --- a/Resources/Prototypes/Loadouts/Generic/shoes.yml +++ b/Resources/Prototypes/Loadouts/Generic/shoes.yml @@ -1,81 +1,4 @@ # Colored -- type: loadout - id: LoadoutShoesBlack - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorBlack - -- type: loadout - id: LoadoutShoesBlue - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorBlue - -- type: loadout - id: LoadoutShoesBrown - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorBrown - -- type: loadout - id: LoadoutShoesGreen - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorGreen - -- type: loadout - id: LoadoutShoesOrange - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorOrange - -- type: loadout - id: LoadoutShoesPurple - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorPurple - -- type: loadout - id: LoadoutShoesRed - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorRed - - type: loadout id: LoadoutShoesWhite category: Shoes @@ -88,17 +11,6 @@ items: - ClothingShoesColorWhite -- type: loadout - id: LoadoutShoesYellow - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorYellow - - type: loadout id: LoadoutShoesGeta category: Shoes @@ -166,30 +78,6 @@ items: - ClothingShoesBootsWinter -- type: loadout - id: LoadoutShoesBootsCowboyBrown - category: Shoes - cost: 1 - exclusive: true - canBeHeirloom: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesBootsCowboyBrown - -- type: loadout - id: LoadoutShoesBootsCowboyBlack - category: Shoes - cost: 1 - exclusive: true - canBeHeirloom: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesBootsCowboyBlack - - type: loadout id: LoadoutShoesBootsCowboyWhite category: Shoes diff --git a/Resources/Prototypes/Loadouts/Generic/uniform.yml b/Resources/Prototypes/Loadouts/Generic/uniform.yml index da16bcc10e5..960f70b54c0 100644 --- a/Resources/Prototypes/Loadouts/Generic/uniform.yml +++ b/Resources/Prototypes/Loadouts/Generic/uniform.yml @@ -16,229 +16,6 @@ # Colored jumpsuits # Someone please alphabetically order these... - -- type: loadout - id: LoadoutUniformJumpsuitColorBlack - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorBlack - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Medical - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Medical - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorOrange - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorOrange - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorPink - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorPink - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorPink - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorPink - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorRed - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorRed - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - - type: loadout id: LoadoutUniformJumpsuitColorWhite category: Uniform @@ -281,298 +58,6 @@ departments: - Command -- type: loadout - id: LoadoutUniformJumpsuitColorYellow - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorYellow - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Engineering - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorYellow - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorYellow - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Engineering - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorDarkBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorDarkBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorDarkBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorDarkBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorTeal - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorTeal - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorTeal - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorTeal - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorPurple - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Epistemics - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorPurple - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Epistemics - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorDarkGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorDarkGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorDarkGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorDarkGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorLightBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorLightBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorLightBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorLightBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorMaroon - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorMaroon - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorMaroon - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorMaroon - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - - type: loadout id: LoadoutUniformJumpsuitFlannel category: Uniform From 0500f1fbb66726e32e74256575aa3fab90eab0e2 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 21 Dec 2024 12:43:53 -0500 Subject: [PATCH 2/2] Add colorable notes to salvage gear --- .../loadouts/jobs/logistics/salvageSpecialist.ftl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl diff --git a/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl b/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl new file mode 100644 index 00000000000..973c2f23711 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl @@ -0,0 +1,14 @@ +loadout-name-LoadoutSalvageBackpackBackpack = salvage backpack (colorable) +loadout-name-LoadoutSalvageBackpackSatchel = salvage satchel (colorable) +loadout-name-LoadoutSalvageBackpackDuffel = salvage duffelbag (colorable) +loadout-name-LoadoutSalvageBeltMilitaryWebbing = military webbing (colorable) +loadout-name-LoadoutSalvageWeaponsCombatKnife = combat knife (colorable) +loadout-name-LoadoutSalvageWeaponsKitchenKnife = kitchen knife (colorable) +loadout-name-LoadoutSalvageWeaponsSurvivalKnife = survival knife (colorable) +loadout-name-LoadoutSalvageWeaponsKukriKnife = kukri (colorable) +loadout-name-LoadoutSalvageWeaponsCleaver = cleaver (colorable) +loadout-name-LoadoutSalvageWeaponsThrowingKnife = throwing knives (x3, colorable) +loadout-name-LoadoutSalvageWeaponsMachete = machete (colorable) +loadout-name-LoadoutSalvageWeaponsCutlass = cutlass (colorable) +loadout-name-LoadoutSalvageWeaponsKatana = katana (colorable) +loadout-name-LoadoutSalvageWeaponsWakizashi = wakizashi (colorable)