Merge branch 'DeltaV-Station:master' into swords

DeltaV-Station · Feb 3, 2025 · beb4489 · beb4489
2 parents b1aec84 + 6bf4022
commit beb4489
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 34 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,18 +1,4 @@
 Entries:
-- author: MilonPL
-  changes:
-  - message: Backpacks are now available in prisoner and gladiator loadouts.
-    type: Add
-  id: 478
-  time: '2024-08-14T19:38:04.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1628
-- 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.
@@ -3867,3 +3853,17 @@
   id: 977
   time: '2025-02-02T06:12:55.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2846
+- author: Stop-Signs
+  changes:
+  - message: Svallin laser pistols have been removed from the research tree.
+    type: Remove
+  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
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/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -351,7 +351,7 @@
       - BluespaceBeaker
       - SyringeBluespace
       #- WeaponForceGun # DeltaV
-      - WeaponLaserSvalinn
+      #- WeaponLaserSvalinn #DeltaV
       - WeaponGrapplingGun
       #- WeaponTetherGun # DeltaV
       - ClothingBackpackHolding

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -88,13 +88,13 @@
     Plastic: 750
     Gold: 500
 
-- type: latheRecipe
-  parent: BaseWeaponRecipeLong
-  id: WeaponLaserSvalinn
-  result: WeaponLaserSvalinn
-  materials:
-    Steel: 2000
-    Gold: 500
+#- type: latheRecipe # DeltaV - Removed 
+#  parent: BaseWeaponRecipeLong
+#  id: WeaponLaserSvalinn
+#  result: WeaponLaserSvalinn
+#  materials:
+#    Steel: 2000
+#    Gold: 500
 
 - type: latheRecipe
   parent: BaseWeaponRecipeLong

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -202,17 +202,17 @@
   - WeaponAdvancedLaser
   - PortableRecharger
 
-- type: technology
-  id: ExperimentalBatteryAmmo
-  name: research-technology-experimental-battery-ammo
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/svalinn.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 2 # DeltaV: moved to t2 from t3
-  cost: 15000
-  recipeUnlocks:
-  - WeaponLaserSvalinn
+#- type: technology # DeltaV - Removed for only causing issues
+#  id: ExperimentalBatteryAmmo
+#  name: research-technology-experimental-battery-ammo
+#  icon:
+#    sprite: Objects/Weapons/Guns/Battery/svalinn.rsi
+#    state: icon
+#  discipline: Arsenal
+#  tier: 3
+#  cost: 15000
+#  recipeUnlocks:
+#  - WeaponLaserSvalinn
 
 - type: technology
   id: AdvancedShuttleWeapon