From 41f56fa5c8d3fc9a0dd3dad270fe4e529b3a615d Mon Sep 17 00:00:00 2001 From: Fishfish458 <47410468+Fishfish458@users.noreply.github.com> Date: Wed, 4 May 2022 10:22:53 -0600 Subject: [PATCH] More bureaucracy - CE stamp, filing cabinets, folder changes (#7816) Co-authored-by: fishfish458 --- .../Locale/en-US/paper/stamp-component.ftl | 3 +- .../Catalog/Fills/Lockers/heads.yml | 1 + .../Entities/Objects/Misc/filing_cabinets.yml | 66 ++++++++++++++++++ .../Entities/Objects/Misc/paper.yml | 45 +++++++----- Resources/Prototypes/tags.yml | 3 + .../Misc/bureaucracy.rsi/chestdrawer-open.png | Bin 549 -> 0 bytes .../bureaucracy.rsi/filingcabinet-open.png | Bin 579 -> 0 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 36 ---------- .../Misc/bureaucracy.rsi/tallcabinet-open.png | Bin 583 -> 0 bytes .../Storage/cabinets.rsi/chestdrawer-open.png | Bin 0 -> 478 bytes .../Storage/cabinets.rsi}/chestdrawer.png | Bin .../cabinets.rsi/filingcabinet-open.png | Bin 0 -> 504 bytes .../Storage/cabinets.rsi}/filingcabinet.png | Bin .../Structures/Storage/cabinets.rsi/meta.json | 29 ++++++++ .../Storage/cabinets.rsi/tallcabinet-open.png | Bin 0 -> 481 bytes .../Storage/cabinets.rsi}/tallcabinet.png | Bin 16 files changed, 130 insertions(+), 53 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Misc/filing_cabinets.yml delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer-open.png delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/filingcabinet-open.png delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/tallcabinet-open.png create mode 100644 Resources/Textures/Structures/Storage/cabinets.rsi/chestdrawer-open.png rename Resources/Textures/{Objects/Misc/bureaucracy.rsi => Structures/Storage/cabinets.rsi}/chestdrawer.png (100%) create mode 100644 Resources/Textures/Structures/Storage/cabinets.rsi/filingcabinet-open.png rename Resources/Textures/{Objects/Misc/bureaucracy.rsi => Structures/Storage/cabinets.rsi}/filingcabinet.png (100%) create mode 100644 Resources/Textures/Structures/Storage/cabinets.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/cabinets.rsi/tallcabinet-open.png rename Resources/Textures/{Objects/Misc/bureaucracy.rsi => Structures/Storage/cabinets.rsi}/tallcabinet.png (100%) diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index 2eb6c6e9b3..1592c04989 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -13,4 +13,5 @@ stamp-component-stamped-name-qm = Quartermaster stamp-component-stamped-name-rd = Research Director stamp-component-stamped-name-warden = Warden stamp-component-stamped-name-trader = Trader -stamp-component-stamped-name-syndicate = Syndicate \ No newline at end of file +stamp-component-stamped-name-syndicate = Syndicate +stamp-component-stamped-name-ce = Chief Engineer diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 335678ba80..56cec266c3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -102,6 +102,7 @@ - id: CigarCase prob: 0.15 - id: DoorRemoteEngineering + - id: RubberStampCE - type: entity id: LockerChiefMedicalOfficerFilled diff --git a/Resources/Prototypes/Entities/Objects/Misc/filing_cabinets.yml b/Resources/Prototypes/Entities/Objects/Misc/filing_cabinets.yml new file mode 100644 index 0000000000..0c523a5939 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Misc/filing_cabinets.yml @@ -0,0 +1,66 @@ +- type: entity + name: filing cabinet + parent: BaseStructure + id: filingCabinet + description: A cabinet for all your filing needs. + components: + - type: Storage + capacity: 80 + whitelist: + tags: + - Document + - Folder + - Write + - type: Sprite + netsync: false + sprite: Structures/Storage/cabinets.rsi + state: filingcabinet + noRot: true + - type: Appearance + visuals: + - type: BagOpenCloseVisualizer + openIcon: filingcabinet-open + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + +- type: entity + name: tall cabinet + parent: filingCabinet + id: filingCabinetTall + components: + - type: Sprite + sprite: Structures/Storage/cabinets.rsi + state: tallcabinet + - type: Appearance + visuals: + - type: BagOpenCloseVisualizer + openIcon: tallcabinet-open + +- type: entity + name: chest drawer + parent: BaseStructureDynamic + id: filingCabinetDrawer + description: A small drawer for all your filing needs, Now with wheels! + components: + - type: Storage + capacity: 50 + whitelist: + tags: + - Document + - Folder + - Write + - type: Sprite + netsync: false + sprite: Structures/Storage/cabinets.rsi + state: chestdrawer + noRot: true + - type: Appearance + visuals: + - type: BagOpenCloseVisualizer + openIcon: chestdrawer-open + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 9d113e9c90..ca2ff71027 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -80,7 +80,7 @@ name: Cybersun pen parent: BaseItem id: CyberPen - description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. + description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. components: - type: Tag tags: @@ -133,7 +133,7 @@ # black: "#3f3f3f" - type: Item sprite: Objects/Misc/bureaucracy.rsi - size: 20 + size: 5 - type: Storage capacity: 10 size: 10 @@ -149,6 +149,21 @@ - type: Appearance visuals: - type: MappedItemVisualizer + - type: Tag + tags: + - Folder + - type: StorageFill + contents: + - id: Paper + prob: 0.5 + - id: Paper + prob: 0.4 + - id: Paper + prob: 0.3 + - id: Paper + prob: 0.2 + - id: Paper + prob: 0.2 - type: entity id: BoxFolderRed @@ -248,7 +263,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-cap - netsync: false - type: entity name: CentCom rubber stamp @@ -261,7 +275,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-cent - netsync: false - type: entity name: chaplain's rubber stamp @@ -274,7 +287,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-chaplain - netsync: false - type: entity name: clown's rubber stamp @@ -287,7 +299,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-clown - netsync: false - type: entity name: chief medical officer's rubber stamp @@ -300,7 +311,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-cmo - netsync: false - type: entity name: DENIED rubber stamp @@ -313,7 +323,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-deny - netsync: false - type: entity name: APPROVED rubber stamp @@ -326,7 +335,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-iaa - netsync: false - type: entity name: head of personnel's rubber stamp @@ -339,7 +347,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-hop - netsync: false - type: entity name: head of security's rubber stamp @@ -352,7 +359,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-hos - netsync: false - type: entity name: quartermaster's rubber stamp @@ -365,7 +371,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-qm - netsync: false - type: entity name: research director's rubber stamp @@ -378,7 +383,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-rd - netsync: false - type: entity name: warden's rubber stamp @@ -391,7 +395,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-warden - netsync: false - type: entity name: trader's rubber stamp @@ -404,7 +407,6 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-trader - netsync: false - type: entity name: syndicate rubber stamp @@ -417,4 +419,15 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-syndicate - netsync: false \ No newline at end of file + +- type: entity + name: chief engineers's rubber stamp + parent: RubberStampMime + id: RubberStampCE + components: + - type: Stamp + stampedName: stamp-component-stamped-name-ce + stampState: "paper_stamp-ce" + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: stamp-ce diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index b157a8d7b9..a7fd26174b 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -159,6 +159,9 @@ - type: Tag id: Flashlight +- type: Tag + id: Folder + - type: Tag id: FootstepSound diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer-open.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer-open.png deleted file mode 100644 index 1a10a7946ae844fbb83a02c00460e3335760dbd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 549 zcmV+=0^0qFP)U4Rrd^+N4#pUWs93Mp zm4o2IuN44WF=GszbM1CM{K^0jQIRBxwj2Ovvl%$&I2;Z}?R@xu4FC}pQ4|@;0bo9# z!={}Nzj6hPMk4@#5JK6RloGew?de{g=UM~t<<~j`?(*aD__Dm$>uC#ZaOqbDV7J>n zT~8(xgkks?Sdt`=QW{B3aP2orgFz5rwOW<#HH8bmG5|Vz&n2$?$^cxiR|p}{?RK>~ z%(ATVpuW@TbZYJICvO8lM8$ot>5^p`!Z57$sa4GaDqaSl%H&!?&vN%Aq3($ zHa>+_G@b`~Ngwm%){X1vND;D!hJ|Ki{Zx3tpVAPD}35U>sDwzf-SX(1L02Np)q zg=I1+?iBXo?arv*OvvSJmYMl>-r09&_j~yU-Z*Y-g5x;W%jL2#W;`BS&FP!})+DIY z>1Y70HPveMWXx){qE@Q`Xe@>G$!`*<%L3v!W;&e$kR*xeyrvN4H`)PF6cvsShr`mC zOCZT_BtWCl0ARgd=lZiOBTdt@h;1OrZzKS~d_K>$l~ROZ$Zog0XaTBcnN--LZ*lacc^!t5lvP&SvZzMpLWrSf! zx7$7T1wn9?1^DJS5+F@eXFogF{6+%IX0u#-u~>*KrU;cvMP%MG0d&1yKQ>N1c&pW7 zGMQX?S$X*K0s5u8YBrm>_OtDDg4cY&r6}A1z8&BJMLs~>2uUe_4$6GMIVcoBQh8e_ zr5Fqb?Du=Xu@8_?-UbIB(ChV%ea?J^w}lrUV4}RV2LO-t0Fyi)MUfLf z;KK(T>T0^(ZnNEP|HuYG5IFGze|0^;Wjd7Lx2gyD%m!Y4fbVSJ)d#@;dH~6<1Tx?q zusw0*>05kGiB~@wljJu$8M+5P0zY24K3L6X3sHX48%mF-&LOveZ~lK5zX1>?f|X?M R5Rm`?002ovPDHLkV1ftM2Aco? diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index fddc934817..8ec8d3b1dd 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -7,18 +7,6 @@ "y": 32 }, "states": [ - { - "name": "chestdrawer" - }, - { - "name": "chestdrawer-open", - "delays": [ - [ - 0.5, - 0.1 - ] - ] - }, { "name": "clipboard" }, @@ -43,18 +31,6 @@ { "name": "envelope_torn_overlay" }, - { - "name": "filingcabinet" - }, - { - "name": "filingcabinet-open", - "delays": [ - [ - 0.5, - 0.1 - ] - ] - }, { "name": "folder-base" }, @@ -299,18 +275,6 @@ { "name": "stamp-warden" }, - { - "name": "tallcabinet" - }, - { - "name": "tallcabinet-open", - "delays": [ - [ - 0.5, - 0.1 - ] - ] - }, { "name": "clipboard-equipped-BELT", "directions": 4 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/tallcabinet-open.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/tallcabinet-open.png deleted file mode 100644 index c69048306a92cc4857bc39c12f9251e3e511d47a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmV-N0=WH&P)65o;k;0yQ##0(M(8&W0~B;*BzL0;lD9jYMI z0(~}qan<&2Bq8VdCVn?gfIqGmn?I##TFhoM06-7~sMqTN03igFQUHKpj7Fm`+dG{O09@u=tyVLFQ^mH$(pNGZ|p_t9##F26ahdR2UK54hHNJO%)SVQ3A0MlShQ2KX8{2cK*}mA878e6j)4 z>Ga|LAPAnVg~Y#?0=9hPDG)``&F$y&*{T4lC@Em0hX%xPTqvcWl)CGD6h+u>x9oQS zfXjoc72Z=E$Au}}M85gIR`0|y V^l7SU4(tE`002ovPDHLkV1gA<1K0on diff --git a/Resources/Textures/Structures/Storage/cabinets.rsi/chestdrawer-open.png b/Resources/Textures/Structures/Storage/cabinets.rsi/chestdrawer-open.png new file mode 100644 index 0000000000000000000000000000000000000000..4acc2fa1ed8a5ded9adf146164e0717f654a6a82 GIT binary patch literal 478 zcmV<40U`d0P)Px$m`OxIR9J=WmNAaPFc3xmt~fwMhY+nLL_?Woy0q!I2R#Q!pO!P^2y`^uAd;a2 zD>Os|A-VKcAW$4UPQ>mO{4SXp|CdZMHt^9$AN{eu+7zW}YJBqN^Le9B&(~N8!OoXb zLI?pOGVAr)3c&(sYb=C-l=5Y+6M%?JmSt>n09Y&*kW%7sI5=}(0uYf2!_dnd0FopD zx6b(nrqd|^Kq=*1Olytn_4;(Ls;X`PkLE>DSmT4ifNkgvu-omPu4l6uhQr|iQ8(a5>be!urNw*mm&htEx%nb7zVwjDmce~lHO?eI}bAq+!oHk)n$kKzs= zr4*tlYHSA^U_2hT8a{CxLu*~@d!FZLI*eEWmdoWmnTSjjMfceGe73eD2!dKms;WYs z=h$wyFTvlo7r36B4bXNk;Ftr9Q!x>Foq&DJSpWbqnM@1-oK7bkkH=b#EB>$b0}IaC U_`4*Rvj6}907*qoM6N<$g3P7KcmMzZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer.png b/Resources/Textures/Structures/Storage/cabinets.rsi/chestdrawer.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer.png rename to Resources/Textures/Structures/Storage/cabinets.rsi/chestdrawer.png diff --git a/Resources/Textures/Structures/Storage/cabinets.rsi/filingcabinet-open.png b/Resources/Textures/Structures/Storage/cabinets.rsi/filingcabinet-open.png new file mode 100644 index 0000000000000000000000000000000000000000..bb8e09a13c781079e3c8960d186b76b7ae4a84f3 GIT binary patch literal 504 zcmVPx$vPnciR9J=8moaO?KorM+Egb@Bp;JKzaqtUt%bcxr@LLo*n9)f;gCO`BO2M^s z%k0+0(Lo#(3Jx})fpEPJ8fmOv?o49a2jRGPkGtPJ^8UPoU$!%oV9)d9bUIbW^!t6I zJuh^E8jXeokWx}AmG;KWW;4p=GJwS3Vmg5`Ex_|UhQlEMzVGYq3utD*bzS9px7$sP z$plcXRsopL=LvrlMTB8^)WJpo0ORpEF&9E$+cwMPvUq^_=J$6uTwZ?w@cfkR=0*Uq zy}Z6F*N@4DHh>UhdmZW|wVG(Z$Z*tSix+1&ap%Q_uE7>1dDwoCw{(I_#W zOeVPjoTseIN~MxGc=vF}aWVm@G9Y)=tyZfg<{Q~944_a2)B=FR3YeEE0aOZ@S5;_L zL7D;<3Lu1_)9J8Ut$_R#PzxYdz*eiZ_2s32S^zo0B(V|1LLF7e#QW6i2U~YTlNJib=1vh-Arx(0000Px$n@L1LR9J=0mobilKoo{QH&#|Ol*WY47%K}~@C06f#B*>DPv8}dwS|qH36+hB zp&@ZJ(?H7>n=xipn1Nx}zhegG|L4v7-y7hc(W&!M6h*~mvjM~=f0+im6gUu}?^psV|07>31gIDAR`oBVt} z+Z7OoVG+kMaU7SP`Cu^Ma=B=eYYRw{gvDa-CJt!7vAe5C|cd&1Q^7 zqx-Yzt{%BmyBG!TR8&RI; zMgpwfi1Iuq%QB