From f80f3223571bfd6cacbb2b22b63902508c4184cb Mon Sep 17 00:00:00 2001 From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Wed, 8 Oct 2025 11:37:34 -0400 Subject: [PATCH] Added folders and clipboards to trinkets tab (#39920) * Added folders to trinkets tab * Fixed loadout grouping * Added plastic clipboards to trinkets * Whoops, forgot to create BoxFolderPlasticClipboardThreePapers prototype * Added regular clipboards as trinkets (1 hour of command required) * Reduced folder bloat --- .../Entities/Objects/Misc/folders.yml | 52 ++++++++++++++++++- .../Loadouts/Miscellaneous/trinkets.yml | 25 +++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 3 ++ 3 files changed, 78 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/Entities/Objects/Misc/folders.yml index 632a27324a..9991709bcf 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml @@ -83,7 +83,7 @@ - type: entity abstract: true - id: BoxFolderFillThreePapers # Like BoxFolderFill, but always has exactly three sheets of standard paper; use for roles' startingGear + id: BoxFolderFillThreePapers # Like BoxFolderFill, but always has exactly three sheets of standard paper; use for things that should always be consistent, e.g roundstart items suffix: 3 papers components: - type: StorageFill @@ -95,6 +95,10 @@ parent: [BoxFolderBaseEmpty, BoxFolderFill] id: BoxFolderBase +- type: entity + parent: [BoxFolderBaseEmpty, BoxFolderFillThreePapers] + id: BoxFolderBaseThreePapers + - type: entity parent: BoxFolderBaseEmpty id: BoxFolderRedEmpty @@ -111,6 +115,11 @@ id: BoxFolderRed suffix: Red, Filled +- type: entity + parent: [BoxFolderRedEmpty, BoxFolderFillThreePapers] + id: BoxFolderRedThreePapers + suffix: Red, 3 papers + - type: entity parent: BoxFolderBaseEmpty id: BoxFolderBlueEmpty @@ -127,6 +136,11 @@ id: BoxFolderBlue suffix: Blue, Filled +- type: entity + parent: [BoxFolderBlueEmpty, BoxFolderFillThreePapers] + id: BoxFolderBlueThreePapers + suffix: Blue, 3 papers + - type: entity parent: BoxFolderBaseEmpty id: BoxFolderYellowEmpty @@ -143,6 +157,11 @@ id: BoxFolderYellow suffix: Yellow, Filled +- type: entity + parent: [BoxFolderYellowEmpty, BoxFolderFillThreePapers] + id: BoxFolderYellowThreePapers + suffix: Yellow, 3 papers + - type: entity parent: BoxFolderBaseEmpty id: BoxFolderGreyEmpty @@ -159,6 +178,11 @@ id: BoxFolderGrey suffix: Grey, Filled +- type: entity + parent: [BoxFolderGreyEmpty, BoxFolderFillThreePapers] + id: BoxFolderGreyThreePapers + suffix: Grey, 3 papers + - type: entity parent: BoxFolderBaseEmpty id: BoxFolderBlackEmpty @@ -175,6 +199,11 @@ id: BoxFolderBlack suffix: Black, Filled +- type: entity + parent: [BoxFolderBlackEmpty, BoxFolderFillThreePapers] + id: BoxFolderBlackThreePapers + suffix: Black, 3 papers + - type: entity parent: BoxFolderBaseEmpty id: BoxFolderGreenEmpty @@ -191,6 +220,11 @@ id: BoxFolderGreen suffix: Green, Filled +- type: entity + parent: [BoxFolderGreenEmpty, BoxFolderFillThreePapers] + id: BoxFolderGreenThreePapers + suffix: Green, 3 papers + - type: entity parent: BoxFolderBaseEmpty id: BoxFolderWhiteEmpty @@ -206,6 +240,11 @@ id: BoxFolderWhite suffix: White, Filled +- type: entity + parent: [BoxFolderWhiteEmpty, BoxFolderFillThreePapers] + id: BoxFolderWhiteThreePapers + suffix: White, 3 papers + - type: entity parent: BoxFolderBaseEmpty id: BoxFolderCentComEmpty @@ -221,7 +260,12 @@ - type: entity parent: [BoxFolderCentComEmpty, BoxFolderFill] id: BoxFolderCentCom - suffix: DO NOT MAP, Filled + suffix: DO NOT MAP; Filled + +- type: entity + parent: [BoxFolderCentComEmpty, BoxFolderFillThreePapers] + id: BoxFolderCentComThreePapers + suffix: DO NOT MAP; 3 papers - type: entity parent: BoxFolderBaseEmpty @@ -316,6 +360,10 @@ parent: [BoxFolderPlasticClipboardEmpty, BoxFolderFill] id: BoxFolderPlasticClipboard +- type: entity + parent: [BoxFolderPlasticClipboardEmpty, BoxFolderFillThreePapers] + id: BoxFolderPlasticClipboardThreePapers + - type: entity parent: BoxFolderClipboardEmpty id: BoxFolderCentComClipboardEmpty diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index ad58f9c58d..9b502bd7d1 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -106,6 +106,31 @@ - CigarGold groupBy: "smokeables" +# Folders +- type: loadout + id: BoxFolderBaseThreePapers + storage: + back: + - BoxFolderBaseThreePapers + groupBy: "folders" + +- type: loadout + id: BoxFolderPlasticClipboardThreePapers + storage: + back: + - BoxFolderPlasticClipboardThreePapers + groupBy: "folders" + +- type: loadout + id: BoxFolderClipboardThreePapers + effects: + - !type:GroupLoadoutEffect + proto: Command + storage: + back: + - BoxFolderClipboardThreePapers + groupBy: "folders" + # Pins - type: loadout id: ClothingNeckLGBTPin diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 59e57739ce..6cd5b60fba 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -18,6 +18,9 @@ - CigPackBlack - CigarCase - CigarGold + - BoxFolderBaseThreePapers + - BoxFolderPlasticClipboardThreePapers + - BoxFolderClipboardThreePapers - ClothingNeckLGBTPin - ClothingNeckAllyPin - ClothingNeckAromanticPin -- 2.51.2