Merge branch 'master' into shark-race-real

DeltaV-Station · Nov 21, 2024 · 2003b27 · 2003b27
2 parents a05d168 + 8818226
commit 2003b27
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: VMSolidus and DangerRevolution
-  changes:
-  - message: The Listening Outpost has received several tweaks and balance changes.
-      It should spawn less often now.
-    type: Tweak
-  id: 194
-  time: '2024-01-01T21:33:58.0000000+00:00'
 - author: ps3moira
   changes:
   - message: Reverted Shotgun sprites
@@ -3748,3 +3741,10 @@
   id: 693
   time: '2024-11-20T23:57:11.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2246
+- author: Stop-Signs
+  changes:
+  - message: Mini syringes now hold 5u instead of 15
+    type: Tweak
+  id: 694
+  time: '2024-11-21T04:28:40.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2249
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -414,6 +414,10 @@
     minimumSpeed: 3
     removalTime: 0.25
     embedOnThrow: false
+  - type: SolutionContainerManager # DeltaV - Nerfs the max volume to 5 (was 15)
+    solutions:
+      injector:
+        maxVol: 5 
   - type: SolutionInjectWhileEmbedded
     transferAmount: 1
     solution: injector