From: Guilherme Ornel <86210200+joshepvodka@users.noreply.github.com> Date: Wed, 20 Dec 2023 23:29:35 +0000 (-0300) Subject: Added CentCom clipboard, folder and added a normal green folder. (#22693) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d318e96936e9bd10295c8a780c90e474caf711b3;p=space-station-14.git Added CentCom clipboard, folder and added a normal green folder. (#22693) * added * pen touch up * fixed conflict? * whatever i dont want credits --- diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index e0eff43fc5..f51420c9a5 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -357,6 +357,7 @@ # white: "#e6e6e6" # grey: "#999999" # black: "#3f3f3f" +# green: "#43bc38" - type: Item sprite: Objects/Misc/bureaucracy.rsi size: Small @@ -462,6 +463,31 @@ 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 @@ -521,6 +547,31 @@ 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 index 0000000000..cc9a33153f Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-centcom.png differ diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index c22a4d1e4a..408dde620f 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -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 index 0000000000..a5197be4bd 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 index 0000000000..675e133736 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 index 0000000000..d58b42b709 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 index 0000000000..d56d62894e 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 index 0000000000..ea71ac85c1 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 index 0000000000..83135923f2 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 index 0000000000..5fc11d48ca 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 index 0000000000..6cb81a227a --- /dev/null +++ b/Resources/Textures/Objects/Misc/cc-clipboard.rsi/meta.json @@ -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 + } + ] +}