From 3f42835811a0037371c2b0ec502709eb7f7d8480 Mon Sep 17 00:00:00 2001
From: nmajask <nmajask@gmail.com>
Date: Wed, 4 Oct 2023 23:24:29 -0400
Subject: [PATCH] Adds clipboards to bureaucracy crate and replaces incorrectly
 credited sprites (#20736)

* Adds clipboards to the bureaucracy crate

* Ports current sprites from TG to fix the credits
---
 .../Prototypes/Catalog/Fills/Crates/service.yml |   2 ++
 .../Objects/Misc/clipboard.rsi/clipboard.png    | Bin 144 -> 167 bytes
 .../Misc/clipboard.rsi/clipboard_over.png       | Bin 126 -> 141 bytes
 .../Misc/clipboard.rsi/clipboard_pen.png        | Bin 141 -> 148 bytes
 .../Objects/Misc/clipboard.rsi/meta.json        |   2 +-
 5 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 106a34976f..2b7c5db0f7 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -100,6 +100,8 @@
       amount: 15
     - id: Pen
       amount: 2
+    - id: BoxFolderClipboard
+      amount: 2  
     - id: HandLabeler
     - id: BoxFolderBlue
     - id: BoxFolderRed
diff --git a/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard.png b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard.png
index 4439ea097fed62eb2dd513d79fed891551e666ed..8007668d9354f93b095cdc929aca93a7f739fccb 100644
GIT binary patch
delta 139
zcmV;60CfM50jB|wB!2;OQb$4nuFf3k0001CNkl<ZScPL?7zLwX6bvw6Bu0^ejKF_#
z48QQ?13~jyh&9Z?P?RLg51fBZlsYDoOr-%Bb-<_tMjbHffKdmGI$*#ZKy-Ed;Mq5t
tIDn`I2?GP^jS^xSBcosxjDkS{0LEzz<L(Ock^lez07*qoL<FuvV1gY4Gq?Z%

delta 115
zcmV-(0F3{q0gwTZBy3knL_t(|oMT`Z1*2dT3@~6MMp2qE!+&xNpLLe7`7Fd5CM2s)
zlI8Cn-y}*M6G^7h0E{|d)B&Ro7<Is?14bP%>Hwk|Bn%9sH%f?UjEsU&FbW0*008jK
V2_=pl90ULW002ovPDHLkV1j4GCn*2`

diff --git a/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_over.png b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_over.png
index 0a4d4f904904be49626f7f391b3dd40835fcdd7c..f5baed50efab49205eb9f91eee35d6202a8e5e48 100644
GIT binary patch
delta 111
zcmV-#0FeKFjRBA(X#sOmM?wIu&K&6g002ixL_t(oh3(KW6~HhI#84Gn*cgu41c}kO
zOQ&v4roQO!r{O@-pY>y>ajlFpvjN5!0L(c7h=`@$XI0g2RkihmBuSEVt{ZK_CH@AE
RC0hUh002ovPDHLkV1i1yFK++<

delta 96
zcmV-m0H6Pj0e+AqT181jK~#90?ar|cz%U3zQ6hOcW;n)U2gbuyx=1mt^<Q}i4l@84
zlGKv=H2?EV7c#S}>T~Aq77?SHYx=-j1ONa4Tw?>wbr2x{S-Bnn0000<MNUMnLSTY`
CLnWmE

diff --git a/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_pen.png b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_pen.png
index 7e2d0b999c052e5231cffc2e89e0bba14de66545..e7b506c75e3980be2d35aa67249355a64b1a4e3d 100644
GIT binary patch
delta 119
zcmV--0EqvM0h9rdBya(9Qb$4nuFf3k0000^Nkl<ZScUD;!3n@X2t?7{G&cR%rA1he
zd)eF~K}ZOJ|4!l{h>ii^W3xLTDbL#7XVrU!q%^av@|~6Wm7}{vMBHVq3q0}y0002s
Z*A{rN7&+`_p$h;2002ovPDHLkV1n;VGb;c9

delta 112
zcmV-$0FVEa0gVBWBxzJhL_t(|obAxD3BXVYgy9RMcLX<h`_JJ9j^G3@RUnW?yFmW0
zltT|C0DpIMgKMqb$wfqarzD+|@Ka{KX6`OC+f~&rF=~5%Au}~O0ssI2eA)%-OcDnj
S(K`_U0000<MNUMnLSTY(f-DdK

diff --git a/Resources/Textures/Objects/Misc/clipboard.rsi/meta.json b/Resources/Textures/Objects/Misc/clipboard.rsi/meta.json
index 2b2ad37581..4eeea693de 100644
--- a/Resources/Textures/Objects/Misc/clipboard.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/clipboard.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "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.",
+  "copyright": "Clipboard sprites are by WJohn (Github) for tgstation, taken from https://github.com/tgstation/tgstation/commit/3cc10b1785bff95e861d722b5164189951761921. Inhand sprites by nmajask (Github) for SS14. clipboard_paper is a modified version of paper from bureaucracy.rsi.",
   "size": {
     "x": 32,
     "y": 32
-- 
2.51.2