From ef44986235b3d3d300ea456f58c48a89d21aa1d7 Mon Sep 17 00:00:00 2001 From: nmajask Date: Wed, 4 Oct 2023 18:28:28 -0400 Subject: [PATCH] Add clipboards (#20717) --- .../Entities/Objects/Misc/paper.yml | 57 ++++++++++++++++++ .../Roles/Jobs/Cargo/quartermaster.yml | 1 + .../Roles/Jobs/Command/head_of_personnel.yml | 1 + .../Objects/Misc/bureaucracy.rsi/meta.json | 13 ---- .../clipboard.png | Bin .../clipboard_over.png | Bin .../Misc/clipboard.rsi/clipboard_paper.png | Bin 0 -> 166 bytes .../clipboard_pen.png | Bin .../equipped-BELT.png} | Bin .../Misc/clipboard.rsi/inhand-left.png | Bin 0 -> 337 bytes .../Misc/clipboard.rsi/inhand-right.png | Bin 0 -> 340 bytes .../Objects/Misc/clipboard.rsi/meta.json | 35 +++++++++++ 12 files changed, 94 insertions(+), 13 deletions(-) rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => clipboard.rsi}/clipboard.png (100%) rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => clipboard.rsi}/clipboard_over.png (100%) create mode 100644 Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_paper.png rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => clipboard.rsi}/clipboard_pen.png (100%) rename Resources/Textures/Objects/Misc/{bureaucracy.rsi/clipboard-equipped-BELT.png => clipboard.rsi/equipped-BELT.png} (100%) create mode 100644 Resources/Textures/Objects/Misc/clipboard.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/clipboard.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/clipboard.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 6a2d569bf4..4493ec6190 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -435,6 +435,63 @@ color: "#3f3f3f" - state: folder-base +- type: entity + id: BoxFolderClipboard + parent: BoxFolderBase + name: clipboard + description: The weapon of choice for those on the front lines of bureaucracy. + components: + - type: Sprite + sprite: Objects/Misc/clipboard.rsi + layers: + - state: clipboard + - state: clipboard_paper + map: ["clipboard_paper"] + visible: false + - state: clipboard_pen + map: ["clipboard_pen"] + visible: false + - state: clipboard_over + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + pen_slot: !type:ContainerSlot {} + - type: ItemSlots + slots: + pen_slot: + name: Pen + whitelist: + tags: + - Write + insertOnInteract: false + - type: Item + sprite: Objects/Misc/clipboard.rsi + size: 10 + - type: Clothing + slots: [belt] + quickEquip: false + sprite: Objects/Misc/clipboard.rsi + - type: Storage + capacity: 20 + whitelist: + tags: + - Document + - type: ItemMapper + mapLayers: + clipboard_paper: + whitelist: + tags: + - Document + clipboard_pen: + whitelist: + tags: + - Write + - type: MeleeWeapon + damage: + types: + Blunt: 6 + # Stamps - type: entity name: generic rubber stamp diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index c5d3ed554c..3341c94269 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -37,6 +37,7 @@ shoes: ClothingShoesColorBrown id: QuartermasterPDA ears: ClothingHeadsetQM + belt: BoxFolderClipboard pocket1: AppraisalTool innerclothingskirt: ClothingUniformJumpskirtQM satchel: ClothingBackpackSatchelQuartermasterFilled diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index eda1b25f92..2768452e3b 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -57,6 +57,7 @@ head: ClothingHeadHatHopcap id: HoPPDA ears: ClothingHeadsetAltCommand + belt: BoxFolderClipboard innerclothingskirt: ClothingUniformJumpskirtHoP satchel: ClothingBackpackSatchelHOPFilled duffelbag: ClothingBackpackDuffelHOPFilled diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 4290cdbcfe..523f7bc42b 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -7,15 +7,6 @@ "y": 32 }, "states": [ - { - "name": "clipboard" - }, - { - "name": "clipboard_over" - }, - { - "name": "clipboard_pen" - }, { "name": "envelope_closed" }, @@ -298,10 +289,6 @@ }, { "name": "stamp-warden" - }, - { - "name": "clipboard-equipped-BELT", - "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard.png b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard.png rename to Resources/Textures/Objects/Misc/clipboard.rsi/clipboard.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard_over.png b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_over.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard_over.png rename to Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_over.png diff --git a/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_paper.png b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_paper.png new file mode 100644 index 0000000000000000000000000000000000000000..d58b42b709d9eede7a4e3013d7321b8f5b35f5a7 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}37#&FArY-_ zryS&LFc4q~-^dZ1@+Y44=WL~9@mq~|oE%zazL!0`Cya^V#|+iq5`x>6^VTlCGh5j< z%lGfxz02o@HK@E@y64_{L!JAt*v_;uFmWgxh;u4`xs1(1nxEl=wA`*pzDe%&N^gL6 OF?hQAxvXhM|$DJr)r?W+SDpN?J zjnvF1vqTO&`ux6X-pOe}`Uk4SuP42Kp0$~E%?j}Z%dftCt4%y#6?54AHr@3kSIqhB z2`6vmCnX)GN&EJJ+z$aC4*OL7tSr8g<+tKa&EELOcencPI{f_K8KrN>HdihwPoEOP zJt3CWae?ITph~%ilW($2{q|$~PM*{iq6)r~-pp90q$K1zam&`G-j$*WrXRb0YsJlL e0gcQQHnPI&NuG-dT4HXeI;0hw`jRZkzY*RK0uuP3rmZ$kdFs*_~OxSnc2@W;IB}-o{qJYrCZz6v^!TGi_#q*ob1o@|3{29q&)$qG<$5A~l}p38=7LSm i*`htVxit(7br)oN*SiIMtToyMvd7ca&t;ucLK6VfqmY^a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/clipboard.rsi/meta.json b/Resources/Textures/Objects/Misc/clipboard.rsi/meta.json new file mode 100644 index 0000000000..2b2ad37581 --- /dev/null +++ b/Resources/Textures/Objects/Misc/clipboard.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Inhand sprites by nmajask (Github) for SS14. clipboard_paper is a modified version of paper from bureaucracy.rsi.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "clipboard" + }, + { + "name": "clipboard_over" + }, + { + "name": "clipboard_paper" + }, + { + "name": "clipboard_pen" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2