diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml similarity index 86% rename from Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/backpack.yml rename to Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index d117ed5ae2..7ee0b64107 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -7,6 +7,18 @@ contents: - id: BoxSurvival +#This should be temporary, at least until briefcases can spawn in hands. + +- type: entity + abstract: true + parent: ClothingBackpack + id: ClothingBackpackBriefcaseFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: BriefcaseBrownFilled + - type: entity abstract: true parent: ClothingBackpackClown diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml rename to Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml rename to Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml new file mode 100644 index 0000000000..9c14dcf779 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -0,0 +1,10 @@ +- type: entity + id: BriefcaseBrownFilled + name: brown briefcase + parent: BriefcaseBrown + suffix: Filled + components: + - type: StorageFill + contents: + - id: Paper + amount: 3 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 4e7d0fb571..cfd1875a0a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -60,10 +60,15 @@ - id: BoxLightMixed amount: 1 -#- type: entity -# id: LockerLegalFilled -# suffix: Filled -# parent: LockerLegal +- type: entity + id: ClosetLegalFilled + suffix: Filled + parent: ClosetLegal + components: + - type: StorageFill + contents: + - id: BriefcaseBrownFilled + prob: 0.75 - type: entity id: LockerBotanistFilled diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml new file mode 100644 index 0000000000..67c9557dbd --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml @@ -0,0 +1,24 @@ +- type: entity + parent: BaseItem + abstract: true + id: BriefcaseBase + description: Useful for carrying items in your hands. + components: + - type: Item + size: 60 + - type: Storage + capacity: 60 + storageSoundCollection: + collection: storageRustle + +- type: entity + name: brown briefcase + parent: BriefcaseBase + id: BriefcaseBrown + 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 \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index b419b1d24b..43e3b7ccfd 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -14,7 +14,7 @@ id: LawyerGear equipment: jumpsuit: ClothingUniformJumpsuitLawyerBlack #TODO change jumpsuit to randomiser of the 4 variants - back: ClothingBackpackFilled + back: ClothingBackpackBriefcaseFilled shoes: ClothingShoesColorBlack id: LawyerPDA ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index b96435770e..495f49cee7 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -14,7 +14,7 @@ id: LibrarianGear equipment: jumpsuit: ClothingUniformJumpsuitLibrarian - back: ClothingBackpackFilled + back: ClothingBackpackBriefcaseFilled shoes: ClothingShoesColorBlack id: LibrarianPDA ears: ClothingHeadsetService diff --git a/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png new file mode 100644 index 0000000000..b88da92047 Binary files /dev/null and b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/inhand-left.png b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/inhand-left.png new file mode 100644 index 0000000000..a0e4db7f53 Binary files /dev/null and b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/inhand-right.png b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/inhand-right.png new file mode 100644 index 0000000000..c56c1d62fd Binary files /dev/null and b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json new file mode 100644 index 0000000000..aabb510bd0 --- /dev/null +++ b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +}