]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds clipboards to bureaucracy crate and replaces incorrectly credited sprites (...
authornmajask <nmajask@gmail.com>
Thu, 5 Oct 2023 03:24:29 +0000 (23:24 -0400)
committerGitHub <noreply@github.com>
Thu, 5 Oct 2023 03:24:29 +0000 (23:24 -0400)
* Adds clipboards to the bureaucracy crate

* Ports current sprites from TG to fix the credits

Resources/Prototypes/Catalog/Fills/Crates/service.yml
Resources/Textures/Objects/Misc/clipboard.rsi/clipboard.png
Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_over.png
Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_pen.png
Resources/Textures/Objects/Misc/clipboard.rsi/meta.json

index 106a34976f95441001f5123b09c4ae57f069a3a4..2b7c5db0f7751a2daed6fcd0ac36640c6739b093 100644 (file)
       amount: 15
     - id: Pen
       amount: 2
+    - id: BoxFolderClipboard
+      amount: 2  
     - id: HandLabeler
     - id: BoxFolderBlue
     - id: BoxFolderRed
index 4439ea097fed62eb2dd513d79fed891551e666ed..8007668d9354f93b095cdc929aca93a7f739fccb 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard.png and b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard.png differ
index 0a4d4f904904be49626f7f391b3dd40835fcdd7c..f5baed50efab49205eb9f91eee35d6202a8e5e48 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_over.png and b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_over.png differ
index 7e2d0b999c052e5231cffc2e89e0bba14de66545..e7b506c75e3980be2d35aa67249355a64b1a4e3d 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_pen.png and b/Resources/Textures/Objects/Misc/clipboard.rsi/clipboard_pen.png differ
index 2b2ad37581029f060a6e72eeab179974d9544e41..4eeea693de6e2972c2ae4946262ff9f6baa3eb36 100644 (file)
@@ -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