diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index c9b1e253b4f..3f2c01bffeb 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -124,7 +124,7 @@ - type: StorageFill contents: - id: Paper - amount: 6 # DeltaV - make room for more folders & stickies in the bureaucracy crate + amount: 2 # DeltaV - make room for more folders & stickies & reams in the bureaucracy crate - id: Pen amount: 2 - id: BoxFolderClipboard @@ -145,14 +145,16 @@ - id: NewtonCradle - id: BoxEnvelope - id: BrbSign - # Start DeltaV - More folders in the bureaucracy crate + # Start DeltaV - More folders & colored paper reams in the bureaucracy crate - id: BoxFolderBlack amount: 2 - id: BoxFolderGrey amount: 2 - id: BoxFolderGreen amount: 2 - # End DeltaV - More folders in the bureaucracy crate + - id: BoxReamClassic + - id: BoxReamBright + # End DeltaV - More folders & colored paper reams in the bureaucracy crate - type: entity id: CrateServiceFaxMachine diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml index a55b6f09556..c49971e79ae 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml @@ -24,6 +24,286 @@ backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0 contentMargin: 32.0, 16.0, 32.0, 0.0 +- type: entity + parent: Paper + id: PaperDyedPink + suffix: pink + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#e670b5" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#e670b5" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#eb87c0" + +- type: entity + parent: Paper + id: PaperDyedRed + suffix: red + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#ba453f" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#ba453f" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#ba453f" + +- type: entity + parent: Paper + id: PaperDyedOrange + suffix: orange + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#ec912e" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#ec912e" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#ec912e" + +- type: entity + parent: Paper + id: PaperDyedYellow + suffix: yellow + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#ffd617" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#ffd617" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#fee36c" + +- type: entity + parent: Paper + id: PaperDyedGrass + suffix: grass + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#c7dd4b" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#c7dd4b" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#c7dd4b" + +- type: entity + parent: Paper + id: PaperDyedGreen + suffix: green + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#0da04d" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#0da04d" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#0da04d" + +- type: entity + parent: Paper + id: PaperDyedOcean + suffix: ocean + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#1796c8" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#1796c8" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#1796c8" + +- type: entity + parent: Paper + id: PaperDyedSky + suffix: sky + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#49cddd" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#49cddd" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#49cddd" + +- type: entity + parent: Paper + id: PaperDyedPurple + suffix: purple + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#7c70d7" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#7c70d7" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#938bda" + +- type: entity + parent: Paper + id: PaperDyedTan + suffix: tan + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#cfbdaa" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#cfbdaa" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#cfbdaa" + +- type: entity + parent: Paper + id: PaperDyedBrown + suffix: brown + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#a47449" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#a47449" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#a47449" + +- type: entity + parent: BoxBase + id: BoxReamClassic + name: Papermoon classic color paper ream + description: Brighten up your records and more with Papermoon colored paper, in the six classic colors you've come to know and love. Dyed throughout for maximum colorfastness. + components: + - type: Sprite + sprite: _DV/Objects/Misc/bureaucracy.rsi + layers: + - state: ream-classic + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: Storage + grid: + - 0,0,3,5 + whitelist: + tags: + - Document + - type: StorageFill + contents: + - id: PaperDyedYellow + amount: 4 + - id: PaperDyedGreen + amount: 4 + - id: PaperDyedRed + amount: 4 + - id: PaperDyedOcean + amount: 4 + - id: PaperDyedTan + amount: 4 + - id: PaperDyedBrown + amount: 4 + +- type: entity + parent: BoxReamClassic + id: BoxReamBright + name: Papermoon happy color paper ream + description: Make getting a pink slip a joyous occassion with Papermoon colored paper, in six cheerful and vibrant colors. Dyed throughout for maximum colorfastness. + components: + - type: Sprite + sprite: _DV/Objects/Misc/bureaucracy.rsi + layers: + - state: ream-bright + - type: StorageFill + contents: + - id: PaperDyedOrange + amount: 4 + - id: PaperDyedGrass + amount: 4 + - id: PaperDyedYellow + amount: 4 + - id: PaperDyedSky + amount: 4 + - id: PaperDyedPink + amount: 4 + - id: PaperDyedPurple + amount: 4 + #Research digi-board - type: entity id: BoxFolderRdClipboard diff --git a/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/meta.json index 5e2c34d5304..a0f30e32516 100644 --- a/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,14 +1,20 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by leonardo_dabepis (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "folder-hop-ian" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by leonardo_dabepis (Discord), ream-classic and bright by 2025 Janet Blackquill ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "folder-hop-ian" + }, + { + "name": "ream-classic" + }, + { + "name": "ream-bright" + } + ] } diff --git a/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/ream-bright.png b/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/ream-bright.png new file mode 100644 index 00000000000..5c60ce56345 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/ream-bright.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/ream-classic.png b/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/ream-classic.png new file mode 100644 index 00000000000..a38cafeb6c2 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/ream-classic.png differ