Merge branch 'Elegance-Fixes' of https://github.com/IAmNotGray/Delta-v …

…into Elegance-Fixes
DeltaV-Station · Feb 3, 2025 · 6ec565b · 6ec565b
2 parents 728165d + 784c2e7
commit 6ec565b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,18 +1,4 @@
 Entries:
-- author: deltanedas
-  changes:
-  - message: Fixed recruiter's pen not working.
-    type: Fix
-  id: 479
-  time: '2024-08-14T20:18:07.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1630
-- author: MilonPL
-  changes:
-  - message: AME power production now scales properly with the number of cores.
-    type: Tweak
-  id: 480
-  time: '2024-08-15T05:15:04.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1629
 - author: portfiend
   changes:
   - message: The Courier and Logistics Officer now have a new program in their PDA
@@ -3867,3 +3853,17 @@
   id: 978
   time: '2025-02-02T18:57:52.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2835
+- author: sowelipililimute
+  changes:
+  - message: Bureaucracy crate has more and more varied folders
+    type: Add
+  id: 979
+  time: '2025-02-03T01:51:35.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2863
+- author: sowelipililimute
+  changes:
+  - message: Added folders to the LawDrobe
+    type: Add
+  id: 980
+  time: '2025-02-03T02:04:20.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2862
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -124,18 +124,29 @@
   - type: StorageFill
     contents:
     - id: Paper
-      amount: 15
+      amount: 10 # DeltaV - make room for more folders in the bureaucracy crate
     - id: Pen
       amount: 2
     - id: BoxFolderClipboard
       amount: 2
     - id: HandLabeler
     - id: BoxFolderBlue
+      amount: 2 # DeltaV - more folders in the bureacracy crate
     - id: BoxFolderRed
+      amount: 2 # DeltaV - more folders in the bureacracy crate
     - id: BoxFolderYellow
+      amount: 2 # DeltaV - more folders in the bureacracy crate
     - id: NewtonCradle
     - id: BoxEnvelope
     - id: BrbSign
+    # Start DeltaV - More folders in the bureaucracy crate
+    - id: BoxFolderBlack
+      amount: 2
+    - id: BoxFolderGrey
+      amount: 2
+    - id: BoxFolderGreen
+      amount: 2
+    # End DeltaV - More folders in the bureaucracy crate
 
 - type: entity
   id: CrateServiceFaxMachine

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -24,6 +24,10 @@
     RubberStampLawyer: 3
     ClothingOuterCoatOvercoat: 2
     BoxFolderClipboard: 5
+    BoxFolderRed: 2
+    BoxFolderBlue: 2
+    BoxFolderYellow: 2
+    BoxFolderBlack: 2
     # End DeltaV additions
   contrabandInventory:
     ClothingOuterRobesJudge: 1