Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527)

* Add briefcase to curadrobe and some briefcases cleanup

* also add to lawdrobe

diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
index 6be5ae0d3023c74a614615897a376794c7f7d0db..58a49aa6e95719a8b1e8130cf912b0af6e9766f9 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: BriefcaseBrownFilled
-  name: brown briefcase
   parent: BriefcaseBrown
   suffix: Filled, Paper
   components:
@@ -11,9 +10,8 @@
 
 - type: entity
   id: BriefcaseSyndieSniperBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
-  suffix: SniperBundle
+  suffix: Syndicate, Sniper Bundle
   components:
   - type: Item
     size: Ginormous
@@ -32,7 +30,6 @@
 
 - type: entity
   id: BriefcaseSyndieLobbyingBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
   suffix: Syndicate, Spesos
   components:
@@ -52,7 +49,6 @@
 
 - type: entity
   id: BriefcaseThiefBribingBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
   suffix: Thief, Spesos
   components:

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
index 07e957a5e0e2a6356012c18ac3d1017ed6ee516f..aac1cbb3f496501fb37e392c976c965e6f8831fe 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
@@ -2,6 +2,7 @@
   id: CuraDrobeInventory
   startingInventory:
     BooksBag: 2
+    BriefcaseBrown: 2
     HandLabeler: 2
     ClothingEyesGlasses: 2
     ClothingEyesGlassesJamjar: 2
@@ -12,4 +13,4 @@
     ClothingUniformJumpskirtLibrarian: 3
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
-    
+

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index b1478a7cfc45294f7ad1db6b48b4d96fae8c677a..28f63e44e2034f16947c568f0b6187b802678123 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -14,6 +14,7 @@
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
     ClothingNeckLawyerbadge: 2
+    BriefcaseBrown: 2
     LuxuryPen: 2
   contrabandInventory:
     ClothingOuterRobesJudge: 1

diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
index aa8823d70d864105748e4c02ef2882bb1908ed5f..762204701cb6e3e4592b06b27fc59a32792e13e4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
@@ -1,8 +1,8 @@
 - type: entity
   parent: BaseStorageItem
-  abstract: true
   id: BriefcaseBase
   description: Useful for carrying items in your hands.
+  abstract: true
   components:
   - type: Item
     size: Ginormous
@@ -14,10 +14,9 @@
     - Briefcase
 
 - type: entity
-  name: brown briefcase
   parent: BriefcaseBase
   id: BriefcaseBrown
-  description: A handy briefcase.
+  name: brown briefcase
   components:
   - type: Sprite
     sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
@@ -26,23 +25,9 @@
     sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
 
 - type: entity
-  parent: BriefcaseBase
-  abstract: true
-  id: BriefcaseSyndieBase
+  parent: BriefcaseBrown
+  id: BriefcaseSyndie
   suffix: Syndicate, Empty
-  description: Useful for carrying items in your hands.
   components:
   - type: Item
     size: Huge
-
-- type: entity
-  name: brown briefcase
-  parent: BriefcaseSyndieBase
-  id: BriefcaseSyndie
-  description: A handy briefcase.
-  components:
-  - type: Sprite
-    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi

diff --git a/Resources/migration.yml b/Resources/migration.yml
index f5306c8b7c1f4886f3b05ecd42a804e424054dde..eadb76305c74bc627fd513266e8883a8799ad4a4 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -261,3 +261,4 @@ ClothingOuterArmorScaf: ClothingOuterArmorBasic
 # 2024-03-31
 ClothingNeckFlowerWreath: ClothingHeadHatFlowerWreath
 ClothingHeadHatFlowerCrown: ClothingHeadHatFlowerWreath
+BriefcaseSyndieBase: null