diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
index 50c4253ccff..57ebdf2b022 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
@@ -1,11 +1,11 @@
 - type: vendingMachineInventory
   id: EngiVendInventory
   startingInventory:
+    ClothingHandsGlovesColorYellow: 8
+    Multitool: 8
     ClothingEyesGlassesMeson: 10
     ClothingHeadHatWelding: 6
-    Multitool: 8
-    NetworkConfigurator: 15
-    PowerCellMedium: 15
-    ClothingHandsGlovesColorYellow: 8
     InflatableWallStack1: 24
     InflatableDoorStack1: 8
+    PowerCellMedium: 15
+    NetworkConfigurator: 15
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
index 3dd4367f403..af6378f6d2e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
@@ -1,14 +1,15 @@
 - type: vendingMachineInventory
   id: SalvageEquipmentInventory
   startingInventory:
-    Crowbar: 8
+    WeaponCrusherGlaive: 3
+    WeaponProtoKineticAccelerator: 3
+    WeaponCrusher: 3
+    WeaponCrusherDagger: 5
+    MiningDrill: 3
     Pickaxe: 8
     OreBag: 6
-    Flare: 4
-    FlashlightLantern: 15
     Floodlight: 10
-    HandheldGPSBasic: 14
     RadioHandheld: 5
-    WeaponCrusher: 5
-    WeaponCrusherDagger: 5
-    WeaponProtoKineticAccelerator: 5
+    HandheldGPSBasic: 14
+    Flare: 20
+    FlashlightLantern: 15
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
index 210f0de3b68..06df3b197bb 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
@@ -1,17 +1,20 @@
 - type: vendingMachineInventory
   id: YouToolInventory
   startingInventory:
-    CableApcStack: 20
+    Screwdriver: 15
     Crowbar: 15
-    Welder: 13
     Wirecutter: 15
     Wrench: 15
-    Screwdriver: 15
+    Welder: 13
+    AppraisalTool: 15
+    ClothingHandsGlovesColorYellowBudget: 30
+    CableApcStack: 20
+    CableMVStack: 20
+    CableHVStack: 20
+    FlashlightLantern: 15
     trayScanner: 15
-    NetworkConfigurator: 13
     GasAnalyzer: 15
-    FlashlightLantern: 15
-    ClothingHandsGlovesColorYellowBudget: 30
+    NetworkConfigurator: 13
     AirlockPainter: 20
   # Some engineer forgot to take the multitool out the youtool when working on it, happens.
   contrabandInventory:
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index 1e6486a213f..daa869bf479 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -75,7 +75,7 @@
     sprite: Clothing/Eyes/Glasses/meson.rsi
   - type: EyeProtection
   - type: StaticPrice
-    price: 300
+    price: 135
 
 - type: entity
   parent: ClothingEyesBase
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
index a88511651a4..555b3c58287 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -168,7 +168,7 @@
     fiberColor: fibers-yellow
   - type: FingerprintMask
   - type: StaticPrice
-    price: 60
+    price: 45.5
 
 - type: entity
   parent: ClothingHandsGlovesColorYellow
diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
index 50f38a8f414..44aa3d76d05 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -12,6 +12,8 @@
   - type: Tag
     tags:
     - HelmetEVA
+  - type: StaticPrice
+    price: 25
 
 #Large EVA Helmet
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
index 2068c3e8873..539326097c9 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -30,7 +30,7 @@
     - HamsterWearable
     - WhitelistChameleon
   - type: StaticPrice
-    price: 60
+    price: 35.5
 
 - type: entity
   parent: WeldingMaskBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index d92c3ded0f4..98bb93608fd 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -76,6 +76,7 @@
     tags:
     - Hardsuit
 
+
 - type: entity
   abstract: true
   parent: ClothingOuterBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 315ce91093a..503d2aab610 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -28,6 +28,8 @@
     sprintModifier: 0.80
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitBasic
+  - type: StaticPrice
+    price: 135
 
 #Atmospherics Hardsuit
 - type: entity
@@ -87,7 +89,7 @@
         Piercing: 0.95
         Heat: 0.7
         Shock: 0.8
-        Caustic: 0.75        
+        Caustic: 0.75
         Radiation: 0.25
   - type: ExplosionResistance
     damageCoefficient: 0.2
@@ -122,6 +124,8 @@
         Caustic: 0.85
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSpatio
+  - type: StaticPrice
+    price: 235
 
 #Salvage Hardsuit
 - type: entity
@@ -170,7 +174,7 @@
     lowPressureMultiplier: 10000
   - type: ClothingSpeedModifier
     walkModifier: 0.7
-    sprintModifier: 0.7   
+    sprintModifier: 0.7
   - type: Armor
     modifiers:
       coefficients:
@@ -238,7 +242,7 @@
     damageCoefficient: 0.4
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitWarden
-    
+
 #Captain's Hardsuit
 - type: entity
   parent: ClothingOuterHardsuitBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 109cd3d022c..b518e332323 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -12,6 +12,8 @@
   - type: Tag
     tags:
     - SuitEVA
+  - type: StaticPrice
+    price: 65
 
 #Syndicate EVA
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index 7d91e20c466..a9039ae4357 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -31,7 +31,7 @@
             True: {state: icon-on}
             False: {state: icon}
     - type: StaticPrice
-      price: 200
+      price: 145
 
 - type: entity
   parent: ClothingShoesBootsMag
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
index cfe9a648337..7f782d7dc08 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -92,6 +92,8 @@
     layers:
     - state: crypt_silver
     - state: com_label
+  - type: StaticPrice
+    price: 7.5
 
 - type: entity
   parent: EncryptionKey
diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
index 1c6a0eb7d87..2015b3e2c3d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -23,4 +23,4 @@
     tags:
     - Radio
   - type: StaticPrice
-    price: 25
+    price: 55
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index d021ab2e308..83db293ad36 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -272,6 +272,8 @@
   - type: Item
     heldPrefix: diamond
     size: 60
+  - type: StackPrice
+    price: 50
 
 - type: entity
   parent: MaterialDiamond
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index b3888352bd6..4edb1a1bb6e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -210,6 +210,8 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 75
 
 - type: entity
   name: broken floodlight
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 56e0bc3ba1c..39314e6003b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -19,6 +19,8 @@
   - type: Tag
     tags:
     - DoorBumpOpener
+  - type: StaticPrice
+    price: 150
 
 #IDs with layers
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
index d11aa714cb5..803b4050744 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
@@ -39,6 +39,7 @@
   placement:
     mode: SnapgridCenter
 
+
 - type: entity
   id: InflatableDoor
   name: inflatable door
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index 8ea097e4793..0a662cb5b2a 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -97,6 +97,8 @@
   - type: Battery
     maxCharge: 720
     startingCharge: 720
+  - type: StaticPrice
+    price: 75
 
 - type: entity
   id: PowerCellMediumPrinted
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
index a2afb788e32..16e353fb1aa 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -22,3 +22,5 @@
       tags:
         - Ore
   - type: Dumpable
+  - type: StaticPrice
+    price: 55.5
diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
index ff946aefe91..d83b1702b53 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
@@ -30,7 +30,7 @@
     tags:
       - DroneUsable
   - type: StaticPrice
-    price: 80
+    price: 75
   - type: PhysicalComposition
     materialComposition:
       Steel: 400
diff --git a/Resources/Prototypes/Entities/Objects/Tools/airlock_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/airlock_painter.yml
index 8e387db3402..bf3625841ab 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/airlock_painter.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/airlock_painter.yml
@@ -18,4 +18,4 @@
         tags:
           - PaintableAirlock
     - type: StaticPrice
-      price: 40
+      price: 50
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
index adfd022c96f..726639fa0eb 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -25,7 +25,7 @@
   - type: StaticPrice
     price: 0
   - type: StackPrice
-    price: 5
+    price: 0.334
 
 - type: entity
   id: CableHVStack
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
index 6969e85762a..a50df4dd076 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -75,4 +75,4 @@
         endValue: 1.0
         property: Radius
   - type: StaticPrice
-    price: 35
+    price: 7.5
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index f58cae975fd..ee53e349cf3 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -70,7 +70,7 @@
     netsync: false
   - type: Appearance
   - type: StaticPrice
-    price: 40
+    price: 15.5
 
 - type: entity
   name: seclite
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 69b2ee8f586..1e5bd26dbce 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -185,6 +185,8 @@
       slots:
         - Back
         - suitStorage
+    - type: StaticPrice
+      price: 32.5
 
 - type: entity
   parent: GasTankBase
diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
index 35cf2f54dcf..227063e2581 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
@@ -22,6 +22,8 @@
     - type: Tag
       tags:
         - DroneUsable
+    - type: StaticPrice
+      price: 7.5
 # TODO: Add stack sprites + visuals.
 
 - type: entity
@@ -48,6 +50,8 @@
     - type: Tag
       tags:
         - DroneUsable
+    - type: StaticPrice
+      price: 15
 # TODO: Add stack sprites + visuals.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index c7291c25136..6524f0bc4b6 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -185,6 +185,8 @@
       outputPressure: 42.6
       air:
         volume: 20
+    - type: StaticPrice
+      price: 95
 
 # Filled mini
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
index 71032290b1d..81db44b3d57 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
@@ -23,4 +23,4 @@
     tags:
       - DroneUsable
   - type: StaticPrice
-    price: 60
+    price: 75
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index fa1ddca1d26..f610cf51a43 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -41,7 +41,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 30
+    price: 19.5
 
 - type: entity
   name: screwdriver
@@ -84,7 +84,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 30
+    price: 15
 
 - type: entity
   name: wrench
@@ -154,7 +154,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 22
+    price: 15.5
 
 - type: entity
   parent: Crowbar
@@ -216,7 +216,7 @@
       Steel: 100
       Plastic: 100
   - type: StaticPrice
-    price: 56
+    price: 40
 
 - type: entity
   name: network configurator
@@ -264,7 +264,7 @@
       tags:
         - DroneUsable
     - type: StaticPrice
-      price: 56
+      price: 25
     - type: GuideHelp
       guides:
         - NetworkConfigurator
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index 710e7d5be0b..01e2f29d58c 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -63,7 +63,7 @@
     materialComposition:
       Steel: 200
   - type: StaticPrice
-    price: 40
+    price: 25.5
   - type: IgnitionSource
     temperature: 700
 
@@ -84,6 +84,8 @@
         - ReagentId: WeldingFuel
           Quantity: 250
         maxVol: 250
+  - type: StaticPrice
+    price: 75
 
 - type: entity
   name: advanced industrial welding tool
@@ -104,6 +106,8 @@
         maxVol: 250
   - type: Tool
     speed: 1.3
+  - type: StaticPrice
+    price: 100
 
 - type: entity
   name: experimental welding tool
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml
index ec854093a4c..f6d8653dad0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml
@@ -11,3 +11,5 @@
     - state: empty
       visible: false
       map: [ "overlay" ]
+  - type: StaticPrice
+    price: 270
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 68303d91522..5c9c997e771 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -17,6 +17,8 @@
     color: "#ffeead"
     enabled: false
     radius: 4
+  - type: StaticPrice
+    price: 255
 
 - type: entity
   name: crusher
@@ -78,6 +80,8 @@
         Slash: 6.5
   - type: Item
     size: 10
+  - type: StaticPrice
+    price: 95.5
 
 # Like a crusher... but better
 - type: entity
@@ -103,3 +107,5 @@
     attackRate: 1.25
   - type: Item
     size: 150
+  - type: StaticPrice
+    price: 285
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index 36ae62c8044..413acce1619 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -23,6 +23,8 @@
   - type: Item
     size: 24
     sprite: Objects/Weapons/Melee/pickaxe.rsi
+  - type: StaticPrice
+    price: 15.5
 
 - type: entity
   name: mining drill
@@ -54,3 +56,5 @@
     damage:
       types:
         Structural: 30
+  - type: StaticPrice
+    price: 95.5
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index e9e63b33958..68af50ef2a4 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -703,8 +703,8 @@
     energy: 1.6
     color: "#b89e2a"
   - type: MarketModifier
-    mod: 5
-    
+    mod: 10
+
 - type: entity
   parent: VendingMachine
   id: VendingMachineMedical
@@ -1279,7 +1279,7 @@
     energy: 1.6
     color: "#9dc5c9"
   - type: MarketModifier
-    mod: 5
+    mod: 10
 
 - type: entity
   parent: VendingMachine
@@ -1794,7 +1794,7 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-   
+
 - type: entity
   parent: VendingMachine
   id: VendingMachineCentDrobe
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml b/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml
index 21df2f6a7e7..1106ec00366 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml
@@ -1,15 +1,17 @@
 - type: vendingMachineInventory
   id: AstroVendInventory
   startingInventory:
-    ClothingOuterHardsuitEVA: 15
-    ClothingHeadHelmetEVA: 15
-    ClothingOuterHardsuitSpatio: 4
+    ClothingOuterHardsuitSpatio: 5
     ClothingShoesBootsMag: 15
-    AirTank: 10
-    HandheldGPSBasic: 15
+    ClothingOuterHardsuitBasic: 5
+    ClothingOuterHardsuitEVA: 10
+    ClothingHeadHelmetEVA: 15
     RadioHandheld: 15
-    EncryptionKeyCommand: 15
+    HandheldGPSBasic: 15
+    AirTank: 10
     JetpackMiniFilled: 10
+    EncryptionKeyCommand: 30
+
 
 - type: vendingMachineInventory
   id: CircuitVendInventory
@@ -54,4 +56,4 @@
     ClothingShoesBootsMagSyndie: 4
     ClothingShoesChameleonNoSlips: 8
     ClothingBackpackDuffelSyndicateEVABundle: 12
-    BoxHoloparasite: 2
\ No newline at end of file
+    BoxHoloparasite: 2