]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Added CentCom clipboard, folder and added a normal green folder. (#22693)
authorGuilherme Ornel <86210200+joshepvodka@users.noreply.github.com>
Wed, 20 Dec 2023 23:29:35 +0000 (20:29 -0300)
committerGitHub <noreply@github.com>
Wed, 20 Dec 2023 23:29:35 +0000 (16:29 -0700)
* added

* pen touch up

* fixed conflict?

* whatever i dont want credits

Resources/Prototypes/Entities/Objects/Misc/paper.yml
Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-centcom.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_over.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_paper.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_pen.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/cc-clipboard.rsi/equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/cc-clipboard.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/cc-clipboard.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/cc-clipboard.rsi/meta.json [new file with mode: 0644]

index e0eff43fc53b2fd6fa7e2464034d2602577e6308..f51420c9a5acb4ce166e69d50bcc8de89a49e4fa 100644 (file)
 #      white: "#e6e6e6"
 #      grey: "#999999"
 #      black: "#3f3f3f"
+#      green: "#43bc38"
   - type: Item
     sprite: Objects/Misc/bureaucracy.rsi
     size: Small
       color: "#3f3f3f"
     - state: folder-base
 
+- type: entity
+  id: BoxFolderGreen
+  parent: BoxFolderBase
+  suffix: Green
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: folder-colormap
+      color: "#43bc38"
+    - state: folder-base
+
+- type: entity
+  id: BoxFolderCentCom
+  name: centcom folder
+  parent: BoxFolderBase
+  suffix: DO NOT MAP
+  description: CentCom's miserable little pile of secrets!
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: folder-centcom
+    - state: folder-base
+
 - type: entity
   id: BoxFolderClipboard
   parent: BoxFolderBase
       types:
         Blunt: 6
 
+- type: entity
+  id: BoxFolderCentComClipboard
+  parent: BoxFolderClipboard
+  name: centcom clipboard
+  description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentCom officials, seldom seen actually used. 
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/cc-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: Item
+    sprite: Objects/Misc/cc-clipboard.rsi
+    size: Small
+  - type: Clothing
+    slots: [belt]
+    quickEquip: false
+    sprite: Objects/Misc/cc-clipboard.rsi
+
 - type: entity
   id: BoxFolderQmClipboard
   parent: BoxFolderBase
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-centcom.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-centcom.png
new file mode 100644 (file)
index 0000000..cc9a331
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-centcom.png differ
index c22a4d1e4acf18d4797bcf82f0044f4e76fa753f..408dde620f17b4ab442c83fe8e894998c644afa7 100644 (file)
@@ -31,6 +31,9 @@
     {
       "name": "folder-white"
     },
+    {
+      "name": "folder-centcom"
+    },
     {
       "name": "folder-overlay-paper"
     },
diff --git a/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard.png b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard.png
new file mode 100644 (file)
index 0000000..a5197be
Binary files /dev/null and b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard.png differ
diff --git a/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_over.png b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_over.png
new file mode 100644 (file)
index 0000000..675e133
Binary files /dev/null and b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_over.png differ
diff --git a/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_paper.png b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_paper.png
new file mode 100644 (file)
index 0000000..d58b42b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_paper.png differ
diff --git a/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_pen.png b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_pen.png
new file mode 100644 (file)
index 0000000..d56d628
Binary files /dev/null and b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_pen.png differ
diff --git a/Resources/Textures/Objects/Misc/cc-clipboard.rsi/equipped-BELT.png b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..ea71ac8
Binary files /dev/null and b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Misc/cc-clipboard.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..8313592
Binary files /dev/null and b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/cc-clipboard.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..5fc11d4
Binary files /dev/null and b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/cc-clipboard.rsi/meta.json b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/meta.json
new file mode 100644 (file)
index 0000000..6cb81a2
--- /dev/null
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Do over of clipboard.rsi sprites done by joshepvodka",
+  "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
+    }
+  ]
+}