diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
index 28340ead40a..59e3690b6bc 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
@@ -45,6 +45,7 @@
       - BookMap
       - BookJourney
       - BookInspiration
+      - BookJanitorTale
       # Guidebook Books
       - BookSpaceEncyclopedia
       - BookTheBookOfControl
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
index a75f31cf0f7..181bacca45e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
@@ -36,6 +36,7 @@
       - BoxCandle
       - BoxCandleSmall
       - BoxDarts
+      - BoxCartridgeBB
     chance: 0.7
     rarePrototypes:
       - BoxHugHealing
@@ -49,6 +50,7 @@
       - PresentRandom
       - BoxHolyWater
       - MysteryFigureBox
+      - BoxCleanerGrenades
     rareChance: 0.05
 
 
@@ -100,6 +102,8 @@
       - BoxMagazineCaselessRifleRubber
       - BoxMagazineUniversalMagnumPractice
       - BoxMagazineUniversalMagnumRubber
+      - MagazineBoxSpecialRubber
+      - MagazineBoxSpecialPractice
     chance: 0.15
     rarePrototypes:
       - BoxMagazinePistolCaselessRifle
@@ -121,4 +125,8 @@
       - BoxShellSoulbreaker
       - BoxMagazineUniversalMagnum
       - BoxSpeedLoaderLightRifle
+      - MagazineBoxSpecial
+      - MagazineBoxSpecialIncendiary
+      - MagazineBoxSpecialUranium
+      - MagazineBoxSpecialMindbreaker
     rareChance: 0.015
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
index c8efdbdc8cf..abd4d86a1ef 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: MarkerBase
   id: RandomBoards
-  name: random machine board spawner
+  name: random device & board spawner
   components:
   - type: Sprite
     layers:
@@ -71,6 +71,16 @@
       - HotplateMachineCircuitboard
       - ElectricGrillMachineCircuitboard
       - FatExtractorMachineCircuitboard
+      - SpaceHeaterMachineCircuitBoard
+      - StationMapCircuitboard
+      - Igniter
+      - IntercomElectronics
+      - DoorRemoteFirefight
+      - RadiationCollectorFlatpack
+      - ContainmentFieldGeneratorFlatpack
+      - SolarAssemblyFlatpack
+      - StationBeaconPart
+      - HandheldStationMap
     chance: 0.8
     rarePrototypes:
       - TraversalDistorterMachineCircuitboard
@@ -107,4 +117,26 @@
       - ShockCollar
       - GlimmerMonitorCartridge
       - PotatoAIChip
+      - CargoTelepadMachineCircuitboard
+      - FlatpackerMachineCircuitboard
+      - OreProcessorIndustrialMachineCircuitboard
+      - TurboItemRechargerCircuitboard
+      - PowerCageRechargerCircuitboard
+      - HellfireHeaterMachineCircuitBoard
+      - HellfireFreezerMachineCircuitBoard
+      - BiofabricatorMachineCircuitboard
+      - SalvageExpeditionsComputerCircuitboard
+      - RadarConsoleCircuitboard
+      - RipleyCentralElectronics
+      - RipleyPeripheralsElectronics
+      - HamtrCentralElectronics
+      - HamtrPeripheralsElectronics
+      - HonkerCentralElectronics
+      - HonkerPeripheralsElectronics
+      - HonkerTargetingElectronics
+      - RemoteSignallerAdvanced
+      - SignalTimerElectronics
+      - LogProbeCartridge
+      - HoloprojectorField
+      - DeviceQuantumSpinInverter
     rareChance: 0.25
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
index b9def15132e..f0dd4709034 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
@@ -42,6 +42,18 @@
         - ClothingHeadCage
         - ClothingHeadHelmetKendoMen
         - ClothingHeadBandMerc
+        - ClothingHeadHatCowboyWhite
+        - ClothingHeadHatCowboyGrey
+        - ClothingHeadHatCowboyBrown
+        - ClothingHeadHatBrownFlatcap
+        - ClothingHeadHatGreyFlatcap
+        - ClothingHeadHatPartyRed
+        - ClothingHeadHatPartyYellow
+        - ClothingHeadHatPartyGreen
+        - ClothingHeadHatPartyBlue
+        - ClothingHeadHatWatermelon
+        - WaterDropletHat
+        - ClothingHeadHatRedRacoon
       rareChance: 0.03
       prototypes:
         - ClothingHeadHatAnimalCat
@@ -98,5 +110,13 @@
         - ClothingHeadHatFlatBrown
         - ClothingHeadTinfoil
         - ClothingHeadHatStrawHat
+        - ClothingHeadHatCowboyBountyHunter
+        - ClothingHeadHatCowboyRed
+        - ClothingHeadHatCowboyBlack
+        - ClothingHeadHatGladiator
+        - ClothingHeadHatMagician
+        - ClothingHeadHatHetmanHat
+        - ClothingHeadHatTacticalMaidHeadband
+        - ClothingHeadHatPirateTricord
       chance: 0.5
       offset: 0.2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
index 7785e5aaa82..61a99faa2f1 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
@@ -36,5 +36,5 @@
         - MatterBinStockPart
         - CrateMaterialSteel
         - CrateMaterialGlass
-      chance: 0.45
+      chance: 0.50
       offset: 0.0
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
index 9f183dcefbd..0c3370890c8 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
@@ -48,6 +48,7 @@
         - PeaSeeds
         - PumpkinSeeds
         - CottonSeeds
+        - LilySeeds
       chance: 0.95
       offset: 0.0
       rarePrototypes:
@@ -64,4 +65,6 @@
         - LemoonSeeds
         - SteelcapSeeds
         - KoibeanSeeds
+        - SpacemansTrumpetSeeds
+        - LaughinPeaSeeds
       rareChance: 0.05