Add clipboards (#20717)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 6a2d569bf46e3a58b8ecc003b0d7e0696722208a..4493ec6190ebca306db698b8e5941c833b07f593 100644 (file)
--- 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 c5d3ed554caed68d8d7338f00082fe8f3e578b14..3341c94269c0ceeb848149918f279de896fe0a41 100644 (file)
--- 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 eda1b25f927f63542089c1439f93ad211076b88d..2768452e3b45f1d118f691c1d905a387df565c7d 100644 (file)
--- 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 4290cdbcfe6e0ce300dcdca1a56a746b390d583a..523f7bc42b20d86704c07304bb0d5cb31804e0ac 100644 (file)
--- 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 (file)
index 0000000..d58b42b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_paper.png differ

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard_pen.png b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_pen.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard_pen.png
rename to Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_pen.png

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard-equipped-BELT.png b/Resources/Textures/Objects/Misc/clipboard.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard-equipped-BELT.png
rename to Resources/Textures/Objects/Misc/clipboard.rsi/equipped-BELT.png

diff --git a/Resources/Textures/Objects/Misc/clipboard.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/clipboard.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..37717d2
Binary files /dev/null and b/Resources/Textures/Objects/Misc/clipboard.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Misc/clipboard.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/clipboard.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..8cfde4d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/clipboard.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Misc/clipboard.rsi/meta.json b/Resources/Textures/Objects/Misc/clipboard.rsi/meta.json
new file mode 100644 (file)
index 0000000..2b2ad37
--- /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
+    }
+  ]
+}