Merge branch 'master' into crew-monitor-beeping

DeltaV-Station · Feb 9, 2025 · e7bc9a2 · e7bc9a2
2 parents e95d79d + 67c41a8
commit e7bc9a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: flyingkarii
-  changes:
-  - message: Removed command age requirement.
-    type: Tweak
-  id: 522
-  time: '2024-09-07T04:38:34.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1611
 - author: deltanedas
   changes:
   - message: Fulton recipes can now be unlocked with the Aerial Extractions tech.
@@ -3844,3 +3837,10 @@
   id: 1021
   time: '2025-02-09T05:32:37.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2934
+- author: Quanteey
+  changes:
+  - message: NT now stocks brute trauma kits with additional bicaridine pills
+    type: Tweak
+  id: 1022
+  time: '2025-02-09T17:33:48.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2941
diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -35,6 +35,7 @@
       - id: Gauze
       - id: PillCanisterIron
       - id: PillCanisterCopper
+      - id: PillCanisterBicaridine # DeltaV
 
 - type: entity
   id: MedkitToxinFilled