Skip to content

Commit

Permalink
Loadouts Debloating (Colorable Items) (Simple-Station#1364)
Browse files Browse the repository at this point in the history
# Description

This PR cuts down significantly on Loadouts bloat by removing all
specific color versions of colorable items from the loadouts. I left the
original items untouched for compatibility reasons since certain things
in the game still need to be able to spawn a "Blue jumpsuit" etc.

Additionally, to help aid in clarity for players, I've added
localizations for all the generic colorable items so that they have
(colorable) in the loadout names, so that players can tell which items
have the option without needing to click into the customize button on
every item.

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/7ab30002-c7d4-4eeb-b018-45a9fda80ae6)

</p>
</details>

# Changelog

:cl:
- add: Added labels to all generic colorable items in loadouts, so that
players can see which items have custom colors as customization options.
- remove: Removed all 'specific color' variants of colorable items from
Loadouts, such as "Blue Jumpsuit" when a colorable jumpsuit exists.
  • Loading branch information
VMSolidus authored Dec 21, 2024
1 parent 48413d6 commit 452b911
Show file tree
Hide file tree
Showing 28 changed files with 80 additions and 1,475 deletions.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/loadouts/generic/back.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
loadout-name-LoadoutBackpack = grey backpack (colorable)
loadout-name-LoadoutBackpackDuffel = grey duffelbag (colorable)
loadout-name-LoadoutBackpackSatchel = grey satchel (colorable)
Original file line number Diff line number Diff line change
Expand Up @@ -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)
1 change: 1 addition & 0 deletions Resources/Locale/en-US/loadouts/generic/hands.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loadout-name-LoadoutHandsColorWhite = gloves (colorable)
12 changes: 12 additions & 0 deletions Resources/Locale/en-US/loadouts/generic/head.ftl
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/loadouts/generic/neck.ftl
Original file line number Diff line number Diff line change
@@ -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)
11 changes: 11 additions & 0 deletions Resources/Locale/en-US/loadouts/generic/outerClothing.ftl
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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)
12 changes: 12 additions & 0 deletions Resources/Locale/en-US/loadouts/generic/uniform.ftl
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 0 additions & 2 deletions Resources/Locale/en-US/loadouts/head.ftl

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loadout-name-LoadoutEngineeringHeadHardhatWhite = hardhat (colorable)
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
@@ -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)
Empty file.
5 changes: 0 additions & 5 deletions Resources/Locale/en-US/loadouts/outerClothing.ftl

This file was deleted.

1 change: 0 additions & 1 deletion Resources/Locale/en-US/loadouts/uniform.ftl

This file was deleted.

18 changes: 0 additions & 18 deletions Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
54 changes: 0 additions & 54 deletions Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
56 changes: 0 additions & 56 deletions Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 0 additions & 26 deletions Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
20 changes: 0 additions & 20 deletions Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -29,10 +13,6 @@
id: LoadoutShoesBootsLaceup
- type: loadout
id: LoadoutShoesBootsWinter
- type: loadout
id: LoadoutShoesBootsCowboyBrown
- type: loadout
id: LoadoutShoesBootsCowboyBlack
- type: loadout
id: LoadoutShoesBootsCowboyWhite
- type: loadout
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/soft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -178,7 +178,7 @@
- type: entity
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatMimesoft]
id: ClothingHeadHatMimesoftFlipped
name: mime cap
name: baseball cap

- type: entity
parent: ClothingHeadHeadHatBaseFlippable
Expand Down
Loading

0 comments on commit 452b911

Please sign in to comment.