diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index b12def44c86..4ef933fa0ba 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -121,6 +121,14 @@
     spawned:
     - id: FoodMeatDragon
       amount: 2
+    - id: HeadSkeleton # Corvax
+      amount: 1
+    - id: WeaponCrusher # Corvax
+      amount: 1
+      prob: 0.6
+    - id: MobRandomCargoCorpse # Corvax
+      amount: 1
+      prob: 0.25
   - type: InteractionPopup
     successChance: 0.25 # It's no goose, but you better smell like carp.
     interactSuccessString: petting-success-dragon
diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml
index d3f70d67fe7..3537bceac25 100644
--- a/Resources/Prototypes/_NF/Mail/mail.yml
+++ b/Resources/Prototypes/_NF/Mail/mail.yml
@@ -2165,3 +2165,90 @@
   - type: Mail
     contents:
     - id: FoodBoxDonut
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseMail
+  id: MailBoomBox
+  suffix: boombox 
+  components:
+    - type: Mail
+      contents:
+        - id: BaseBoomBox
+        - id: BaseBoomBoxTapeSpaceAsshole
+          prob: 0.5
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseMail
+  id: MailBoomBoxTapePack1
+  suffix: boombox
+  components:
+  - type: Mail
+    contents:
+    - id: BaseBoomBoxTapeSpaceOddity
+    - id: BaseBoomBoxTapeSpaceAsshole
+    - id: BaseBoomBoxTapeStarman
+    - id: BaseBoomBoxTapeTheChain
+    - id: BaseBoomBoxTapeSigridEverybodyKnows
+      prob: 0.5
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseMail
+  id: MailBoomBoxTapePack2
+  suffix: boombox
+  components:
+  - type: Mail
+    contents:
+    - id: BaseBoomBoxTapeCantSmile
+    - id: BaseBoomBoxTapeUnderStars
+    - id: BaseBoomBoxTapeComingHome
+    - id: BaseBoomBoxTapeSignals
+    - id: BaseBoomBoxTapeSigridEverybodyKnows
+      prob: 0.5
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseMail
+  id: MailBoomBoxTapePack3
+  suffix: boombox
+  components:
+  - type: Mail
+    contents:
+    - id: BaseBoomBoxTapeDemonKittyRag
+    - id: BaseBoomBoxTapeKissTheSky
+    - id: BaseBoomBoxTapeRetrograde
+    - id: BaseBoomBoxTapeThisAintNoPlaceForNoHero
+    - id: BaseBoomBoxTapeSigridEverybodyKnows
+      prob: 0.5
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseMail
+  id: MailBoomBoxTapePack4
+  suffix: boombox
+  components:
+  - type: Mail
+    contents:
+    - id: BaseBoomBoxTapeMrKittyAfterDark
+    - id: BaseBoomBoxTapeTobyFoxHopesAndDreams
+    - id: BaseBoomBoxTapeTobyFoxMegalovania
+    - id: BaseBoomBoxTapeTobyFoxUndertale
+    - id: BaseBoomBoxTapeSigridEverybodyKnows
+      prob: 0.5
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseMail
+  id: MailBoomBoxTapePack5
+  suffix: boombox
+  components:
+  - type: Mail
+    contents:
+    - id: BaseBoomBoxTapeImagineDragonEnemy
+    - id: BaseBoomBoxTapeKDAVillian
+    - id: BaseBoomBoxTapeRamseyGoodbye
+    - id: BaseBoomBoxTapeSamuelKimGunsForHire
+    - id: BaseBoomBoxTapeSigridEverybodyKnows
+      prob: 0.5
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml
index aa8503b629e..bb43da7b18f 100644
--- a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml
+++ b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml
@@ -59,6 +59,12 @@
     MailNFThrongler: 0.1
     MailNFUnicycle: 0.5
     MailNFVulpCannon: 0.1
+    MailBoomBox: 1.0 # Corvax
+    MailBoomBoxTapePack1: 0.5 # Corvax
+    MailBoomBoxTapePack2: 0.5 # Corvax
+    MailBoomBoxTapePack3: 0.5 # Corvax
+    MailBoomBoxTapePack4: 0.5 # Corvax
+    MailBoomBoxTapePack5: 0.5 # Corvax
     # Useful
     MailNFATV: 0.9
     MailNFSkeletonMotorcycle: 0.1 # Shares a pool with MailNFATV as a rare variant
diff --git a/RobustToolbox b/RobustToolbox
index 32bca7cfd41..c86cb0b7951 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 32bca7cfd417edcad9a60c2b1703eba8675f56af
+Subproject commit c86cb0b7951cc4a662c7292138c5f45d868c5f58