From d318e96936e9bd10295c8a780c90e474caf711b3 Mon Sep 17 00:00:00 2001 From: Guilherme Ornel <86210200+joshepvodka@users.noreply.github.com> Date: Wed, 20 Dec 2023 20:29:35 -0300 Subject: [PATCH] Added CentCom clipboard, folder and added a normal green folder. (#22693) * added * pen touch up * fixed conflict? * whatever i dont want credits --- .../Entities/Objects/Misc/paper.yml | 51 ++++++++++++++++++ .../Misc/bureaucracy.rsi/folder-centcom.png | Bin 0 -> 357 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 3 ++ .../Misc/cc-clipboard.rsi/clipboard.png | Bin 0 -> 260 bytes .../Misc/cc-clipboard.rsi/clipboard_over.png | Bin 0 -> 204 bytes .../Misc/cc-clipboard.rsi/clipboard_paper.png | Bin 0 -> 166 bytes .../Misc/cc-clipboard.rsi/clipboard_pen.png | Bin 0 -> 212 bytes .../Misc/cc-clipboard.rsi/equipped-BELT.png | Bin 0 -> 276 bytes .../Misc/cc-clipboard.rsi/inhand-left.png | Bin 0 -> 465 bytes .../Misc/cc-clipboard.rsi/inhand-right.png | Bin 0 -> 480 bytes .../Objects/Misc/cc-clipboard.rsi/meta.json | 35 ++++++++++++ 11 files changed, 89 insertions(+) create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-centcom.png create mode 100644 Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard.png create mode 100644 Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_over.png create mode 100644 Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_paper.png create mode 100644 Resources/Textures/Objects/Misc/cc-clipboard.rsi/clipboard_pen.png create mode 100644 Resources/Textures/Objects/Misc/cc-clipboard.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Misc/cc-clipboard.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/cc-clipboard.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/cc-clipboard.rsi/meta.json 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 0000000000000000000000000000000000000000..cc9a33153f6eb60b2f09f86b82994c4c4da7acef GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvg0|TSD zr;B4q1ZQ%B1nXi&11TmTaX|5aN6%mOb1VPo-_iE(32Li*-p<44R^DMGo}v)QrMo-! z-{{{Tm`QFZ*>w)3M;OXk;vd$@?2>_$) Bi^l)} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a5197be4bde05aef5df8f4c4ea18f1eadc1dc1ed GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP;i^4 zi(^OxXL5oB>taO%DJEtark*1=>?`~J)KA!@={}_+@Z5ytV*WLH=1&zJKSy>L39iVv zS1rn>m-{HB`HC9nJw-1=VZ&7&UoAI99(kpBitz+n@NC;x471t}G!|?9PqgF+zjE;m zd6OmEvPiT@k-t!t>A( zHK(RR7H+SAiC#GmnKsRtag5{4o4_g)7B}Yv2WJL`or3mazdy2X1Nwl$)78&qol`;+ E0RBT-bN~PV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..675e1337369d3c733b823c651d9fa8d15c3c5bdc GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP_WL^ z#W5s;GdV$mb+Mv>6q88HfyQF3|Bf@5lqDoiUbLy~`%@pQ9L5$|DYxO6^VTlCGh5j< z%lGfxz02o@HK@E@y64_{L!JAt*v_;uFmWgxh;u4`xs1(1nxEl=wA`*pzDe%&N^gL6 OF?hQAxvX6cdziSS%n=6#VD^k9lY6osJm`208TEocOf=QxDHC$u&GJGLFLR z4KjPJKbqfodp_Ra(O2fPG7qfgi>^Ov;5o~ZA+2%d)#N>n4#n&TWSY9=_VMiq`pG?g y`Ag+>I>{~@coy_~yX8vqHeM8v01*lTObmAABHp_Uee{7YV(@hJb6Mw<&;$TMMMgUS literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ea71ac85c11f7d8685452d09d9fe6d82c184e386 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0px`l2 z7srqa#D4m)zG3{IFERLiwMu)tS^Ib4 z?7DAit6QfmToJMD@R@z*lV?k8>OK3Rx%%%D02BR01_s7v zPZ!6K3dXm$^z)b;MUH>e)r?_ozO`gghZGMd*HKOZ-)uqA6>cM694ycFGCbUUGVTATYUBBLb&}M&A_N>57+H{r9oCKQ7v#SGdRk)9 zYi#)Tme#91|5?)0oqGAW7Vf#Og-nyIvkZ^Mf|U#YB5KXe(^NM%i3{g2J2-qgn~Y;xsMm2g>yc~?$n2XEat z>ARuc>^&?889vRAkC|$;dd}sT7~Zo!n~>at<~#^jA;y8tcepT>4{=eaxF1%e@M}-!MP6Xzopr0AcI99smFU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5fc11d48ca0b9d26d0240053e8fd1b7f80c45680 GIT binary patch literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s7S zo-U3d6^w6h?e$}F6gcp4YQuU*XV)af)?VJusr-(KTefa^psADTsZqh9EhH_)rQxw6 zC&OaCBi9)L^8)c3XCCO5AN#K={Vut@?Avi!5%Y5!6&o0sI1~`XhxaUcCfe`5zMlPX z$IMr^cE;{_zI7WR-Uk-_j@z2GOeBP1 z^1<8lcV4}{mOpr%7K7s4Quk#CmaSiS;9OP%Q*n>gR;dTSzMlK?SjhCX!-wygho>y( zdhqPwJrR=$@n5|47w_8qWHr--|9@^hGP?RCM$-J`<~2K~UhJMD;K0Dhf}1$OghnvXRli}HP*fjI5SJJQ}%W1a;XFQHT(S%>hH(* zf7RS-KYPCJdCOJHS*)KQ@;`ar=vWPVMAP$|<#w^V&#T