From bec4b66dd88446a3fce02c464172a5ea181e8b9d Mon Sep 17 00:00:00 2001 From: Lamrr <96937466+Lamrr@users.noreply.github.com> Date: Mon, 24 Jan 2022 04:46:55 +1100 Subject: [PATCH] Adds paper folders (#6228) --- .../Catalog/Fills/Crates/service.yml | 4 + .../Entities/Objects/Misc/paper.yml | 117 ++++++++++++++++++ Resources/Prototypes/tags.yml | 3 + .../Misc/bureaucracy.rsi/folder-base.png | Bin 0 -> 98 bytes .../Misc/bureaucracy.rsi/folder-colormap.png | Bin 0 -> 233 bytes .../bureaucracy.rsi/folder-overlay-paper.png | Bin 0 -> 113 bytes .../Misc/bureaucracy.rsi/folder-white.png | Bin 0 -> 250 bytes .../Objects/Misc/bureaucracy.rsi/folder.png | Bin 260 -> 0 bytes .../Misc/bureaucracy.rsi/folder_blue.png | Bin 261 -> 0 bytes .../Misc/bureaucracy.rsi/folder_paper.png | Bin 96 -> 0 bytes .../Misc/bureaucracy.rsi/folder_red.png | Bin 261 -> 0 bytes .../Misc/bureaucracy.rsi/folder_white.png | Bin 273 -> 0 bytes .../Misc/bureaucracy.rsi/folder_yellow.png | Bin 261 -> 0 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 14 +-- 14 files changed, 128 insertions(+), 10 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-base.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-colormap.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-white.png delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder.png delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_blue.png delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_paper.png delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_red.png delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_white.png delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_yellow.png diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 7014d95457..4027e6d93c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -87,6 +87,10 @@ amount: 15 - id: Pen amount: 2 + - id: HandLabeler + - id: BoxFolderBlue + - id: BoxFolderRed + - id: BoxFolderYellow - type: entity id: CrateServicePersonnel diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index d875edfabf..ca86185a12 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -25,6 +25,9 @@ enum.PaperStatus.Written: paper_words - type: Item size: 1 + - type: Tag + tags: + - Document - type: entity parent: Paper @@ -65,3 +68,117 @@ sprite: Objects/Misc/bureaucracy.rsi HeldPrefix: pen size: 2 + +- type: entity + id: BoxFolderBase + parent: BoxBase + name: folder + description: A folder filled with top secret paperwork. + components: + - type: Sprite +# netsync: true + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: folder-colormap + - state: folder-base +# RandomSpriteColor requires netsync which is currently incompatible with ItemMapper +# - type: RandomSpriteColor +# sprite: Objects/Misc/bureaucracy.rsi +# state: folder-colormap +# colors: +# red: "#cc2323" +# blue: "#355d99" +# yellow: "#b38e3c" +# white: "#e6e6e6" +# grey: "#999999" +# black: "#3f3f3f" + - type: Item + sprite: Objects/Misc/bureaucracy.rsi + size: 20 + - type: Storage + capacity: 10 + size: 10 + whitelist: + tags: + - Document + - type: ItemMapper + mapLayers: + folder-overlay-paper: + whitelist: + tags: + - Document + - type: Appearance + visuals: + - type: MappedItemVisualizer + +- type: entity + id: BoxFolderRed + parent: BoxFolderBase + suffix: Red + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: folder-colormap + color: "#cc2323" + - state: folder-base + +- type: entity + id: BoxFolderBlue + parent: BoxFolderBase + suffix: Blue + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: folder-colormap + color: "#355d99" + - state: folder-base + +- type: entity + id: BoxFolderYellow + parent: BoxFolderBase + suffix: Yellow + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: folder-colormap + color: "#b38e3c" + - state: folder-base + +- type: entity + id: BoxFolderWhite + parent: BoxFolderBase + suffix: White + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: folder-white + - state: folder-base + +- type: entity + id: BoxFolderGrey + parent: BoxFolderBase + suffix: Grey + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: folder-colormap + color: "#999999" + - state: folder-base + +- type: entity + id: BoxFolderBlack + parent: BoxFolderBase + suffix: Black + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: folder-colormap + color: "#3f3f3f" + - state: folder-base + diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index cd9da7e011..7eb092939b 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -99,6 +99,9 @@ - type: Tag id: Debug +- type: Tag + id: Document + - type: Tag id: DoorElectronics diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-base.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-base.png new file mode 100644 index 0000000000000000000000000000000000000000..5fbb47268fc20367d8ba35969dae8e1dda8bf9cf GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzO-~ockch)?FDNoG81OJ{{Pf>F w*f!dD@(*VNW`_Asg|@ymo^)g?14B4>?>rVJ{`tncfSMRQUHx3vIVCg!0F{&*i2wiq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-colormap.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-colormap.png new file mode 100644 index 0000000000000000000000000000000000000000..ce23165866a1557152c72fdcfded37fa8c63bfcf GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4W2HJArXh)PC3YXSb@itw?spt z#W6uZqQ#OypY`3!par%8s)0f$-?wdec>2B>!(oFnM?0n}xGcFQ<)OLoJD*ce=I!FO zqIgTe~DWM4f>yaXG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-white.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-white.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f4fa3b18982987dc76ed2c397f8e3868a17877 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJgPtyqArXh)PBr8^tiaZAte%Lm&P8V|;Q+s=?6(YA9&qmW4Q znk($VUJv%lulU#`rLk0n`$E+9%6Xnj$5uxxMCrE(gjIKNT#MpRYzX4=(tOUz&=A@` zw|Hwb>o>JKx(6hfEuYV4b3I}wdSg~cKYvultfrU$tZKN9U3=o*t-xJjm)E^@cZ2aH x^O+xR|BPi_GR5q?fM836o%3IIiMGUlP3Acbw&EOit{`7Bc)I$ztaD0e0stJpT(tlI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder.png deleted file mode 100644 index 2f2247bb1b5b3fb00cef80ee0b44f2fc85598834..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmV+f0sH=mP)ZAUIpm$^>qh2Kv5K> zG7qV67>2dPc%EmG_p8LzS}W2K5u9^t2;nfqvn0SB6jfk@h<4AdwICuiO@p>=5kj~p z002zW^s^tw@sy7^05iiF^I7+O|EDp=fSKW(12bP6;2ZD#nQOaT{s_JIqTX*5RUpPF z*5;f=y6WGsdH`_?a?VI8iM3LyS3o?Bx~?l4M$58@y%j}Ks`3Wsy*VlK z(YjLX{mZ}W;PkSy%BOO~f_Ow9ge!R6ZSUuonBr^u|Gw?sxeJtMcoZ_|GI%O7Fw5K7 z9njJ{u>Qb@hmV;TId|o-8vsGf9ZT`n_3!8TOtW;ce(?JDa~>NTp@MB)GsWAazgzJ;^xCwPGH}(Ntc^d3F|lTdF2GJ$OFBbori%TMo0WU3$to><8q)D22WQ%mvv4FO#p+r8C|@aHF_3Z^dvfY3NO>ubPJtCP$P5?2Do^#GDgg3|I|3$xPY0o&+v3 zQ$Ct9BL)C~wbmc=T^#rFAqUXbBCMR(c%{^rCafH2YmvZ(wszP6@1)A>v#piEFJY=Y z9F8Zlp4GtldSeIbV)AD=c>vZCT+?XCFC zQIs#UOATz>c900yb)BSrkce7qlj4X7&bc9k@Y2LyVqgnI85kj=*?wy+hzMDhp(qN3 z5VkP@0992@+FjQz(n&VJ%rM5>>dgEQV~hba!#OuQ{+5Azy!T6{&9eF-^xh}!{fH<7 zecvN*N?cB7v9V`}GLSdrr2M#naph}fK(qxhM#N(a#JHM)|9S~i?=}FW`~!-jC_lj! X|EWIyAx}Sr00000NkvXXu0mjfAfR)P diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_yellow.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_yellow.png deleted file mode 100644 index 24afe80331d6c7284387f9a0c9ef2cacfc13e237..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJGoCJvAr*6y6C_v{Cy4YkF|zd> z(V7#n=*xVO=Fipd1XInpHQS_C6bmnXcj)YTo|}o2{x4rw<#$2QXNg6FSi=&5hDL7l z{Yj$c0ngKR6nxgcsOY+lSpoz#9iHuSwaeErPiUOJRlxGr2BuZ&PWsu3ZK1pG3#^^DM4;mLNAr_>N-S(P z(tJCZJ-V8{&;J*2m(f|9rQ_^v9w0b!g&FMbKm!d1hWZV9x2C!|b^-mx;OXk;vd$@? F2>>2OWeETP diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index ba46cfa3c6..4792a6a523 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -56,22 +56,16 @@ ] }, { - "name": "folder" + "name": "folder-base" }, { - "name": "folder_blue" + "name": "folder-colormap" }, { - "name": "folder_paper" + "name": "folder-white" }, { - "name": "folder_red" - }, - { - "name": "folder_white" - }, - { - "name": "folder_yellow" + "name": "folder-overlay-paper" }, { "name": "label_cart"