From 5e1477c91aaa942cefb3c50680b940abdb4d0d16 Mon Sep 17 00:00:00 2001 From: Zymem <97173622+Zymem@users.noreply.github.com> Date: Mon, 17 Jan 2022 16:21:28 -0300 Subject: [PATCH] Adds briefcase (#6196) Co-authored-by: mirrorcult --- .../backpack.yml | 12 +++++++++ .../duffelbag.yml | 0 .../{Starter Gear => StarterGear}/satchel.yml | 0 .../Catalog/Fills/Items/briefcases.yml | 10 ++++++++ .../Catalog/Fills/Lockers/service.yml | 13 +++++++--- .../Entities/Objects/Misc/briefcases.yml | 24 ++++++++++++++++++ .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 2 +- .../Roles/Jobs/Civilian/librarian.yml | 2 +- .../Briefcases/briefcase_brown.rsi/icon.png | Bin 0 -> 291 bytes .../briefcase_brown.rsi/inhand-left.png | Bin 0 -> 489 bytes .../briefcase_brown.rsi/inhand-right.png | Bin 0 -> 459 bytes .../Briefcases/briefcase_brown.rsi/meta.json | 22 ++++++++++++++++ 12 files changed, 79 insertions(+), 6 deletions(-) rename Resources/Prototypes/Catalog/Fills/Backpacks/{Starter Gear => StarterGear}/backpack.yml (86%) rename Resources/Prototypes/Catalog/Fills/Backpacks/{Starter Gear => StarterGear}/duffelbag.yml (100%) rename Resources/Prototypes/Catalog/Fills/Backpacks/{Starter Gear => StarterGear}/satchel.yml (100%) create mode 100644 Resources/Prototypes/Catalog/Fills/Items/briefcases.yml create mode 100644 Resources/Prototypes/Entities/Objects/Misc/briefcases.yml create mode 100644 Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png create mode 100644 Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json 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 0000000000000000000000000000000000000000..b88da920474240651c98523c37cc7d6e04ed4738 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}w>@1PLn7Rh zQzQ}&SRD9f++&qs!s6x(Bu;QKvWNEl-@&zkd3*hY6gAH-$7xME;?I+hMK1ezpA2)N|8wRro?x8xXU4)0e;&v0 zu<@}yVfe$THG}<2iHE_IkUa{!-Z_Q&Ph{@cHnG7e=AwfE%atRMnq`OAPTyas=Cerl z!^hwDlVlH_Kgn{MP&zTS~g~MIeV3RXL*iV7kH%_cnYf1fCWEJ|pUXO@geC?C0AgxzF#rGn literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a0e4db7f5396d8479a6483b57ce9f25c586367ec GIT binary patch literal 489 zcmVPx$p-DtRRCr$Pn!#S?a&!fufm}JHi*!IybU+t56*YYm=Z84h9(ctgDZ~l0ZX7kMWCpW(Si~yJb;{@0O#sk2YAX|VfV4MJ3z<2<- z3$O*)0>%lj1&jxPyTD*A@b>aheH?z0^-(%qNl!ND6Bg5Q9R&cTv4K~w@ljA{D~0cfij f+OPQp`~xSO(?K>af2jZf002ovPDHLkV1fVuWt7VR literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c56c1d62fdf1185963c5cbc233bea4d1f8e9c452 GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zTRdGHLn`9l z&N|C^$U&f0*fqe#b{SLdfz|B0H!yc^V&47X!Bw^`O){Y_jwYK9Iekd4Kf+mg=63QX zp8S24#??1`g`aAN&Z~D~C}}8S%3*xU_CO$odjsnf;RJ3Ca|VCLZ4A*4mWQrD&zZvQFDt|fukAM5KxY-iqy=uJHojNZ3?N{|iyM3AS{i|Hph%s?&T>bX1 z literal 0 HcmV?d00001 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" + } + ] +}