Merge pull request #2873 from sowelipililimute/work/jblackquill/reamed

Add white reams to the bureaucracy crate
DeltaV-Station · Feb 4, 2025 · 59aec0c · 59aec0c
2 parents 1325180 + 83eb702
commit 59aec0c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -123,8 +123,10 @@
   components:
   - type: StorageFill
     contents:
-    - id: Paper
-      amount: 2 # DeltaV - make room for more folders & stickies & reams in the bureaucracy crate
+    # DeltaV - replace the paper in the bureaucracy crate with a ream
+    - id: BoxReamWhite
+    # - id: Paper
+    #   amount: 15
     - id: Pen
       amount: 2
     - id: BoxFolderClipboard

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml
@@ -304,6 +304,21 @@
     - id: PaperDyedPurple
       amount: 4
 
+- type: entity
+  parent: BoxReamClassic
+  id: BoxReamWhite
+  name: Papermoon glimmer white paper ream
+  description: Create reports that are sure to get noticed with this Papermoon white-as-glimmer paper. Harvested with sustainable noöspheric practices.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: ream-white
+  - type: StorageFill
+    contents:
+    - id: Paper
+      amount: 24
+
 #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
@@ -1,7 +1,7 @@
 {
     "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 <uhhadd@gmail.com>",
+    "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, bright, and white by 2025 Janet Blackquill <uhhadd@gmail.com>",
     "size": {
         "x": 32,
         "y": 32
@@ -15,6 +15,9 @@
         },
         {
             "name": "ream-bright"
+        },
+        {
+            "name": "ream-white"
         }
     ]
 }
diff --git a/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/ream-white.png b/Resources/Textures/_DV/Objects/Misc/bureaucracy.rsi/ream-white.png